代码合并

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java

@@ -2088,7 +2088,12 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
             // 更新子卷包装关系表 状态 - 3
             JSONObject jsonSub = subTab.query("container_name = '" + dis.getString("pcsn") + "' and status = '2'").uniqueResult(0);
             if (ObjectUtil.isEmpty(jsonSub)) throw new BadRequestException("此子卷不存在或不为入库状态：" + dis.getString("pcsn"));
-            jsonSub.put("status", "3");
+            // 如果是拆分入库则将包装关系改为生成状态
+            if (jo_mst.getString("bill_type").equals("1005")){
+                jsonSub.put("status", "0");
+            } else {
+                jsonSub.put("status", "3");
+            }
             subTab.update(jsonSub);
         }