#

Junjie

3 天以前 b87fd470a866ffcf50bb5c5d55ff9b2dd11fc20c

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

@@ -220,12 +220,17 @@
    }

    @Override
    public boolean reportTkrk(String matnr, String batch, String orderNo, Double anfme) {
    public boolean reportTkrk(WaitPakin waitPakin) {
        String matnr = waitPakin.getMatnr();
        String batch = waitPakin.getBatch();
        String orderNo = waitPakin.getOrderNo();
        Double anfme = waitPakin.getAnfme();

        Object process1 = null;
        NcResultMessage response1 = null;
        boolean success1 = false;
        try {
            process1 = processTKRK(matnr, batch, orderNo, anfme);
            process1 = processTKRK(matnr, batch, orderNo, anfme, waitPakin.getCstateid());
            //发送请求
            response1 = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, saveRefDelivery, JSONObject.toJSONString(process1));
            log.info("退库入库response:{}", response1);
@@ -245,7 +250,7 @@
        NcResultMessage response2 = null;
        boolean success2 = false;
        try {
            process2 = processDBTK(matnr, batch, orderNo, anfme);
            process2 = processDBTK(matnr, batch, orderNo, anfme, waitPakin.getCstateidVcode());
            //发送请求
            response2 = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, dbdd, JSONObject.toJSONString(process2));
            log.info("退库入库response:{}", response2);
@@ -342,6 +347,7 @@
            saleOutBodyVO.setVbatchcode(orderDetl.getBatch());
            saleOutBodyVO.setNshouldnum(flag ? -orderDetl.getQty() : orderDetl.getQty());
            saleOutBodyVO.setNnum(flag ? -orderDetl.getQty() : orderDetl.getQty());
            saleOutBodyVO.setCstateid(orderDetl.getCstateid());
            saleOutBodyVOList.add(saleOutBodyVO);
        }
        data.put("SaleOutHeadVO", saleOutHeadVO);
@@ -349,7 +355,7 @@
        return data;
    }

    private Object processTKRK(String matnr,String batch, String orderNo, Double anfme) {
    private Object processTKRK(String matnr, String batch, String orderNo, Double anfme, String cstateid) {
//        EntityWrapper<NccXsckmxTkWms> wrapper = new EntityWrapper<>();
//        wrapper.eq("VBATCHCODE", batch).eq("VSOURCEBILLCODE", orderNo);
//        NccXsckmxTkWms nccXsckmxTkWms = nccXsckmxTkWmsService.selectOne(wrapper);
@@ -361,7 +367,7 @@
                .eq("VBILLCODE", orderNo)
                .eq("WLBM", matnr)
        );
        if(null == nccSaleXsfhmxWms) {
        if (null == nccSaleXsfhmxWms) {
            throw new CoolException("未找到销售单据");
        }

@@ -380,6 +386,7 @@

        saleOutBodyVO.setVbatchcode(batch);
        saleOutBodyVO.setNnum(anfme * -1);
        saleOutBodyVO.setCstateid(cstateid);
        saleOutBodyVOList.add(saleOutBodyVO);

        data.put("SaleOutHeadVO", saleOutHeadVO);
@@ -387,7 +394,7 @@
        return data;
    }

    private Object processDBTK(String matnr, String batch, String orderNo, Double anfme) {
    private Object processDBTK(String matnr, String batch, String orderNo, Double anfme, String cstateid) {
        List<NccSaleDbddWms> nccSaleDbddWmsList = nccSaleDbddWmsService.selectList(new EntityWrapper<NccSaleDbddWms>()
                .eq("wlbm", matnr)
                .eq("vbillcode", orderNo)
@@ -404,10 +411,10 @@

        List<IaIjBillB> bids = new ArrayList<>();
        IaIjBillB iaIjBillB = new IaIjBillB();
        NccScPcdaWms nccScPcdaWms = nccScPcdaWmsService.selectOne(new EntityWrapper<NccScPcdaWms>().eq("vbatchcode", batch).eq("wlbm", matnr));
        if (nccScPcdaWms == null) {
            throw new CoolException("批次[{}]物料[{}]未找到" + batch + "-" + matnr);
        }
//        NccScPcdaWms nccScPcdaWms = nccScPcdaWmsService.selectOne(new EntityWrapper<NccScPcdaWms>().eq("vbatchcode", batch).eq("wlbm", matnr));
//        if (nccScPcdaWms == null) {
//            throw new CoolException("批次[{}]物料[{}]未找到" + batch + "-" + matnr);
//        }

        Double weight = MatUtils.calcWeight(matnr, anfme);
        iaIjBillB.setBid(nccSaleDbddWms.getCbill_bid());
@@ -415,7 +422,7 @@
        iaIjBillB.setNnum(anfme * -1);
        iaIjBillB.setVbatchcode(batch);
        iaIjBillB.setClocationid("");
        iaIjBillB.setCstateid(nccScPcdaWms.getVcode());
        iaIjBillB.setCstateid(cstateid);

        bids.add(iaIjBillB);

@@ -521,11 +528,6 @@
            IaIjBillB iaIjBillB = new IaIjBillB();
            String remark = orderDetl.getRemark();
            if (!Cools.isEmpty(remark)) {
                NccScPcdaWms nccScPcdaWms = nccScPcdaWmsService.selectOne(new EntityWrapper<NccScPcdaWms>().eq("vbatchcode", orderDetl.getBatch()).eq("wlbm", orderDetl.getMatnr()));
                if (nccScPcdaWms == null) {
                    throw new CoolException("批次[{}]物料[{}]未找到" + orderDetl.getBatch() + "-" + orderDetl.getMatnr());
                }

                Double weight = MatUtils.calcWeight(orderDetl.getMatnr(), orderDetl.getQty());
                NccSaleDbddWms nccSaleDbddWms = JSONObject.parseObject(remark, NccSaleDbddWms.class);
                iaIjBillB.setBid(nccSaleDbddWms.getCbill_bid());
@@ -533,11 +535,11 @@
                iaIjBillB.setNnum(orderDetl.getQty());
                iaIjBillB.setVbatchcode(orderDetl.getBatch());
                iaIjBillB.setClocationid("");
                iaIjBillB.setCstateid(nccScPcdaWms.getVcode());
                iaIjBillB.setCstateid(orderDetl.getCstateidVcode());

                hid = nccSaleDbddWms.getCbillid();
                bids.add(iaIjBillB);
            }
            bids.add(iaIjBillB);
        }
        data.put("hid", hid);
        data.put("bids", bids);
@@ -596,7 +598,7 @@
            }

            whsTransBillBodyVO = new WhsTransBillBodyVO();
            whsTransBillBodyVO.setCstateid(nccScPcdaWms.getPkStorestate());
            whsTransBillBodyVO.setCstateid(orderDetl.getCstateid());

            String remark = orderDetl.getRemark();
            //if (!Cools.isEmpty(remark)) {
@@ -648,7 +650,7 @@
            generalout_b.setCsourcetype("4K-01");
            generalout_b.setCsourcebillhid(cspecialhid);
            generalout_b.setCmaterialvid(orderDetl.getMatnr());
            generalout_b.setCstateid(nccScPcdaWms.getPkStorestate());
            generalout_b.setCstateid(orderDetl.getCstateid());
            generalout_b.setPk_batchcode(nccScPcdaWms.getPkBatchcode());
            StoreType storeType = storeTypeService.selectOne(new EntityWrapper<StoreType>().eq("store_id", orderDetl.getStandby1()));
            generalout_b.setCdptvid(storeType.getDepartmentId());