问题处理

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

@@ -273,7 +273,12 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
             workOrderVo.setArrangedQuantity(BigDecimal.ZERO);
             workOrderVo.setCompletionRate(BigDecimal.ZERO);
 
-            if(ObjectUtil.isNotEmpty(workOrderVo.getProductionQuantity())) {
+            //人工生产数量为0 完工率 100
+            if(ObjectUtil.isNotEmpty(workOrderVo.getProductionQuantity()) && workOrderVo.getProductionQuantity().compareTo(BigDecimal.ZERO)==0){
+                workOrderVo.setCompletionRate(BigDecimal.valueOf(100));
+            }
+
+            if(ObjectUtil.isNotEmpty(workOrderVo.getProductionQuantity()) && workOrderVo.getProductionQuantity().compareTo(BigDecimal.ZERO)>0) {
                 //赋值已计划数量
                 workOrderVo.setArrangedQuantity(workOrderVo.getProductionQuantity().subtract(workOrderVo.getRemainingQuantity()));
                 //赋值完成率

hx-wms/src/main/java/com/fjhx/wms/entity/stock/emums/JournalType.java

@@ -27,7 +27,8 @@ public enum JournalType {
     COMPLETION_IN(InOutType.IN, 17, "待入库 完工入库", ""),
     PURCHASE_ARRIVAL_IN(InOutType.IN, 18, "待入库 采购到货", ""),
     ARRIVAL_QUALITY(InOutType.IN, 19, "到货质检", "quality_info"),
-    PRODUCTION_TASK_OUT(InOutType.OUT, 20, "生产任务待出库出库", "production_task")
+    PRODUCTION_TASK_OUT(InOutType.OUT, 20, "生产任务待出库出库", "production_task"),
+    WORD_ORDER_OUT(InOutType.OUT, 21, "工单出库待出库出库", "work_order")
     ;
 
 

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitServiceImpl.java

@@ -413,6 +413,9 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         } else if (StockWaitType.PRODUCTION_TASK_OUT.getDetailType().equals(businessType)) {
             //生产任务待出库
             return JournalType.PRODUCTION_TASK_OUT.getDetailType();
+        }else if (StockWaitType.WORD_ORDER_OUT.getDetailType().equals(businessType)) {
+            //工单待出库出库
+            return JournalType.WORD_ORDER_OUT.getDetailType();
         } else {
             throw new ServiceException("未知待出入库业务类型");
         }