浏览代码

根据sn获取产品信息字段修改

yzc 1 年之前
父节点
当前提交
05be0ca9fd
共有 1 个文件被更改,包括 5 次插入2 次删除
  1. 5 2
      hx-mes/src/main/java/com/fjhx/mes/service/work/impl/WorkOrderServiceImpl.java

+ 5 - 2
hx-mes/src/main/java/com/fjhx/mes/service/work/impl/WorkOrderServiceImpl.java

@@ -409,8 +409,11 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         WorkOrder workOrder = this.getById(workOrderDto.getId());
 
         //如果定制且BOM未定制直接跳出
-        if ("1".equals(workOrder.getIsCustomized())&&workOrderDto.getBomStatus()!=1){
-            return;
+        if ("1".equals(workOrder.getIsCustomized())){
+            //如果BOM未定制
+            if (ObjectUtil.isEmpty(workOrder.getBomStatus())||workOrder.getBomStatus()!=1) {
+                return;
+            }
         }
         //如果待生产数量为空(需要如果干预)直接跳过
         if (ObjectUtil.isEmpty(workOrder.getProductionQuantity())){