#

zjj

2023-09-13 5c7f3dcb91943485b7f98e98a8c14b37b8d3cacf

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

@@ -9,10 +9,7 @@
import com.core.exception.CoolException;
import com.sun.org.apache.xpath.internal.operations.Or;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.param.OffSaleParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
@@ -82,6 +79,9 @@
    private ManLocDetlMapper manLocDetlMapper;
    @Autowired
    private WaitPakinLogService waitPakinLogService;

    @Autowired
    private  LocCheckService locCheckService;



@@ -206,8 +206,7 @@
                    throw new CoolException("修改单据作业数量失败");
                }

                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getOwner(),elem.getWeight());
                detlDto.setPayment(orderDetl.getPayment());
                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),elem.getWeight());
                if (DetlDto.has(detlDtos, detlDto)) {
                    DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
                    assert one != null;
@@ -531,6 +530,11 @@
        Date date = new Date();
        String jsonLocNo = (String) json.get("locNo");

        LocMast locMast = locMastService.selectLocStatus(jsonLocNo);
        if (locMast.getLocSts().equals("X")){
            return R.error("库位已被冻结");
        }

        List<ManLocDetl> locDetls = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo));
        Node node = nodeService.selectOne(new EntityWrapper<Node>()
                .eq("name", jsonLocNo));
@@ -594,6 +598,7 @@
                manLocDetl.setOwner(orderDetl.getOwner());
                manLocDetl.setWeight(jsonOrderDetl.getWeight());
                manLocDetl.setOrderNo(jsonOrderDetl.getOrderNo());
                manLocDetl.setStockFreeze(1);
                if(!manLocDetlService.insert(manLocDetl)){
                    return R.error("插入平库物料失败！");
                }
@@ -649,6 +654,12 @@
    public R manDetlOut(JSONObject json,User user) {
        Date date = new Date();
        String jsonLocNo = (String) json.get("locNo");

        LocMast locMast = locMastService.selectLocStatus(jsonLocNo);
        if (locMast.getLocSts().equals("X")){
            return R.error("库位已被冻结");
        }

        Node node = nodeService.selectOne(new EntityWrapper<Node>()
                .eq("name", jsonLocNo));
        JSONArray combMats = json.getJSONArray("combMats");
@@ -783,6 +794,11 @@
        String jsonLocNo = (String) json.get("locNo"); //获取库位码
        String jsonBarNo = (String) json.get("barcode"); //获取托盘码

        LocMast locMast = locMastService.selectLocStatus(jsonLocNo);
        if (locMast.getLocSts().equals("X")){
            return R.error("库位已被冻结");
        }

        List<WaitPakin> waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", jsonBarNo)); //获取对应组托信息
        if (Cools.isEmpty(waitPakins)){
            return R.error("未查询到组托");
@@ -827,8 +843,7 @@
            manLocDetl.setUpdateBy(user.getId());
            manLocDetl.setModiTime(date);
            manLocDetl.setOrderNo(waitPakin.getOrderNo());
            manLocDetl.setOwner(waitPakin.getOwner());
            manLocDetl.setPayment(waitPakin.getPayment());
            manLocDetl.setStockFreeze(1);

            if (!manLocDetlService.insert(manLocDetl)){  //数据库插入实体类信息
                return R.error("物料信息入库失败");
@@ -852,8 +867,6 @@
            waitPakinLog.setModiTime(date);
            waitPakinLog.setAppeUser(user.getId());
            waitPakinLog.setAppeTime(date);
            waitPakinLog.setOwner(waitPakin.getOwner());
            waitPakinLog.setPayment(waitPakin.getPayment());
            waitPakinLog.setUuid(waitPakin.getUuid());

            if (!waitPakinLogService.insert(waitPakinLog)){  //插入入库通知历史档数据库
@@ -880,4 +893,51 @@
        }
        return R.ok("上架成功");
    }

    @Override
    public R adjustNew(MobileAdjustNewParam combParam, Long userId) {


        for (WrkDetl detl: combParam.getWrkDetls()){
            EntityWrapper<LocCheck> wrapper = new EntityWrapper<>();
            wrapper.eq("order_no", combParam.getOrderNo())
                    .eq("matnr", detl.getMatnr())
                    .eq("loc_no", detl.getLocNo());
            LocCheck CheckDetl = locCheckService.selectOne(wrapper);
            if (CheckDetl == null){
                Date now = new Date();
                LocCheck locCheck = new LocCheck();
                locCheck.setLocNo(detl.getLocNo());
                locCheck.setMaktx(detl.getMaktx());
                locCheck.setType(1);
                locCheck.setMatnr(detl.getMatnr());
                locCheck.setAnfme(detl.getAnfme());
                locCheck.setRealAnfme(detl.getAnfme());
                locCheck.setDiffAnfme(detl.getAnfme());
                locCheck.setExamine(0);
                locCheck.setOwner(detl.getOwner());
                locCheck.setPayment(detl.getPayment());
                locCheck.setCreateTime(now);
                locCheck.setUpdateTime(now);
                locCheck.setOrderNo(combParam.getOrderNo());

                if (!locCheckService.insert(locCheck)){
                    return R.error("盘点明细插入失败");
                }
            }else {
                CheckDetl.setRealAnfme(detl.getAnfme());
                CheckDetl.setDiffAnfme(detl.getAnfme()- CheckDetl.getAnfme());
                if (!locCheckService.update(CheckDetl,wrapper)){
                    return R.error("明细更新失败");
                }



            }


        }

        return R.ok("盘点成功");
    }
}