Compare commits

..

2 Commits

Author SHA1 Message Date
c9e11770f2 更新 mes_in_sct/app/action/CheckBomInfo.php
Some checks failed
Run Unit Tests / test (pull_request) Failing after 6s
2025-06-15 12:23:06 +08:00
57851c8450 更新 mes_in_sct/app/action/GetBatteryInfo.php 2025-06-15 11:51:29 +08:00
4 changed files with 25 additions and 32 deletions

View File

@ -6,18 +6,14 @@ on:
- main
- develop
pull_request:
branches:
- main
paths-ignore:
- '.gitea/**'
jobs:
test:
runs-on: phpunit_test
container: docker.xuanyuan.me/xeden3/ai-code-reviewer-gitea-runner:v1.2
container: docker.xuanyuan.me/xeden3/ai-code-reviewer-gitea-runner:v1
steps:
- name: Checkout code2
- name: Checkout code
uses: http://119.91.43.128:3003/james/checkout@v4
with:
fetch-depth: 2 # 至少获取最近两次提交

View File

@ -25,7 +25,7 @@ class CheckBomInfo
//2.判断工序单元、设备编码是存在?
$sql = "SELECT id FROM hf_mes_process_workingsubclass WHERE code='".$workingsubclass."'";
$ret = Db::fetch($sql);
$ret = Db::fetch($sql3);
if(empty($ret)){
throw new Exception("工序单元[$workingsubclass]不存在",4001);
}

View File

@ -34,7 +34,7 @@ class GetBatteryInfo
WHERE battery_id='%s' ORDER BY id DESC LIMIT 1;",
$battery_id
);
$ret = Db::fetch($sql);
$ret = Db::fetch($sql2);
list($tray, $lot, $batch, $subbatch) = [
$ret['tray'],

View File

@ -122,15 +122,11 @@ 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"))));
$batch = $ret[0]['batch'];
@ -227,16 +223,14 @@ 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表做准备
@ -351,15 +345,17 @@ class SetWipOutputByItemId
} else {
$uuid = json_encode(array_values(array_unique($uuid)));
}
//保证每个正向追溯的uuid都是唯一的
$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);
//需要读取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)));
}
$forward_tracing_uuid = json_encode(array_unique($forward_tracing_uuid));
if ($input_item_id != $item_id) {
//保证每个正向追溯的uuid都是唯一的
$forward_tracing_uuid = array_unique(array_merge($forward_tracing_uuid, [generateUniqueId()]));
}
$forward_tracing_uuid = json_encode($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');
@ -368,9 +364,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) 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,input_finish_time) 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,
@ -393,7 +389,8 @@ class SetWipOutputByItemId
$ng_code,
$device_category_id,
1,
$forward_tracing_uuid
$forward_tracing_uuid,
$finish_time
);
$sql = $wip_process_log_sql_head . $wip_process_log_sql_val;
$row = Db::query($sql);