#

whycq

2024-11-01 9de70a6856dd8095ba17d04b01a9363782225ae2

#

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

@@ -44,8 +44,9 @@
        excludeTrash(param);
        EntityWrapper<AdjDetl> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        wrapper.orderBy("appe_time",false);
        allLike(AdjDetl.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "desc".equals(orderByType));}
        return R.ok(adjDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }


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

@@ -568,32 +568,32 @@

                // 更新订单
                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("source",33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
                FlowLog flowLog = new FlowLog();
                flowLog.setFid(String.valueOf(flowId));
                flowLog.setSpare2(wrkMast.getWrkNo().toString());
                flowLog.setLocNo(wrkMast.getSourceLocNo());
                flowLog.setSpare1(barcode);
                flowLog.setOpType(5L);
                flowLog.setOrderNo(orderDetl.getOrderNo());
                flowLog.setThreeCode(orderDetl.getThreeCode());
                flowLog.setMatnr(agvLocDetl.getMatnr());
                flowLog.setMaktx(agvLocDetl.getMaktx());
                flowLog.setOrderPrevious(orderDetl.getAnfme());
                flowLog.setOrderCurrent(orderDetl.getAnfme());
                flowLog.setOrderChanged(0.0);

                flowLog.setQtyPrevious(orderDetl.getQty());
                flowLog.setQtyCurrent(orderDetl.getQty() + agvLocDetl.getAnfme());
                flowLog.setQtyChanged(agvLocDetl.getAnfme());

                flowLog.setLocPrevious(agvLocDetl.getAnfme());
                flowLog.setLocCurrent(0.0d);
                flowLog.setLocChanged(agvLocDetl.getAnfme());
                flowLog.setUserId(getUserId());
                flowLog.setAppeTime(now);
                if (!flowLogService.insert(flowLog)) {
                    throw new CoolException("同步半成品调拨单流水记录失败");
                }
//                FlowLog flowLog = new FlowLog();
//                flowLog.setFid(String.valueOf(flowId));
//                flowLog.setSpare2(wrkMast.getWrkNo().toString());
//                flowLog.setLocNo(wrkMast.getSourceLocNo());
//                flowLog.setSpare1(barcode);
//                flowLog.setOpType(5L);
//                flowLog.setOrderNo(orderDetl.getOrderNo());
//                flowLog.setThreeCode(orderDetl.getThreeCode());
//                flowLog.setMatnr(agvLocDetl.getMatnr());
//                flowLog.setMaktx(agvLocDetl.getMaktx());
//                flowLog.setOrderPrevious(orderDetl.getAnfme());
//                flowLog.setOrderCurrent(orderDetl.getAnfme());
//                flowLog.setOrderChanged(0.0);
//
//                flowLog.setQtyPrevious(orderDetl.getQty());
//                flowLog.setQtyCurrent(orderDetl.getQty() + agvLocDetl.getAnfme());
//                flowLog.setQtyChanged(agvLocDetl.getAnfme());
//
//                flowLog.setLocPrevious(agvLocDetl.getAnfme());
//                flowLog.setLocCurrent(0.0d);
//                flowLog.setLocChanged(agvLocDetl.getAnfme());
//                flowLog.setUserId(getUserId());
//                flowLog.setAppeTime(now);
//                if (!flowLogService.insert(flowLog)) {
//                    throw new CoolException("同步半成品调拨单流水记录失败");
//                }
                orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
                if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("source",33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
                    throw new CoolException("修改订单明细失败，请联系管理员"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());

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

@@ -426,24 +426,24 @@
                    throw new CoolException("保存订单明细档失败");
                }
                // 流水 -- 新增订单明细
                FlowLog flowLog = new FlowLog();
                flowLog.setFid(String.valueOf(flowId));
                flowLog.setOpType(2L);
                flowLog.setOrderNo(param.getOrderNo());
                flowLog.setThreeCode(orderDetl.getThreeCode().trim());
                flowLog.setMatnr(orderDetl.getMatnr());
                flowLog.setMaktx(orderDetl.getMaktx());
                flowLog.setOrderPrevious(anfme);
                flowLog.setOrderCurrent(anfme + orderDetl.getAnfme());
                flowLog.setOrderChanged(orderDetl.getAnfme());
                flowLog.setQtyPrevious(orderDetl.getQty());
                flowLog.setQtyCurrent(orderDetl.getQty());
                flowLog.setQtyChanged(0.0D);
                flowLog.setUserId(getUserId());
                flowLog.setAppeTime(now);
                if (!flowLogService.insert(flowLog)) {
                    throw new CoolException("同步半成品调拨单流水记录失败");
                }
//                FlowLog flowLog = new FlowLog();
//                flowLog.setFid(String.valueOf(flowId));
//                flowLog.setOpType(2L);
//                flowLog.setOrderNo(param.getOrderNo());
//                flowLog.setThreeCode(orderDetl.getThreeCode().trim());
//                flowLog.setMatnr(orderDetl.getMatnr());
//                flowLog.setMaktx(orderDetl.getMaktx());
//                flowLog.setOrderPrevious(anfme);
//                flowLog.setOrderCurrent(anfme + orderDetl.getAnfme());
//                flowLog.setOrderChanged(orderDetl.getAnfme());
//                flowLog.setQtyPrevious(orderDetl.getQty());
//                flowLog.setQtyCurrent(orderDetl.getQty());
//                flowLog.setQtyChanged(0.0D);
//                flowLog.setUserId(getUserId());
//                flowLog.setAppeTime(now);
//                if (!flowLogService.insert(flowLog)) {
//                    throw new CoolException("同步半成品调拨单流水记录失败");
//                }
            } else {
                list.add(dto);
                orderDetl.setOrderId(order.getId());
@@ -459,24 +459,24 @@
                    throw new CoolException("保存订单明细档失败");
                }
//                // 流水 -- 新增订单明细
                FlowLog flowLog = new FlowLog();
                flowLog.setFid(String.valueOf(flowId));
                flowLog.setOpType(1L);
                flowLog.setOrderNo(param.getOrderNo());
                flowLog.setThreeCode(orderDetl.getThreeCode().trim());
                flowLog.setMatnr(orderDetl.getMatnr());
                flowLog.setMaktx(orderDetl.getMaktx());
                flowLog.setOrderPrevious(0.0D);
                flowLog.setOrderCurrent(orderDetl.getAnfme());
                flowLog.setOrderChanged(orderDetl.getAnfme());
                flowLog.setQtyPrevious(0.0D);
                flowLog.setQtyCurrent(0.0D);
                flowLog.setQtyChanged(0.0D);
                flowLog.setUserId(getUserId());
                flowLog.setAppeTime(now);
                if (!flowLogService.insert(flowLog)) {
                    throw new CoolException("同步半成品调拨单流水记录失败");
                }
//                FlowLog flowLog = new FlowLog();
//                flowLog.setFid(String.valueOf(flowId));
//                flowLog.setOpType(1L);
//                flowLog.setOrderNo(param.getOrderNo());
//                flowLog.setThreeCode(orderDetl.getThreeCode().trim());
//                flowLog.setMatnr(orderDetl.getMatnr());
//                flowLog.setMaktx(orderDetl.getMaktx());
//                flowLog.setOrderPrevious(0.0D);
//                flowLog.setOrderCurrent(orderDetl.getAnfme());
//                flowLog.setOrderChanged(orderDetl.getAnfme());
//                flowLog.setQtyPrevious(0.0D);
//                flowLog.setQtyCurrent(0.0D);
//                flowLog.setQtyChanged(0.0D);
//                flowLog.setUserId(getUserId());
//                flowLog.setAppeTime(now);
//                if (!flowLogService.insert(flowLog)) {
//                    throw new CoolException("同步半成品调拨单流水记录失败");
//                }
            }
        }
        if (param.getDocType().intValue() == 32) {
@@ -613,24 +613,24 @@
                            throw new CoolException("生成半成品调拨单明细档失败");
                        }
//                        // 流水 -- 新增订单明细
                        FlowLog flowLog = new FlowLog();
                        flowLog.setFid(String.valueOf(flowId));
                        flowLog.setOpType(1L);
                        flowLog.setOrderNo(param.getOrderNo());
                        flowLog.setThreeCode(orderDetl.getThreeCode().trim());
                        flowLog.setMatnr(orderDetl.getMatnr());
                        flowLog.setMaktx(orderDetl.getMaktx());
                        flowLog.setOrderPrevious(0.0D);
                        flowLog.setOrderCurrent(orderDetl.getAnfme());
                        flowLog.setOrderChanged(orderDetl.getAnfme());
                        flowLog.setQtyPrevious(0.0D);
                        flowLog.setQtyCurrent(0.0D);
                        flowLog.setQtyChanged(0.0D);
                        flowLog.setUserId(getUserId());
                        flowLog.setAppeTime(now);
                        if (!flowLogService.insert(flowLog)) {
                            throw new CoolException("同步半成品调拨单流水记录失败");
                        }
//                        FlowLog flowLog = new FlowLog();
//                        flowLog.setFid(String.valueOf(flowId));
//                        flowLog.setOpType(1L);
//                        flowLog.setOrderNo(param.getOrderNo());
//                        flowLog.setThreeCode(orderDetl.getThreeCode().trim());
//                        flowLog.setMatnr(orderDetl.getMatnr());
//                        flowLog.setMaktx(orderDetl.getMaktx());
//                        flowLog.setOrderPrevious(0.0D);
//                        flowLog.setOrderCurrent(orderDetl.getAnfme());
//                        flowLog.setOrderChanged(orderDetl.getAnfme());
//                        flowLog.setQtyPrevious(0.0D);
//                        flowLog.setQtyCurrent(0.0D);
//                        flowLog.setQtyChanged(0.0D);
//                        flowLog.setUserId(getUserId());
//                        flowLog.setAppeTime(now);
//                        if (!flowLogService.insert(flowLog)) {
//                            throw new CoolException("同步半成品调拨单流水记录失败");
//                        }

                    }

@@ -681,24 +681,24 @@
                    throw new CoolException("保存订单明细档失败");
                }
//                // 流水 -- 新增订单明细
                FlowLog flowLog = new FlowLog();
                flowLog.setFid(String.valueOf(flowId));
                flowLog.setOpType(2L);
                flowLog.setOrderNo(param.getOrderNo());
                flowLog.setThreeCode(orderDetl.getThreeCode().trim());
                flowLog.setMatnr(orderDetl.getMatnr());
                flowLog.setMaktx(orderDetl.getMaktx());
                flowLog.setOrderPrevious(anfme);
                flowLog.setOrderCurrent(anfme + orderDetl.getAnfme());
                flowLog.setOrderChanged(orderDetl.getAnfme());
                flowLog.setQtyPrevious(orderDetl.getQty());
                flowLog.setQtyCurrent(orderDetl.getQty());
                flowLog.setQtyChanged(0.0D);
                flowLog.setUserId(getUserId());
                flowLog.setAppeTime(now);
                if (!flowLogService.insert(flowLog)) {
                    throw new CoolException("同步半成品调拨单流水记录失败");
                }
//                FlowLog flowLog = new FlowLog();
//                flowLog.setFid(String.valueOf(flowId));
//                flowLog.setOpType(2L);
//                flowLog.setOrderNo(param.getOrderNo());
//                flowLog.setThreeCode(orderDetl.getThreeCode().trim());
//                flowLog.setMatnr(orderDetl.getMatnr());
//                flowLog.setMaktx(orderDetl.getMaktx());
//                flowLog.setOrderPrevious(anfme);
//                flowLog.setOrderCurrent(anfme + orderDetl.getAnfme());
//                flowLog.setOrderChanged(orderDetl.getAnfme());
//                flowLog.setQtyPrevious(orderDetl.getQty());
//                flowLog.setQtyCurrent(orderDetl.getQty());
//                flowLog.setQtyChanged(0.0D);
//                flowLog.setUserId(getUserId());
//                flowLog.setAppeTime(now);
//                if (!flowLogService.insert(flowLog)) {
//                    throw new CoolException("同步半成品调拨单流水记录失败");
//                }
            } else {
                if (docType == 35 && orderDetl.getProcessSts() == 1) {
                    List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>()
@@ -724,24 +724,24 @@
                    throw new CoolException("保存订单明细档失败");
                }
                // 流水 -- 新增订单明细
                FlowLog flowLog = new FlowLog();
                flowLog.setFid(String.valueOf(flowId));
                flowLog.setOpType(2L);
                flowLog.setOrderNo(param.getOrderNo());
                flowLog.setThreeCode(orderDetl.getThreeCode().trim());
                flowLog.setMatnr(orderDetl.getMatnr());
                flowLog.setMaktx(orderDetl.getMaktx());
                flowLog.setOrderPrevious(0.0D);
                flowLog.setOrderCurrent(orderDetl.getAnfme());
                flowLog.setOrderChanged(orderDetl.getAnfme());
                flowLog.setQtyPrevious(orderDetl.getQty());
                flowLog.setQtyCurrent(orderDetl.getQty());
                flowLog.setQtyChanged(0.0D);
                flowLog.setUserId(getUserId());
                flowLog.setAppeTime(now);
                if (!flowLogService.insert(flowLog)) {
                    throw new CoolException("同步半成品调拨单流水记录失败");
                }
//                FlowLog flowLog = new FlowLog();
//                flowLog.setFid(String.valueOf(flowId));
//                flowLog.setOpType(2L);
//                flowLog.setOrderNo(param.getOrderNo());
//                flowLog.setThreeCode(orderDetl.getThreeCode().trim());
//                flowLog.setMatnr(orderDetl.getMatnr());
//                flowLog.setMaktx(orderDetl.getMaktx());
//                flowLog.setOrderPrevious(0.0D);
//                flowLog.setOrderCurrent(orderDetl.getAnfme());
//                flowLog.setOrderChanged(orderDetl.getAnfme());
//                flowLog.setQtyPrevious(orderDetl.getQty());
//                flowLog.setQtyCurrent(orderDetl.getQty());
//                flowLog.setQtyChanged(0.0D);
//                flowLog.setUserId(getUserId());
//                flowLog.setAppeTime(now);
//                if (!flowLogService.insert(flowLog)) {
//                    throw new CoolException("同步半成品调拨单流水记录失败");
//                }
            }
        }
        return R.ok("订单修改成功");

 src/main/java/com/zy/asrs/entity/FlowLog.java

@@ -262,6 +262,8 @@
            otp = "取消移库";
        } else if (this.opType == 9L) {
            otp = "取消调拨";
        } else if (this.opType == 101L) {
            otp = "101.入库";
        }
        return otp;
    }

 src/main/java/com/zy/asrs/service/AgvLocDetlService.java

@@ -52,6 +52,8 @@

    public AgvLocDetl selectByMatnrAndBatchAndCsocodeAndisoCode(String locNo, String matnr, String batch, String csocode, String isocode);

    public AgvLocDetl selectByMatnrAndBatchAndCsocodeAndisoCode2(String locNo, String matnr, String orderNo, String batch, String csocode, String isocode);

    public Double selectSumAnfmeByLocNo(String locNo);

    public Double selectSumAnfmeByMatnr(String matnr);

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

@@ -5,16 +5,11 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.AgvLocDetl;
import com.zy.asrs.entity.AgvLocMast;
import com.zy.asrs.entity.AgvWrkDetl;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.AgvLocDetlMapper;
import com.zy.asrs.service.AgvBasDevpService;
import com.zy.asrs.service.AgvLocDetlService;
import com.zy.asrs.service.AgvLocMastService;
import com.zy.asrs.service.AgvWrkDetlService;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.LocDto;
import com.zy.common.model.TaskDto;
@@ -47,15 +42,50 @@
    AgvBasDevpService agvBasDevpService;
    @Autowired
    AgvLocMastService agvLocMastService;
    @Autowired
    private OrderDetlService orderDetlService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private FlowLogService flowLogService;

    public void addLocDetlInfo(String locNo, int taskCode) {
        Date now = new Date();
        List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", taskCode));
        long flowId = snowflakeIdWorker.nextId();
        agvWrkDetls.stream().map(agvWrkDetl -> {
            AgvLocDetl agvLocDetl = new AgvLocDetl();
            log.info("agvWrkDetl: " + agvLocDetl.getBarcode());
            BeanUtils.copyProperties(agvWrkDetl, agvLocDetl);
            agvLocDetl.setLocNo(locNo);
            this.insert(agvLocDetl);
            // 流水 -- 新增订单明细
            OrderDetl orderDetl = orderDetlService.selectItem(agvWrkDetl.getOrderNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getThreeCode());
//            FlowLog flowLog = new FlowLog();
//            flowLog.setFid(String.valueOf(flowId));
//            flowLog.setSpare2(String.valueOf(taskCode));
//            flowLog.setLocNo(locNo);
//            flowLog.setSpare1(agvWrkDetl.getSuppCode());
//            flowLog.setOpType(101L);
//            flowLog.setOrderNo(agvWrkDetl.getOrderNo());
//            flowLog.setThreeCode(agvWrkDetl.getThreeCode());
//            flowLog.setMatnr(agvWrkDetl.getMatnr());
//            flowLog.setMaktx(agvWrkDetl.getMaktx());
//            flowLog.setOrderPrevious(orderDetl.getAnfme());
//            flowLog.setOrderCurrent(orderDetl.getAnfme());
//            flowLog.setOrderChanged(0.0);
//            flowLog.setQtyPrevious(orderDetl.getQty()-agvWrkDetl.getAnfme());
//            flowLog.setQtyCurrent(orderDetl.getQty());
//            flowLog.setQtyChanged(agvWrkDetl.getAnfme());
//
//            flowLog.setLocPrevious(0.0D);
//            flowLog.setLocCurrent(agvWrkDetl.getAnfme());
//            flowLog.setLocChanged(agvWrkDetl.getAnfme());
//
//            flowLog.setAppeTime(now);
//            if (!flowLogService.insert(flowLog)) {
//                throw new CoolException("同步半成品调拨单流水记录失败");
//            }
            return agvLocDetl;
        }).collect(Collectors.toList());

@@ -250,6 +280,14 @@
    }

    @Override
    public AgvLocDetl selectByMatnrAndBatchAndCsocodeAndisoCode2(String locNo,String orderNo, String matnr, String batch, String csocode, String isocode) {
        EntityWrapper<AgvLocDetl> wrapper = new EntityWrapper<>();
        wrapper.eq("loc_no",locNo);
        Utils.confirmOnlyMat2(wrapper,orderNo,matnr,batch,csocode,isocode);
        return this.selectOne(wrapper);
    }

    @Override
    public Double selectSumAnfmeByLocNo(String locNo) {
        return this.baseMapper.sumByLocNo(locNo);
    }

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

@@ -150,8 +150,9 @@
                agvWrkDetlService.insert(wrkDetl);
            } else {
                Double anfme = agvWrkDetl.getAnfme() + pick.getCount();
                agvWrkDetl.setIoTime(agvWrkMast.getIoTime());
                agvWrkDetl.setAnfme(anfme);
                agvWrkDetl.setModiTime(new Date());
                agvWrkDetl.setModiTime(now);
                agvWrkDetlService.update(agvWrkDetl,new EntityWrapper<AgvWrkDetl>().eq("matnr",agvWrkDetl.getMatnr()).eq("three_code",agvWrkDetl.getThreeCode()).eq("supp_code",pick.getSuppCode()));

            }
@@ -176,7 +177,6 @@
        }
        if (totleWrkdetl >= totleLocdetl) {
            agvWrkMast.setIoType(101);
            agvWrkMast.setModiTime(new Date());
            agvWrkMastService.update(agvWrkMast,new EntityWrapper<AgvWrkMast>().eq("wrk_no", pickParams.getWrkNo()));

        }
@@ -590,6 +590,7 @@
            agvWrkDetl.setWrkNo(wrkMast.getWrkNo());
            agvWrkDetl.setModiUser(userId);
            agvWrkDetl.setModiTime(now);
            agvWrkDetl.setIoTime(now);
            if (!agvWrkDetlService.insert(agvWrkDetl)) {
                throw new CoolException("保存工作明细失败");
            }
@@ -744,6 +745,7 @@
        agvWrkMast.setWrkSts(201L);
        agvWrkMast.setModiUser(userId);
        agvWrkMast.setModiTime(now);
        agvWrkMast.setIoTime(now);



@@ -769,6 +771,7 @@
            agvWrkDetl.setOrderNo(agvWrkDetl.getOrderNo().substring(2));
            agvWrkDetl.setModiUser(userId);
            agvWrkDetl.setModiTime(now);
            agvWrkDetl.setIoTime(now);
            if (!agvWrkDetlService.update(agvWrkDetl,new EntityWrapper<AgvWrkDetl>()
                    .eq("matnr",agvWrkDetl.getMatnr())
                    .eq("three_code",agvWrkDetl.getThreeCode())
@@ -817,6 +820,7 @@
            agvWrkDetl.setWrkNo(wrkMast.getWrkNo());
            // 保持工作档明细
            agvWrkDetl.setWrkNo(wrkMast.getWrkNo());
            agvWrkDetl.setIoTime(now);
            agvWrkDetl.setModiUser(userId);
            agvWrkDetl.setModiTime(now);
            if (!agvWrkDetlService.insert(agvWrkDetl)) {

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

@@ -168,32 +168,32 @@
                    OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
                    AgvLocDetl locDetl = agvLocDetlService.selectItem(wrkMast.getSourceLocNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
                    // 流水 -- 新增订单明细
                    FlowLog flowLog = new FlowLog();
                    flowLog.setFid(String.valueOf(flowId));
                    flowLog.setSpare2(wrkMast.getWrkNo().toString());
                    flowLog.setLocNo(wrkMast.getSourceLocNo());
                    flowLog.setSpare1(containerCode);
                    flowLog.setOpType(4L);
                    flowLog.setOrderNo(locDto.getOrderNo());
                    flowLog.setThreeCode(locDto.getCsocode());
                    flowLog.setMatnr(locDto.getMatnr());
                    flowLog.setMaktx(locDto.getMaktx());
                    flowLog.setOrderPrevious(orderDetl.getAnfme());
                    flowLog.setOrderCurrent(orderDetl.getAnfme());
                    flowLog.setOrderChanged(0.0);

                    flowLog.setQtyPrevious(orderDetl.getQty());
                    flowLog.setQtyCurrent(orderDetl.getQty() + locDto.getAnfme());
                    flowLog.setQtyChanged(locDto.getAnfme());

                    flowLog.setLocPrevious(locDetl.getAnfme());
                    flowLog.setLocCurrent(locDetl.getAnfme() - locDto.getAnfme());
                    flowLog.setLocChanged(locDto.getAnfme());
                    flowLog.setUserId(userId);
                    flowLog.setAppeTime(now);
                    if (!flowLogService.insert(flowLog)) {
                        throw new CoolException("同步半成品调拨单流水记录失败");
                    }
//                    FlowLog flowLog = new FlowLog();
//                    flowLog.setFid(String.valueOf(flowId));
//                    flowLog.setSpare2(wrkMast.getWrkNo().toString());
//                    flowLog.setLocNo(wrkMast.getSourceLocNo());
//                    flowLog.setSpare1(containerCode);
//                    flowLog.setOpType(4L);
//                    flowLog.setOrderNo(locDto.getOrderNo());
//                    flowLog.setThreeCode(locDto.getCsocode());
//                    flowLog.setMatnr(locDto.getMatnr());
//                    flowLog.setMaktx(locDto.getMaktx());
//                    flowLog.setOrderPrevious(orderDetl.getAnfme());
//                    flowLog.setOrderCurrent(orderDetl.getAnfme());
//                    flowLog.setOrderChanged(0.0);
//
//                    flowLog.setQtyPrevious(orderDetl.getQty());
//                    flowLog.setQtyCurrent(orderDetl.getQty() + locDto.getAnfme());
//                    flowLog.setQtyChanged(locDto.getAnfme());
//
//                    flowLog.setLocPrevious(locDetl.getAnfme());
//                    flowLog.setLocCurrent(locDetl.getAnfme() - locDto.getAnfme());
//                    flowLog.setLocChanged(locDto.getAnfme());
//                    flowLog.setUserId(userId);
//                    flowLog.setAppeTime(now);
//                    if (!flowLogService.insert(flowLog)) {
//                        throw new CoolException("同步半成品调拨单流水记录失败");
//                    }

                }else {
                    List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class);
@@ -274,32 +274,32 @@
                    OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
                    AgvLocDetl locDetl = agvLocDetlService.selectItem(wrkMast.getSourceLocNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());

                    FlowLog flowLog = new FlowLog();
                    flowLog.setFid(String.valueOf(flowId));
                    flowLog.setSpare2(wrkMast.getWrkNo().toString());
                    flowLog.setLocNo(wrkMast.getSourceLocNo());
                    flowLog.setSpare1(containerCode);
                    flowLog.setOpType(6L);
                    flowLog.setOrderNo(locDto.getOrderNo());
                    flowLog.setThreeCode(locDto.getCsocode());
                    flowLog.setMatnr(locDto.getMatnr());
                    flowLog.setMaktx(locDto.getMaktx());
                    flowLog.setOrderPrevious(orderDetl.getAnfme());
                    flowLog.setOrderCurrent(orderDetl.getAnfme());
                    flowLog.setOrderChanged(0.0);

                    flowLog.setQtyPrevious(orderDetl.getQty());
                    flowLog.setQtyCurrent(orderDetl.getQty() + locDto.getAnfme());
                    flowLog.setQtyChanged(locDto.getAnfme());

                    flowLog.setLocPrevious(locDetl.getAnfme());
                    flowLog.setLocCurrent(locDetl.getAnfme() - locDto.getAnfme());
                    flowLog.setLocChanged(locDto.getAnfme());
                    flowLog.setUserId(userId);
                    flowLog.setAppeTime(now);
                    if (!flowLogService.insert(flowLog)) {
                        throw new CoolException("同步半成品调拨单流水记录失败");
                    }
//                    FlowLog flowLog = new FlowLog();
//                    flowLog.setFid(String.valueOf(flowId));
//                    flowLog.setSpare2(wrkMast.getWrkNo().toString());
//                    flowLog.setLocNo(wrkMast.getSourceLocNo());
//                    flowLog.setSpare1(containerCode);
//                    flowLog.setOpType(6L);
//                    flowLog.setOrderNo(locDto.getOrderNo());
//                    flowLog.setThreeCode(locDto.getCsocode());
//                    flowLog.setMatnr(locDto.getMatnr());
//                    flowLog.setMaktx(locDto.getMaktx());
//                    flowLog.setOrderPrevious(orderDetl.getAnfme());
//                    flowLog.setOrderCurrent(orderDetl.getAnfme());
//                    flowLog.setOrderChanged(0.0);
//
//                    flowLog.setQtyPrevious(orderDetl.getQty());
//                    flowLog.setQtyCurrent(orderDetl.getQty() + locDto.getAnfme());
//                    flowLog.setQtyChanged(locDto.getAnfme());
//
//                    flowLog.setLocPrevious(locDetl.getAnfme());
//                    flowLog.setLocCurrent(locDetl.getAnfme() - locDto.getAnfme());
//                    flowLog.setLocChanged(locDto.getAnfme());
//                    flowLog.setUserId(userId);
//                    flowLog.setAppeTime(now);
//                    if (!flowLogService.insert(flowLog)) {
//                        throw new CoolException("同步半成品调拨单流水记录失败");
//                    }
                }else {
                    List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class);
                    orderDtoList.forEach(orderDto -> {
@@ -361,7 +361,12 @@
            List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
            for (AgvWrkDetl agvWrkDetl : agvWrkDetlList) {
                agvWrkDetl.setIoTime(now);
                agvWrkDetlService.update(agvWrkDetl,new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
                boolean bl = agvWrkDetlService.update(agvWrkDetl,new EntityWrapper<AgvWrkDetl>()
                        .eq("wrk_no", agvWrkDetl.getWrkNo())
                        .eq("matnr",agvWrkDetl.getMatnr())
                        .eq("order_no",agvWrkDetl.getOrderNo())
                        .eq("three_code",agvWrkDetl.getThreeCode()));
//                        .eq("dead_time",agvWrkDetl.getDeadTime()));
            }
            AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMast.getLocNo());
            //List<AgvLocDetl> agvLocDetlList = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no",agvLocMast.getLocNo()));
@@ -586,34 +591,6 @@
            long flowId = snowflakeIdWorker.nextId();
            agvWaitPakinList.forEach(wp -> {
                createWrkDetlReWrite(wp.getMatnr(),wrkMast.getWrkNo(),wp.getOrderNo(),wp.getBatch(),wp.getAnfme(),wp.getSuppCode(),now,userId,wp.getThreeCode(),wp.getDeadTime(),wp.getProcessSts());
                // 流水 -- 新增订单明细
                OrderDetl orderDetl = orderDetlService.selectItem(wp.getOrderNo(), wp.getMatnr(), wp.getThreeCode());
                FlowLog flowLog = new FlowLog();
                flowLog.setFid(String.valueOf(flowId));
                flowLog.setSpare2(wrkMast.getWrkNo().toString());
                flowLog.setLocNo(locNo);
                flowLog.setSpare1(containerCode);
                flowLog.setOpType(3L);
                flowLog.setOrderNo(wp.getOrderNo());
                flowLog.setThreeCode(wp.getThreeCode());
                flowLog.setMatnr(wp.getMatnr());
                flowLog.setMaktx(wp.getMaktx());
                flowLog.setOrderPrevious(orderDetl.getAnfme());
                flowLog.setOrderCurrent(orderDetl.getAnfme());
                flowLog.setOrderChanged(0.0);
                flowLog.setQtyPrevious(orderDetl.getQty()-wp.getAnfme());
                flowLog.setQtyCurrent(orderDetl.getQty());
                flowLog.setQtyChanged(wp.getAnfme());

                flowLog.setLocPrevious(0.0D);
                flowLog.setLocCurrent(wp.getAnfme());
                flowLog.setLocChanged(wp.getAnfme());

                flowLog.setUserId(userId);
                flowLog.setAppeTime(now);
                if (!flowLogService.insert(flowLog)) {
                    throw new CoolException("同步半成品调拨单流水记录失败");
                }
            });
            //修改入库通知档状态
            agvWaitPakinService.updateIoStatus(containerCode,"Y");
@@ -932,33 +909,33 @@
                        if (!orderDetlService.updateById(orderDetl)) {
                            throw new CoolException("订单回滚失败");
                        }
                        FlowLog flowLog = new FlowLog();
                        flowLog.setFid(String.valueOf(flowId));
                        flowLog.setSpare2(wrkMast.getWrkNo().toString());
                        flowLog.setLocNo(locNo);
                        flowLog.setSpare1(wrkMast.getBarcode());
                        flowLog.setOpType(3L);
                        flowLog.setOrderNo(agvWaitPakin.getOrderNo());
                        flowLog.setThreeCode(agvWaitPakin.getThreeCode());
                        flowLog.setMatnr(agvWaitPakin.getMatnr());
                        flowLog.setMaktx(agvWaitPakin.getMaktx());
                        flowLog.setOrderPrevious(orderDetl.getAnfme());
                        flowLog.setOrderCurrent(orderDetl.getAnfme());
                        flowLog.setOrderChanged(0.0);

                        flowLog.setQtyPrevious(orderDetl.getQty());
                        flowLog.setQtyCurrent(orderDetl.getQty()-agvWaitPakin.getAnfme());
                        flowLog.setQtyChanged(-agvWaitPakin.getAnfme());

                        flowLog.setLocPrevious(0.0);
                        flowLog.setLocCurrent(0.0);
                        flowLog.setLocChanged(-agvWaitPakin.getAnfme());

                        flowLog.setUserId(userId);
                        flowLog.setAppeTime(new Date());
                        if (!flowLogService.insert(flowLog)) {
                            throw new CoolException("同步半成品调拨单流水记录失败");
                        }
//                        FlowLog flowLog = new FlowLog();
//                        flowLog.setFid(String.valueOf(flowId));
//                        flowLog.setSpare2(wrkMast.getWrkNo().toString());
//                        flowLog.setLocNo(locNo);
//                        flowLog.setSpare1(wrkMast.getBarcode());
//                        flowLog.setOpType(3L);
//                        flowLog.setOrderNo(agvWaitPakin.getOrderNo());
//                        flowLog.setThreeCode(agvWaitPakin.getThreeCode());
//                        flowLog.setMatnr(agvWaitPakin.getMatnr());
//                        flowLog.setMaktx(agvWaitPakin.getMaktx());
//                        flowLog.setOrderPrevious(orderDetl.getAnfme());
//                        flowLog.setOrderCurrent(orderDetl.getAnfme());
//                        flowLog.setOrderChanged(0.0);
//
//                        flowLog.setQtyPrevious(orderDetl.getQty());
//                        flowLog.setQtyCurrent(orderDetl.getQty()-agvWaitPakin.getAnfme());
//                        flowLog.setQtyChanged(-agvWaitPakin.getAnfme());
//
//                        flowLog.setLocPrevious(0.0);
//                        flowLog.setLocCurrent(0.0);
//                        flowLog.setLocChanged(-agvWaitPakin.getAnfme());
//
//                        flowLog.setUserId(userId);
//                        flowLog.setAppeTime(new Date());
//                        if (!flowLogService.insert(flowLog)) {
//                            throw new CoolException("同步半成品调拨单流水记录失败");
//                        }
                        // 删除组托档
                        if (!agvWaitPakinService.delete(new EntityWrapper<AgvWaitPakin>().eq("supp_code",agvWaitPakin.getSuppCode()).eq("matnr",agvWaitPakin.getMatnr()).eq("three_code",agvWaitPakin.getThreeCode()))) {
                            throw new CoolException("入库通知档取消失败");
@@ -990,33 +967,33 @@
                        if (!orderDetlService.updateById(orderDetl)) {
                            throw new CoolException("更新订单明细失败");
                        }
                        FlowLog flowLog = new FlowLog();
                        flowLog.setFid(String.valueOf(flowId));
                        flowLog.setSpare2(wrkMast.getWrkNo().toString());
                        flowLog.setLocNo(locNo);
                        flowLog.setSpare1(wrkMast.getBarcode());
                        flowLog.setOpType(8L);
                        flowLog.setOrderNo(agvLocDetl.getOrderNo());
                        flowLog.setThreeCode(agvLocDetl.getThreeCode());
                        flowLog.setMatnr(agvLocDetl.getMatnr());
                        flowLog.setMaktx(agvLocDetl.getMaktx());
                        flowLog.setOrderPrevious(orderDetl.getAnfme());
                        flowLog.setOrderCurrent(orderDetl.getAnfme());
                        flowLog.setOrderChanged(0.0);

                        flowLog.setQtyPrevious(orderDetl.getQty());
                        flowLog.setQtyCurrent(orderDetl.getQty() + agvLocDetl.getAnfme());
                        flowLog.setQtyChanged(-agvLocDetl.getAnfme());

                        flowLog.setLocPrevious(0.0);
                        flowLog.setLocCurrent(agvLocDetl.getAnfme());
                        flowLog.setLocChanged(agvLocDetl.getAnfme());

                        flowLog.setUserId(userId);
                        flowLog.setAppeTime(new Date());
                        if (!flowLogService.insert(flowLog)) {
                            throw new CoolException("同步半成品调拨单流水记录失败");
                        }
//                        FlowLog flowLog = new FlowLog();
//                        flowLog.setFid(String.valueOf(flowId));
//                        flowLog.setSpare2(wrkMast.getWrkNo().toString());
//                        flowLog.setLocNo(locNo);
//                        flowLog.setSpare1(wrkMast.getBarcode());
//                        flowLog.setOpType(8L);
//                        flowLog.setOrderNo(agvLocDetl.getOrderNo());
//                        flowLog.setThreeCode(agvLocDetl.getThreeCode());
//                        flowLog.setMatnr(agvLocDetl.getMatnr());
//                        flowLog.setMaktx(agvLocDetl.getMaktx());
//                        flowLog.setOrderPrevious(orderDetl.getAnfme());
//                        flowLog.setOrderCurrent(orderDetl.getAnfme());
//                        flowLog.setOrderChanged(0.0);
//
//                        flowLog.setQtyPrevious(orderDetl.getQty());
//                        flowLog.setQtyCurrent(orderDetl.getQty() + agvLocDetl.getAnfme());
//                        flowLog.setQtyChanged(-agvLocDetl.getAnfme());
//
//                        flowLog.setLocPrevious(0.0);
//                        flowLog.setLocCurrent(agvLocDetl.getAnfme());
//                        flowLog.setLocChanged(agvLocDetl.getAnfme());
//
//                        flowLog.setUserId(userId);
//                        flowLog.setAppeTime(new Date());
//                        if (!flowLogService.insert(flowLog)) {
//                            throw new CoolException("同步半成品调拨单流水记录失败");
//                        }
                    }
                } else {

@@ -1056,33 +1033,33 @@
                    if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no","DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
                        throw new CoolException("修改订单明细失败，请联系管理员"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
                    }
                    FlowLog flowLog = new FlowLog();
                    flowLog.setFid(String.valueOf(flowId));
                    flowLog.setSpare2(wrkMast.getWrkNo().toString());
                    flowLog.setLocNo(locNo);
                    flowLog.setSpare1(wrkMast.getBarcode());
                    flowLog.setOpType(9L);
                    flowLog.setOrderNo(agvLocDetl.getOrderNo());
                    flowLog.setThreeCode(agvLocDetl.getThreeCode());
                    flowLog.setMatnr(agvLocDetl.getMatnr());
                    flowLog.setMaktx(agvLocDetl.getMaktx());
                    flowLog.setOrderPrevious(orderDetl.getAnfme());
                    flowLog.setOrderCurrent(orderDetl.getAnfme());
                    flowLog.setOrderChanged(0.0);

                    flowLog.setQtyPrevious(orderDetl.getQty());
                    flowLog.setQtyCurrent(orderDetl.getQty() - agvLocDetl.getAnfme());
                    flowLog.setQtyChanged(- agvLocDetl.getAnfme());

                    flowLog.setLocPrevious(0.0);
                    flowLog.setLocCurrent(agvLocDetl.getAnfme());
                    flowLog.setLocChanged(agvLocDetl.getAnfme());

                    flowLog.setUserId(userId);
                    flowLog.setAppeTime(new Date());
                    if (!flowLogService.insert(flowLog)) {
                        throw new CoolException("同步半成品调拨单流水记录失败");
                    }
//                    FlowLog flowLog = new FlowLog();
//                    flowLog.setFid(String.valueOf(flowId));
//                    flowLog.setSpare2(wrkMast.getWrkNo().toString());
//                    flowLog.setLocNo(locNo);
//                    flowLog.setSpare1(wrkMast.getBarcode());
//                    flowLog.setOpType(9L);
//                    flowLog.setOrderNo(agvLocDetl.getOrderNo());
//                    flowLog.setThreeCode(agvLocDetl.getThreeCode());
//                    flowLog.setMatnr(agvLocDetl.getMatnr());
//                    flowLog.setMaktx(agvLocDetl.getMaktx());
//                    flowLog.setOrderPrevious(orderDetl.getAnfme());
//                    flowLog.setOrderCurrent(orderDetl.getAnfme());
//                    flowLog.setOrderChanged(0.0);
//
//                    flowLog.setQtyPrevious(orderDetl.getQty());
//                    flowLog.setQtyCurrent(orderDetl.getQty() - agvLocDetl.getAnfme());
//                    flowLog.setQtyChanged(- agvLocDetl.getAnfme());
//
//                    flowLog.setLocPrevious(0.0);
//                    flowLog.setLocCurrent(agvLocDetl.getAnfme());
//                    flowLog.setLocChanged(agvLocDetl.getAnfme());
//
//                    flowLog.setUserId(userId);
//                    flowLog.setAppeTime(new Date());
//                    if (!flowLogService.insert(flowLog)) {
//                        throw new CoolException("同步半成品调拨单流水记录失败");
//                    }
                }
                //出库取消
            } else {

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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
@@ -51,9 +52,17 @@
    private AgvBasDevpService agvBasDevpService;
    @Autowired
    private AgvWorkService agvWorkService;
    @Autowired
    private OrderDetlService orderDetlService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private FlowLogService flowLogService;

    @Transactional
    public ReturnT<String> completedPutWayWrk(AgvWrkMast agvWrkMast) {
        long flowId = snowflakeIdWorker.nextId();
        Date now = new Date();
        try{
            int wrkNo = agvWrkMast.getWrkNo();
            String barcode = agvWrkMast.getBarcode();
@@ -112,6 +121,34 @@
                        AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
                        if (!Cools.isEmpty(agvLocDetl)) {
                            double updateAnfme = agvLocDetl.getAnfme() - agvWrkDetl.getAnfme();
//                            OrderDetl orderDetl = orderDetlService.selectItem(agvWrkDetl.getOrderNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getThreeCode());
//                            FlowLog flowLog = new FlowLog();
//                            flowLog.setFid(String.valueOf(flowId));
//                            flowLog.setSpare2(String.valueOf(agvWrkMast.getWrkNo()));
//                            flowLog.setLocNo(agvWrkMast.getLocNo());
//                            flowLog.setSpare1(agvWrkDetl.getSuppCode());
//                            flowLog.setOpType(53L);
//                            flowLog.setOrderNo(agvWrkDetl.getOrderNo());
//                            flowLog.setThreeCode(agvWrkDetl.getThreeCode());
//                            flowLog.setMatnr(agvWrkDetl.getMatnr());
//                            flowLog.setMaktx(agvWrkDetl.getMaktx());
//
//                            flowLog.setOrderPrevious(orderDetl.getAnfme());
//                            flowLog.setOrderCurrent(orderDetl.getAnfme());
//                            flowLog.setOrderChanged(0.0);
//
//                            flowLog.setQtyPrevious(orderDetl.getQty());
//                            flowLog.setQtyCurrent(updateAnfme);
//                            flowLog.setQtyChanged(agvWrkDetl.getAnfme());
//
//                            flowLog.setLocPrevious(agvLocDetl.getAnfme());
//                            flowLog.setLocCurrent(updateAnfme);
//                            flowLog.setLocChanged(agvWrkDetl.getAnfme());
//
//                            flowLog.setAppeTime(now);
//                            if (!flowLogService.insert(flowLog)) {
//                                throw new CoolException("同步半成品调拨单流水记录失败");
//                            }
                            agvLocDetlService.updateAnfme(updateAnfme,agvLocDetl.getLocNo(),agvLocDetl.getMatnr(),agvLocDetl.getBatch(),agvLocDetl.getThreeCode(),agvLocDetl.getDeadTime());
                        }
                        //AgvLocDetl agvLocDetl = agvLocDetlService.selectLocdetl(agvWrkMast.getLocNo(),agvWrkDetl.getMatnr(),agvWrkDetl.getBatch(),agvWrkDetl.getThreeCode(),agvWrkDetl.getDeadTime());
@@ -121,7 +158,6 @@
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue());
                    break;
                case 57:
                    Date now = new Date();
                    // 更新库存明细
                    List<AgvWrkDetl> wrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
                    wrkDetlList.forEach(agvWrkDetl -> {

 src/main/java/com/zy/asrs/utils/Utils.java

@@ -460,6 +460,14 @@
        wapperSetCondition(wrapper,"batch",batch);
    }

    public static void confirmOnlyMat2(Wrapper wrapper, String orderNo, String matnr, String batch, String threeCode, String deadTime){
        wapperSetCondition(wrapper,"matnr",matnr);
        wapperSetCondition(wrapper,"order_no",orderNo);
        wapperSetCondition(wrapper,"three_code",threeCode);
        wapperSetCondition(wrapper,"dead_time",deadTime);
        wapperSetCondition(wrapper,"batch",batch);
    }

    //生成库存调整记录单据号 (年月日+4位流水)
    public static String generateAdjustOrderNo(){
        Date date = new Date();

 src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js

@@ -21,6 +21,7 @@
        cellMinWidth: 50,
        cols: [[
            {field: 'wrkNo', align: 'center',title: '工作号',event: 'wrkNo', sort: true}
            ,{field: 'ioTime$', align: 'center',title: '工作时间', width:160, sort: true}
            ,{field: 'modiTime$', align: 'center',title: '工作时间', width:160, sort: true}
            ,{field: 'wrkSts$', align: 'center',title: '工作状态', width:160}
            ,{field: 'ioType$', align: 'center',title: '入出库类型', width:160}

 src/main/webapp/static/js/wrkMastDetlLog/wrkMastDetlLog.js

@@ -10,8 +10,8 @@
        {field: 'wrkSts$', align: 'center',title: '工作状态'}
        ,{field: 'ioType$', align: 'center',title: '工作类型'}
        ,{field: 'locNo', align: 'center',title: '目标库位'}
        ,{field: 'staNo', align: 'center',title: '目标站'}
        ,{field: 'sourceStaNo', align: 'center',title: '源站'}
        // ,{field: 'staNo', align: 'center',title: '目标站'}
        // ,{field: 'sourceStaNo', align: 'center',title: '源站'}
        ,{field: 'sourceLocNo', align: 'center',title: '源库位'});
    arrRemove(detlCols,  'field', 'zpallet');
    cols.push.apply(cols, detlCols);

 src/main/webapp/views/index.html

@@ -44,7 +44,7 @@
<!--        <a ew-event="note" title="便签"><i class="layui-icon layui-icon-note"></i></a>-->
<!--      </li>-->
      <li class="layui-nav-item" lay-unselect id="licenseShow" style="display: none;user-select: none;">
        <div style="color: red;">许可证有效期：<span id="licenseDays">29</span>天</div>
<!--        <div style="color: red;">许可证有效期：<span id="licenseDays">29</span>天</div>-->
      </li>
      <li class="layui-nav-item layui-hide-xs" lay-unselect>
        <a ew-event="fullScreen" title="全屏"><i class="layui-icon layui-icon-screen-full"></i></a>

 src/main/webapp/views/report/viewWorkCountIn.html

@@ -32,14 +32,14 @@
        <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索</button>
        <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">重置</button>
    </div>
    <div class="layui-inline">
        <fieldset class="layui-elem-field">
            <legend>总计数量</legend>
            <div class="layui-field-box" id="countNum">
                请稍等
            </div>
        </fieldset>
    </div>
<!--    <div class="layui-inline">-->
<!--        <fieldset class="layui-elem-field">-->
<!--            <legend>总计数量</legend>-->
<!--            <div class="layui-field-box" id="countNum">-->
<!--                请稍等-->
<!--            </div>-->
<!--        </fieldset>-->
<!--    </div>-->
</div>

<!-- 表格 -->

 src/main/webapp/views/report/viewWorkCountOut.html

@@ -33,14 +33,14 @@
        <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索</button>
        <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">重置</button>
    </div>
    <div class="layui-inline">
        <fieldset class="layui-elem-field">
            <legend>总计数量</legend>
            <div class="layui-field-box" id="countNum">
                请稍等
            </div>
        </fieldset>
    </div>
<!--    <div class="layui-inline">-->
<!--        <fieldset class="layui-elem-field">-->
<!--            <legend>总计数量</legend>-->
<!--            <div class="layui-field-box" id="countNum">-->
<!--                请稍等-->
<!--            </div>-->
<!--        </fieldset>-->
<!--    </div>-->
</div>

<!-- 表格 -->