Compare commits
4 Commits
feat/files
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| c7eee5aab3 | |||
| 1467b268c2 | |||
| be1b8723ee | |||
| cb143f753e |
@ -8,6 +8,8 @@ on:
|
||||
pull_request:
|
||||
branches:
|
||||
- main
|
||||
paths-ignore:
|
||||
- '.gitea/**'
|
||||
|
||||
jobs:
|
||||
test:
|
||||
@ -15,7 +17,7 @@ jobs:
|
||||
container: docker.xuanyuan.me/xeden3/ai-code-reviewer-gitea-runner:v1.2
|
||||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
- name: Checkout code2
|
||||
uses: http://119.91.43.128:3003/james/checkout@v4
|
||||
with:
|
||||
fetch-depth: 2 # 至少获取最近两次提交
|
||||
|
||||
@ -122,12 +122,16 @@ class SetWipOutputByItemId
|
||||
throw new Exception('工序单元[' . $workingsubclass . ']下设备编码[' . $device_code . ']找不到对应投入物料生产批次信息');
|
||||
}
|
||||
$item_code_in_process_log = array_column($ret, "item_code");
|
||||
//获取正向追溯的uuid
|
||||
$forward_tracing_uuid_in_process_log = array_column($ret, "forward_tracing_uuid");
|
||||
$forward_tracing_uuid = [];
|
||||
foreach ($forward_tracing_uuid_in_process_log as $json_str) {
|
||||
$decoded = json_decode($json_str, true); // 转成数组
|
||||
if (is_array($decoded)) {
|
||||
$forward_tracing_uuid = array_merge($forward_tracing_uuid, $decoded);
|
||||
}
|
||||
}
|
||||
|
||||
//获取原材料的正向追溯的uuid
|
||||
$forward_tracing_uuid = array_unique(array_merge(...array_map(function ($json) {
|
||||
return is_array($decoded = json_decode($json, true)) ? $decoded : [];
|
||||
}, array_column($ret, "forward_tracing_uuid"))));
|
||||
$bb = [sdfdf];
|
||||
$batch = $ret[0]['batch'];
|
||||
|
||||
//对比物料信息是否与process_log表的item_code是否相同
|
||||
@ -223,14 +227,16 @@ class SetWipOutputByItemId
|
||||
} else {
|
||||
$sql_val_out_result_param[] = "'" . $param_out_val . "'";
|
||||
}
|
||||
$ng_code_val = 0;
|
||||
|
||||
// 判断NG是否存在
|
||||
if ($val['code'] == 'NG') {
|
||||
if ($param_out[$val['code']] != '') {
|
||||
$ng_code = $param_out[$val['code']];
|
||||
} else {
|
||||
$ng_code = 0;
|
||||
}
|
||||
}
|
||||
$ng_code = $ng_code_val;
|
||||
|
||||
}
|
||||
|
||||
// 8.获取设备投入物料信息，为后续追加battery_map、bkv表做准备
|
||||
@ -345,17 +351,15 @@ class SetWipOutputByItemId
|
||||
} else {
|
||||
$uuid = json_encode(array_values(array_unique($uuid)));
|
||||
}
|
||||
//需要读取input_item_id的$forward_tracing_uuid进行拼接
|
||||
$sql = "SELECT forward_tracing_uuid FROM hf_mes_bkv_batch_process_log WHERE item_id = '" . $input_item_id . "' ORDER BY id DESC LIMIT 1";
|
||||
$input_item_id_forward_tracing_uuid = Db::fetchAll($sql);
|
||||
if (!empty($input_item_id_forward_tracing_uuid)) {
|
||||
$forward_tracing_uuid = array_unique(array_merge($forward_tracing_uuid, json_decode($input_item_id_forward_tracing_uuid[0]['forward_tracing_uuid'], true)));
|
||||
}
|
||||
if ($input_item_id != $item_id) {
|
||||
//保证每个正向追溯的uuid都是唯一的
|
||||
$forward_tracing_uuid = array_unique(array_merge($forward_tracing_uuid, [generateUniqueId()]));
|
||||
$forward_tracing_uuid_only[] = generateUniqueId();
|
||||
$forward_tracing_uuid_only = json_encode($forward_tracing_uuid_only);
|
||||
$decoded_uuid = json_decode($forward_tracing_uuid_only, true);
|
||||
if (is_array($decoded_uuid)) {
|
||||
$forward_tracing_uuid = array_merge($forward_tracing_uuid, $decoded_uuid);
|
||||
}
|
||||
$forward_tracing_uuid = json_encode($forward_tracing_uuid);
|
||||
$forward_tracing_uuid = json_encode(array_unique($forward_tracing_uuid));
|
||||
|
||||
$wip_uuid = json_encode(array_values(array_unique($wip_uuid)));
|
||||
$now_date = date('Y-m-d H:i:s');
|
||||
$start_time = isset($param_out['START_TIME']) ? $param_out['START_TIME'] : date('Y-m-d H:i:s');
|
||||
@ -364,9 +368,9 @@ class SetWipOutputByItemId
|
||||
$battery_id = $item_id;
|
||||
|
||||
// 新增数据到process_log表
|
||||
$wip_process_log_sql_head = 'INSERT INTO "hf_mes_bkv_batch_process_log" (item_id, batch, subbatch, workingsubclass, process_code, device_code, status, start_time, finish_time, bom_source_id, item_batch, item_quantity, pid, uuid, bom_id, item_code, item_name, lot, tray, ng_code, device_category_id,last_status,forward_tracing_uuid,input_finish_time) VALUES';
|
||||
$wip_process_log_sql_head = 'INSERT INTO "hf_mes_bkv_batch_process_log" (item_id, batch, subbatch, workingsubclass, process_code, device_code, status, start_time, finish_time, bom_source_id, item_batch, item_quantity, pid, uuid, bom_id, item_code, item_name, lot, tray, ng_code, device_category_id,last_status,forward_tracing_uuid) VALUES';
|
||||
$wip_process_log_sql_val = sprintf(
|
||||
"('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')",
|
||||
"('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')",
|
||||
$battery_id,
|
||||
$batch,
|
||||
$subbatch,
|
||||
@ -389,8 +393,7 @@ class SetWipOutputByItemId
|
||||
$ng_code,
|
||||
$device_category_id,
|
||||
1,
|
||||
$forward_tracing_uuid,
|
||||
$finish_time
|
||||
$forward_tracing_uuid
|
||||
);
|
||||
$sql = $wip_process_log_sql_head . $wip_process_log_sql_val;
|
||||
$row = Db::query($sql);
|
||||
|
||||
@ -79,6 +79,9 @@ class SetWipOutputByItemIds
|
||||
if (empty($param["out"])) {
|
||||
throw new Exception("缺少out参数");
|
||||
}
|
||||
if (empty($param["out"])) {
|
||||
throw new Exception("缺少out参数");
|
||||
}
|
||||
|
||||
$batch = "";
|
||||
$workingsubclass = $param["workingsubclass"];
|
||||
@ -135,10 +138,10 @@ class SetWipOutputByItemIds
|
||||
//查询对应的批次表看是否存在激活状态
|
||||
$subbatch = $item_id_ret['subbatch'];
|
||||
$batch = $item_id_ret['batch'];
|
||||
$sql = "SELECT id FROM \"hf_mes_tmp_bkv_" . $subbatch . "\" WHERE active = 1 AND battery_id='{$item_ids[$i]}' ";
|
||||
$sql = "SELECT id FROM \"hf_mes_tmp_bkv_" . $subbatch . "\" WHERE active = 1 AND battery_id='{$item_id}' ";
|
||||
$item_id_info = Db::fetch($sql);
|
||||
if ($item_id_info) {
|
||||
throw new Exception('电芯码[' . $item_ids[$i] . ']已存在[' . $batch . ']批次', 4001);
|
||||
throw new Exception('电芯码[' . $item_id . ']已存在[' . $batch . ']批次', 4001);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -152,11 +155,15 @@ class SetWipOutputByItemIds
|
||||
throw new Exception('工序单元[' . $workingsubclass . ']下设备编码[' . $device_code . ']找不到对应投入物料生产批次信息');
|
||||
}
|
||||
$item_code_in_process_log = array_column($ret, "item_code");
|
||||
|
||||
//获取原材料的正向追溯的uuid固定值不变
|
||||
$forward_tracing_uuid_fixed = array_unique(array_merge(...array_map(function ($json) {
|
||||
return is_array($decoded = json_decode($json, true)) ? $decoded : [];
|
||||
}, array_column($ret, "forward_tracing_uuid"))));
|
||||
//获取正向追溯的uuid
|
||||
$forward_tracing_uuid_in_process_log = array_column($ret, "forward_tracing_uuid");
|
||||
$forward_tracing_uuid = [];
|
||||
foreach ($forward_tracing_uuid_in_process_log as $json_str) {
|
||||
$decoded = json_decode($json_str, true); // 转成数组
|
||||
if (is_array($decoded)) {
|
||||
$forward_tracing_uuid = array_merge($forward_tracing_uuid, $decoded);
|
||||
}
|
||||
}
|
||||
|
||||
$batch = $ret[0]['batch'];
|
||||
|
||||
@ -259,14 +266,15 @@ class SetWipOutputByItemIds
|
||||
} else {
|
||||
$sql_val_out_result_param[$i][] = "'" . $param_out_val . "'";
|
||||
}
|
||||
$ng_code_val = 0;
|
||||
|
||||
// 判断NG是否存在
|
||||
if ($val['code'] == 'NG') {
|
||||
if ($param_out[$i][$val['code']] != '') {
|
||||
$ng_code_val = $param_out[$i][$val['code']];
|
||||
$ng_code[] = $param_out[$i][$val['code']];
|
||||
} else {
|
||||
$ng_code[] = 0;
|
||||
}
|
||||
}
|
||||
$ng_code[] = $ng_code_val;
|
||||
}
|
||||
}
|
||||
|
||||
@ -342,7 +350,7 @@ class SetWipOutputByItemIds
|
||||
);
|
||||
}
|
||||
}
|
||||
$bb = [sdfdf];
|
||||
|
||||
if (count($input_item_ids) > 0) {
|
||||
$input_item_id = $input_item_ids[$i];
|
||||
//查询batch_process_log表中该裸电芯上一工序的uuid
|
||||
@ -366,7 +374,7 @@ class SetWipOutputByItemIds
|
||||
|
||||
Db::beginTrans();
|
||||
try {
|
||||
for ($i = 0; $i < count(value: $item_ids); $i++) {
|
||||
for ($i = 0; $i < count($item_ids); $i++) {
|
||||
// 标记最后一条数据的状态
|
||||
if (!empty($pid[$i])) {
|
||||
Event::emit('SetProcessLogEvent.updateLastStatus', $pid[$i]);
|
||||
@ -397,25 +405,14 @@ class SetWipOutputByItemIds
|
||||
} else {
|
||||
$uuid[$i] = json_encode(array_values(array_unique($uuid[$i])));
|
||||
}
|
||||
|
||||
$forward_tracing_uuid = $forward_tracing_uuid_fixed;
|
||||
// 检查 $input_item_ids 是否非空 且当前索引存在
|
||||
if (count($input_item_ids) > 0) {
|
||||
//需要读取input_item_id的$forward_tracing_uuid进行拼接
|
||||
$sql = "SELECT forward_tracing_uuid FROM hf_mes_bkv_batch_process_log WHERE item_id = '" . $input_item_ids[$i] . "' ORDER BY id DESC LIMIT 1";
|
||||
$input_item_id_forward_tracing_uuid = Db::fetchAll($sql);
|
||||
if (!empty($input_item_id_forward_tracing_uuid)) {
|
||||
$forward_tracing_uuid = array_unique(array_merge($forward_tracing_uuid, json_decode($input_item_id_forward_tracing_uuid[0]['forward_tracing_uuid'], true)));
|
||||
}
|
||||
if ($input_item_ids[$i] != $item_ids[$i]) {
|
||||
//保证每个正向追溯的uuid都是唯一的
|
||||
$forward_tracing_uuid = array_unique(array_merge($forward_tracing_uuid, [generateUniqueId()]));
|
||||
$forward_tracing_uuid_only[] = generateUniqueId();
|
||||
$forward_tracing_uuid_only = json_encode($forward_tracing_uuid_only);
|
||||
$decoded_uuid = json_decode($forward_tracing_uuid_only, true);
|
||||
if (is_array($decoded_uuid)) {
|
||||
$forward_tracing_uuid = array_merge($forward_tracing_uuid, $decoded_uuid);
|
||||
}
|
||||
} else {
|
||||
$forward_tracing_uuid = array_unique(array_merge($forward_tracing_uuid, [generateUniqueId()]));
|
||||
}
|
||||
$forward_tracing_uuid = json_encode($forward_tracing_uuid);
|
||||
|
||||
$forward_tracing_uuid = json_encode(array_unique($forward_tracing_uuid));
|
||||
$wip_uuid[$i] = json_encode(array_values(array_unique($wip_uuid[$i])));
|
||||
|
||||
$now_date = date('Y-m-d H:i:s');
|
||||
@ -426,9 +423,9 @@ class SetWipOutputByItemIds
|
||||
$battery_id = $item_ids[$i];
|
||||
|
||||
// 新增数据到process_log表
|
||||
$wip_process_log_sql_head = 'INSERT INTO "hf_mes_bkv_batch_process_log" (item_id, batch, subbatch, workingsubclass, process_code, device_code, status, start_time, finish_time, bom_source_id, item_batch, item_quantity, pid, uuid, bom_id, item_code, item_name, lot, tray, ng_code, device_category_id,last_status,forward_tracing_uuid,input_finish_time) VALUES';
|
||||
$wip_process_log_sql_head = 'INSERT INTO "hf_mes_bkv_batch_process_log" (item_id, batch, subbatch, workingsubclass, process_code, device_code, status, start_time, finish_time, bom_source_id, item_batch, item_quantity, pid, uuid, bom_id, item_code, item_name, lot, tray, ng_code, device_category_id,last_status,forward_tracing_uuid) VALUES';
|
||||
$wip_process_log_sql_val = sprintf(
|
||||
"('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')",
|
||||
"('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')",
|
||||
$battery_id,
|
||||
$batch,
|
||||
$subbatch,
|
||||
@ -451,14 +448,14 @@ class SetWipOutputByItemIds
|
||||
$ng_code[$i],
|
||||
$device_category_id,
|
||||
1,
|
||||
$forward_tracing_uuid,
|
||||
$finish_time
|
||||
$forward_tracing_uuid
|
||||
);
|
||||
$sql = $wip_process_log_sql_head . $wip_process_log_sql_val;
|
||||
$row = Db::query($sql);
|
||||
if ($row === NULL) {
|
||||
throw new Exception('电芯 ' . $item_id . ' 半成品信息插入process_log表失败');
|
||||
}
|
||||
|
||||
// 新增数据到battery_map表
|
||||
$battery_unique_value = "{$batch}_{$subbatch}_-1_{$lot}_{$battery_id}";
|
||||
$wip_battery_map_sql_head = 'INSERT INTO "hf_mes_production_battery_map" (bom_source_id, battery_unique_value, battery_id, batch, subbatch, lot, tray, item_batch, pid, uuid, bom_id, workingsubclass, item_code,item_name) VALUES ';
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user