Browse Source

PDA分拣出库优化

k 2 years ago
parent
commit
8d4c3d14d6

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/pda/PdaController.java

@@ -441,7 +441,7 @@ public class PdaController {
 
     /**
      * 组盘
-     *
+     * 1.PDA备货组盘(传出库单号) 2.PDA分拣组盘(不传出库单号)
      * @return
      */
     @PostMapping("/docOrder/groupDisk")

+ 13 - 9
warewms-ams/src/main/java/com/ruoyi/ams/order/service/impl/WmsDocOrderHeaderServiceImpl.java

@@ -630,19 +630,23 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         // 验证sn
         CodeSkuRelationshipVO codeSkuRelationshipVO = codeSkuRelationshipService.snCheck(sn);
         WmsDocOrderHeader docOrderHeader = wmsDocOrderHeaderService.selectWmsDocOrderHeaderByOrderNo(orderNo);
-        if (docOrderHeader.getOrderStatus().equals(Constant.ORDER_STS.STS90.getValue())) {
-            return AjaxResult.error("已经全部分拣完成!");
+        if (!docOrderHeader.getOrderType().equals(Constant.ORDER_TYP.ZC.getValue())) {
+            return AjaxResult.error("出库单类型不可分拣!");
         }
-        // 验证备货单 没有备货完成 不能分拣出库
-        if (docOrderHeader.getOrderType().equals(Constant.ORDER_TYP.BH.getValue())
-                && !docOrderHeader.getOrderStatus().equals(Constant.ORDER_STS.STS23.getValue())
+        if (!docOrderHeader.getOrderStatus().equals(Constant.ORDER_STS.STS20.getValue())
                 && !docOrderHeader.getOrderStatus().equals(Constant.ORDER_STS.STS30.getValue())) {
-            return AjaxResult.error("没有备货完成不能分拣出库!");
+            return AjaxResult.error("出库单状态不可分拣!");
         }
+        // 验证备货单 没有备货完成 不能分拣出库
+//        if (docOrderHeader.getOrderType().equals(Constant.ORDER_TYP.BH.getValue())
+//                && !docOrderHeader.getOrderStatus().equals(Constant.ORDER_STS.STS23.getValue())
+//                && !docOrderHeader.getOrderStatus().equals(Constant.ORDER_STS.STS30.getValue())) {
+//            return AjaxResult.error("没有备货完成不能分拣出库!");
+//        }
         // 库内理货单不能分拣出库
-        if (docOrderHeader.getOrderType().equals(Constant.ORDER_TYP.LH.getValue())) {
-            return AjaxResult.error("库内理货单不能分拣出库!");
-        }
+//        if (docOrderHeader.getOrderType().equals(Constant.ORDER_TYP.LH.getValue())) {
+//            return AjaxResult.error("库内理货单不能分拣出库!");
+//        }
         // 查询出分配明细
         List<ActAllocationDetailsFrom> actAllocationDetailsFromList = new ArrayList<>();
         ActAllocationDetailsFrom actAllocationQuery = new ActAllocationDetailsFrom();