1.对先进先出进行修复

zwl

6 小时以前 81f09b080323184922ed85c28274d5711898512b

1.对先进先出进行修复

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

@@ -153,7 +153,7 @@

    //补货出库
    public double queryStockAndSetLocDto1(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq) {
        Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>().eq("matnr", matnr).orderBy("modi_time");
        Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>().eq("matnr", matnr).orderBy("appe_time");
        wapperSetCondition(wrapper,"batch",batch);
        wapperSetCondition(wrapper,"three_code",csocode);
        wapperSetCondition(wrapper,"dead_time",isoseq);

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

@@ -438,7 +438,7 @@
                Double anfme = ioType==101?detlDto.getLocDetl().getAnfme():detlDto.getCount();
                wrkDetl.setAnfme(anfme); // 作业数量
                wrkDetl.setStock(detlDto.getLocDetl().getAnfme());
                wrkDetl.setAppeTime(now);
                wrkDetl.setAppeTime(locMast.getAppeTime());
                wrkDetl.setAppeUser(userId);
                wrkDetl.setModiTime(now);
                wrkDetl.setModiUser(userId);
@@ -552,7 +552,7 @@
                wrkDetl.setOrderNo(locDto.getOrderNo());
                wrkDetl.setAnfme(locDto.getAnfme()); // 作业数量
                wrkDetl.setStock(locDto.getStock());//总库存
                wrkDetl.setAppeTime(locMast.getAppeTime());
                wrkDetl.setAppeTime(locDetl.getAppeTime());
                wrkDetl.setAppeUser(userId);
                wrkDetl.setModiTime(now);
                wrkDetl.setModiUser(userId);
@@ -576,7 +576,7 @@
                    wrkDetl.setOrderNo(orderDto.getOrderNo());
                    wrkDetl.setAnfme(orderDto.getAnfme()); // 数量
                    wrkDetl.setStock(locDto.getStock());//总库存
                    wrkDetl.setAppeTime(locMast.getAppeTime());
                    wrkDetl.setAppeTime(locDetl.getAppeTime());
                    wrkDetl.setAppeUser(userId);
                    wrkDetl.setModiTime(now);
                    wrkDetl.setModiUser(userId);

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -213,7 +213,7 @@
                        locDetl.setDeadTime(detlDto.getIsoseq());
                        locDetl.setProddate(detlDto.getProddate());
                        locDetl.setDeadline(detlDto.getDeadline());
                        locDetl.setAppeTime(wrkDetl.get(0).getAppeTime());
                        locDetl.setAppeTime(wrkDetls53.get(0).getAppeTime());
                        locDetl.setAppeUser(9527L);
                        locDetl.setModiTime(now);
                        locDetl.setModiUser(9527L);
@@ -309,7 +309,7 @@
                        locDetl.setProddate(wrkDetl.getProddate());
                        locDetl.setDeadline(wrkDetl.getDeadline());
                        locDetl.setModiTime(now);
                        locDetl.setAppeTime(now);
                        locDetl.setAppeTime(wrkDetl.getAppeTime());
                        if (!locDetlService.insert(locDetl)) {
                            exceptionHandle("盘点入库 ===>> 添加库存明细失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                        }