Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms

zc

2025-06-05 7abc1ed37a17dc7a46289e9373c51d0d38dd11f3

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -96,7 +96,11 @@
                }
            } else {
                if (!Cools.isEmpty(param.getMsgType()) && param.getMsgType().equalsIgnoreCase("task_complete")) {
                    wrkMast.setWrkSts(14L);
                    if (wrkMast.getStaNo()==1031){
                        wrkMast.setWrkSts(106L);
                    }else {
                        wrkMast.setWrkSts(14L);
                    }
                }
            }
            wrkMast.setModiTime(new Date());
@@ -186,7 +190,7 @@
        if (Cools.isEmpty(param.getOrderType())) {
            return R.error("单据类型[orderType]不能为空");
        }
        if (Cools.isEmpty(param.getOrderDetails())) {
        if (Cools.isEmpty(param.getDetails())) {
            return R.error("单据明细[orderDetails]不能为空");
        }
        openService.pakinOrderCreate(param);
@@ -228,7 +232,7 @@
        if (Cools.isEmpty(param.getOrderType())) {
            return R.error("单据类型[orderType]不能为空");
        }
        if (Cools.isEmpty(param.getOrderDetails())) {
        if (Cools.isEmpty(param.getDetails())) {
            return R.error("单据明细[orderDetails]不能为空");
        }
        openService.pakoutOrderCreate(param);