1

zhang

2025-05-28 41b60e560952a6db3a99a3972dc146c3b177cb77

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

@@ -197,16 +197,18 @@
        Map<String, Object> data = new HashMap<String, Object>();
        SaleOutHeadVO saleOutHeadVO = new SaleOutHeadVO();
        saleOutHeadVO.setPk_org("FYT");
        saleOutHeadVO.setCwarehouseid("6101");
        SaleOutBodyVO saleOutBodyVO = null;
        List<SaleOutBodyVO> saleOutBodyVOList = new ArrayList<>();
        for (OrderDetl orderDetl : orderDetls) {
            if (orderDetl.getQty() <= 0) {
                continue;
            }
            saleOutBodyVO = new SaleOutBodyVO();
            String remark = orderDetl.getRemark();
            if (!Cools.isEmpty(remark)) {
                NccSaleXsfhmxWms nccSaleXsfhmxWms = JSONObject.parseObject(remark, NccSaleXsfhmxWms.class);
                saleOutBodyVO.setCsourcetype("4331");
                saleOutBodyVO.setClocationid("610101");
                //saleOutBodyVO.setClocationid("610101");
                saleOutBodyVO.setCsourcebillbid(nccSaleXsfhmxWms.getCdeliverybid());
                saleOutBodyVO.setCsourcebillhid(nccSaleXsfhmxWms.getCdeliveryid());
                saleOutHeadVO.setVdef2(nccSaleXsfhmxWms.getVdef2());
@@ -217,9 +219,11 @@
                saleOutHeadVO.setVdef13(nccSaleXsfhmxWms.getVdef13());
                saleOutHeadVO.setVdef14(nccSaleXsfhmxWms.getVdef14());
            }
            saleOutHeadVO.setCwarehouseid(orderDetl.getStandby1());

            saleOutBodyVO.setVbatchcode(orderDetl.getBatch());
            saleOutBodyVO.setNshouldnum(flag ? -orderDetl.getAnfme() : orderDetl.getAnfme());
            saleOutBodyVO.setNnum(orderDetl.getQty());
            saleOutBodyVO.setNshouldnum(flag ? -orderDetl.getQty() : orderDetl.getQty());
            saleOutBodyVO.setNnum(flag ? -orderDetl.getQty() : orderDetl.getQty());
            saleOutBodyVOList.add(saleOutBodyVO);
        }
        data.put("SaleOutHeadVO", saleOutHeadVO);
@@ -232,7 +236,6 @@
        Map<String, Object> data = new HashMap<String, Object>();
        GeneralInHeadVO generalInHeadVO = new GeneralInHeadVO();
        generalInHeadVO.setPk_org("FYT");
        generalInHeadVO.setCwarehouseid("6101");
        GeneralInBodyVO generalInBodyVO = null;
        List<GeneralInBodyVO> generalInBodyVOS = new ArrayList<>();
        for (OrderDetl orderDetl : orderDetls) {
@@ -246,7 +249,9 @@
                generalInBodyVO.setNnum(orderDetl.getQty());
                generalInBodyVO.setNshouldnum(orderDetl.getAnfme());
                generalInBodyVO.setCsourcetype(nccScZkmxbWms.getZklxbm());

            }
            generalInHeadVO.setCwarehouseid(orderDetl.getStandby1());
            generalInBodyVOS.add(generalInBodyVO);
        }
        data.put("GeneralInHeadVO", generalInHeadVO);