|
@@ -263,7 +263,7 @@ class ProductionLot extends Api
|
|
|
'204' => ['手检','次品检','机检(初检)','二次机检','核检','抽检','包装'],
|
|
'204' => ['手检','次品检','机检(初检)','二次机检','核检','抽检','包装'],
|
|
|
];
|
|
];
|
|
|
|
|
|
|
|
- $validWarehouseCodes = ['101','Y101','200','201','202','203','204','Y200','Y201','Y202','Y203','Y204'];
|
|
|
|
|
|
|
+ $validWarehouseCodes = ['101','Y101','102','Y102','103','Y103','200','201','202','203','204','Y200','Y201','Y202','Y203','Y204'];
|
|
|
|
|
|
|
|
// 4. 优化数据库查询,使用链式操作提高可读性
|
|
// 4. 优化数据库查询,使用链式操作提高可读性
|
|
|
$list = db('物料_收发记录')
|
|
$list = db('物料_收发记录')
|
|
@@ -319,12 +319,9 @@ class ProductionLot extends Api
|
|
|
'供方批次' => $item['供方批次']
|
|
'供方批次' => $item['供方批次']
|
|
|
];
|
|
];
|
|
|
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
// 7. 优化条件判断逻辑
|
|
// 7. 优化条件判断逻辑
|
|
|
if (in_array($warehouseCode, $validWarehouseCodes, true)) {
|
|
if (in_array($warehouseCode, $validWarehouseCodes, true)) {
|
|
|
- if ($warehouseCode === '101' || $warehouseCode === 'Y101') {
|
|
|
|
|
- // 如果是101或Y101仓库,添加第一个工序名称
|
|
|
|
|
|
|
+ if ($warehouseCode === '101' || $warehouseCode === 'Y101' || $warehouseCode === '102' || $warehouseCode === 'Y102' || $warehouseCode === '103' || $warehouseCode === 'Y103') {
|
|
|
if (!empty($process[0])) {
|
|
if (!empty($process[0])) {
|
|
|
$baseData['工序名称'] = $process[0]['工序名称'];
|
|
$baseData['工序名称'] = $process[0]['工序名称'];
|
|
|
}
|
|
}
|