#

ytfl

1 天以前 acb1348d6746ea9e6a48542baa203123559518cf

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

@@ -1,5 +1,6 @@
package com.zy.asrs.service.impl;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -77,6 +78,8 @@
    private ManLocDetlService manLocDetlService;
    @Autowired
    private ManLocDetlMapper manLocDetlMapper;
    @Autowired
    private ReportToThirdService reportToThirdService;

    @Autowired
    private InventoryCheckOrderService inventoryCheckOrderService;
@@ -785,7 +788,7 @@
        Date now = new Date();
        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());

        List<WrkDetl> list = param.getWrkDetls();
        List<WrkDetl> list = JSON.parseArray(JSON.toJSONString(param.getWrkDetls()), WrkDetl.class);
        LocDetlAdjustParam adjustParam = new LocDetlAdjustParam();
        List<LocDetlAdjustParam.LocDetlAdjust> locDetlAdjusts = new ArrayList<>();

@@ -845,9 +848,15 @@
        for (WrkDetl wrkDetl : wrkDetls1) {
            LocDetlAdjustParam.LocDetlAdjust locDetlAdjust = new LocDetlAdjustParam.LocDetlAdjust(wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme());
            locDetlAdjusts.add(locDetlAdjust);
        }

        List<WrkDetl> paramWrkDetls = JSON.parseArray(JSON.toJSONString(param.getWrkDetls()), WrkDetl.class);
        for (WrkDetl wrkDetl : paramWrkDetls) {
            String locNo = Cools.isEmpty(wrkMast.getLocNo()) ? wrkMast.getSourceLocNo() : wrkMast.getLocNo();
            List<InventoryCheckOrderDetl> checkOrderDetls = inventoryCheckOrderDetlService.selectList(new EntityWrapper<InventoryCheckOrderDetl>().eq("loc_no", locNo));
            List<InventoryCheckOrderDetl> checkOrderDetls = inventoryCheckOrderDetlService.selectList(new EntityWrapper<InventoryCheckOrderDetl>()
                    .eq("loc_no", locNo)
                    .eq("area", wrkDetl.getWrkNo())
            );
            for (InventoryCheckOrderDetl checkOrderDetl : checkOrderDetls) {
                if (wrkDetl.getMatnr().equals(checkOrderDetl.getMatnr()) && Cools.eq(wrkDetl.getBatch(), checkOrderDetl.getBatch())) {
                    checkOrderDetl.setCheckAnfme(wrkDetl.getAnfme());
@@ -856,8 +865,9 @@
                }
            }
        }

        // 修改盘点任务主档状态
        wrkMast.setFullPlt(wrkDetls1.size() != 0 ? "Y" : "N");
        wrkMast.setFullPlt("Y");
        wrkMast.setModiTime(now);
        wrkMast.setModiUser(userId);
        if (!wrkMastService.updateById(wrkMast)) {
@@ -1177,4 +1187,45 @@
            throw new CoolException(locDetl.getLocNo() + "库位不是在库状态");
        }
    }

    @Override
    public void checkOutSubmit(Integer orderId, Long userId) {
        InventoryCheckOrder inventoryCheckOrder = inventoryCheckOrderService.selectOne(new EntityWrapper<InventoryCheckOrder>()
                .eq("id", orderId));
        if (inventoryCheckOrder == null) {
            throw new CoolException("盘点单不存在");
        }

        if (!inventoryCheckOrder.getStatus().equals("1")) {
            throw new CoolException("盘点单状态已上报");
        }

        List<InventoryCheckOrderDetl> checkOrderDetlList = inventoryCheckOrderDetlService.selectList(new EntityWrapper<InventoryCheckOrderDetl>()
                .eq("order_no", inventoryCheckOrder.getOrderNo())
        );
        if (checkOrderDetlList.isEmpty()) {
            throw new CoolException("盘点单无物料明细");
        }
        InventoryCheckOrderDetl orderDetl = checkOrderDetlList.get(0);

        List<InventoryCheckOrderDetl> checkOrderDetls = inventoryCheckOrderDetlService.selectList(new EntityWrapper<InventoryCheckOrderDetl>()
                .eq("matnr", orderDetl.getMatnr())
                .eq("batch", orderDetl.getBatch())
        );

        boolean complete = true;
        for (InventoryCheckOrderDetl checkOrderDetl : checkOrderDetls) {
            if (!checkOrderDetl.getStatus().equals("2")) {
                complete = false;
            }
        }
        if (complete) {
            boolean result = reportToThirdService.reportCheckOrder(orderDetl.getMatnr(), orderDetl.getBatch());
            if (!result) {
                throw new CoolException("盘点单上报失败");
            }
        }else {
            throw new CoolException("盘点未完成无法上报");
        }
    }
}