Merge branch 'tzskasrs-2' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-2

tzsk

2024-02-20 22a51a35a7367bc5569ea075afe0b7f1c438b529

 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java

@@ -544,7 +544,7 @@
                wrkDetl.setBatch(locDto.getBatch());
                wrkDetl.setOrderNo(locDto.getOrderNo());
                wrkDetl.setAnfme(locDto.getAnfme()); // 作业数量
                wrkDetl.setStock(locDto.getStock());
                wrkDetl.setStock(locDto.getStock());//总库存
                wrkDetl.setAppeTime(now);
                wrkDetl.setAppeUser(userId);
                wrkDetl.setModiTime(now);
@@ -568,6 +568,7 @@
                    wrkDetl.setBatch(locDto.getBatch());
                    wrkDetl.setOrderNo(orderDto.getOrderNo());
                    wrkDetl.setAnfme(orderDto.getAnfme()); // 数量
                    wrkDetl.setStock(locDto.getStock());//总库存
                    wrkDetl.setAppeTime(now);
                    wrkDetl.setAppeUser(userId);
                    wrkDetl.setModiTime(now);