Merge remote-tracking branch 'origin/tzglasrs' into tzglasrs

lty

2025-05-22 8b3be4349caa74d2dd1b834a250cb45a936e727f

 src/main/java/com/zy/common/web/WcsController.java

@@ -96,6 +96,12 @@
            return R.error("高低检测信号不能为空");
        }

        try {
            // 延迟 3 秒再检测
            Thread.sleep(3000);
        } catch (InterruptedException e) {
            e.printStackTrace();
        }
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
        sourceStaNo.setLocType1(param.getLocType1());
@@ -373,7 +379,7 @@
                    wrkDetl.setSPgNO(orderDetl.getSPgNO());
                    wrkDetl.setOutOrderNo(orderDetl.getOutOrderNo());
//                    wrkDetl.setLuHao(orderDetl.getLuHao());
                    wrkDetl.setWeight(wrkMast.getScWeight());
                    wrkDetl.setWeight(weight);
                    wrkDetl.setPacking(orderDetl.getPacking());
                    wrkDetl.setColor(orderDetl.getColor());
                    wrkDetl.setWareId(orderDetl.getWareId());