#

Administrator

2 天以前 1ee1574b1fce92407e45438b0141121d266efd3d

#

 src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java

@@ -627,6 +627,9 @@
                            }
                        }
                    } else {  //入库/回库有料任务完成
                        if(mast.getIoType() !=2){

                        }
                        WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()));
                        if (Objects.isNull(wrkDetl)) {
                            throw new CoolException("数据错误，任务明细不存在！！");
@@ -681,9 +684,9 @@
                                throw new CoolException("子任务档明细不存在！！");
                            }
                            //库存减去称重长度
                            Double v = Math.round((wrkDetl.getStockQty() - realQty) * 10000) / 10000.0;
                            Double v = Math.round((detl.getStockQty() - realQty) * 10000) / 10000.0;
                            log.info("主任务明细回写计算: mainWrkNo={}, v=(stockQty-realQty)={}, stockQty={}, realQty={}",
                                    wrkNo, v, wrkDetl.getStockQty(), realQty);
                                    wrkNo, v, detl.getStockQty(), realQty);
                            //原出为数量与真实数量互换，保持一致性
                            if(v<= 0){
                                detl.setAnfme(matnr.getSafeQty());//设定为默认值
@@ -713,9 +716,9 @@
                                throw new CoolException("主任务档明细不存在！！");
                            }
                            //库存减去称重长度
                            Double v = Math.round((wrkDetl.getStockQty() - realQty) * 10000) / 10000.0;
                            Double v = Math.round((detl.getStockQty() - realQty) * 10000) / 10000.0;
                            log.info("回库主任务明细回写计算: mainWrkNo={}, v=(stockQty-realQty)={}, stockQty={}, realQty={}",
                                    wrkNo, v, wrkDetl.getStockQty(), realQty);
                                    wrkNo, v, detl.getStockQty(), realQty);
                            //原出为数量与真实数量互换，保持一致性
                            if(v<= 0){
                                detl.setAnfme(matnr.getSafeQty());//设定为默认值

 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java

@@ -70,6 +70,7 @@
        if (Cools.isEmpty(list)) {
            return;
        }
        list.sort(Comparator.comparing(OrderPakout::getCreateTime, Comparator.nullsLast(Date::compareTo)));
        for (OrderPakout order : list) {
            if (order.getDocType() != null) {
                DocType docType = docTypeService.selectById(order.getDocType());

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

@@ -146,6 +146,10 @@
            if (candidate == sourceCrnNo) {
                continue;
            }
            Integer runingCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>()
                    .eq("io_type", 101).eq("crn_no",candidate)
                    .in("wrk_sts", Arrays.asList(2L, 3L, 4L, 11L, 12L)));
            if(runingCount != null && runingCount > 5) {continue;}
            Integer candidateEmpty = locMastService.selectCount(new EntityWrapper<LocMast>()
                    .eq("crn_no", candidate)
                    .eq("loc_sts", "O")