#

ytfl

6 天以前 e1067677ba7b4d258e05427e2993c97428274207

#

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

@@ -318,6 +318,7 @@
            matParam.setTiaoma(matnr);

            map.put("orderNo", nccXsckmxTkWms.getVsourcebillcode());
            map.put("khmc", nccXsckmxTkWms.getKhmc());
            map.put("matData", matParam);
            list.add(map);
        }

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

@@ -10,6 +10,6 @@

    void report(Order order, List<OrderDetl> orderDetls, DocType docType) throws Exception;

    void reportTkrk(String batch, String orderNo, Double anfme);
    boolean reportTkrk(String batch, String orderNo, Double anfme);

}

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

@@ -210,16 +210,18 @@
    }

    @Override
    public void reportTkrk(String batch, String orderNo, Double anfme) {
    public boolean reportTkrk(String batch, String orderNo, Double anfme) {
        Object process1 = processTKRK(batch, orderNo, anfme);
        //发送请求
        NcResultMessage response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, saveRefDelivery, JSONObject.toJSONString(process1));
        log.info("销售发货response:{}", response);
//        if (!Cools.isEmpty(response) && response.isSuccess()) {
//            log.info("销售发货response:{}", response);
//        } else {
        log.info("退库入库response:{}", response);
        if (!Cools.isEmpty(response) && response.isSuccess()) {
            log.info("退库入库response:{}", response);
            return true;
        } else {
//            remark = response.getMessage() + "--" + response.getErrorStack().substring(0, 100);
//        }
            return false;
        }
    }

    private Object processXSFH(List<OrderDetl> orderDetls, Boolean flag) {
@@ -291,7 +293,6 @@
        saleOutHeadVO.setCwarehouseid(nccSaleXsfhmxWms.getFhckbm());

        saleOutBodyVO.setVbatchcode(nccXsckmxTkWms.getVbatchcode());
        saleOutBodyVO.setNshouldnum(anfme * -1);
        saleOutBodyVO.setNnum(anfme * -1);
        saleOutBodyVOList.add(saleOutBodyVO);


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

@@ -71,7 +71,10 @@
                    if (!Cools.isEmpty(wrkMast.getBarcode())) {
                        WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
                        if (!Cools.isEmpty(waitPakin.getTkFlag())) {
                            reportToThirdService.reportTkrk(waitPakin.getBatch(), waitPakin.getTkFlag(), waitPakin.getAnfme());
                            boolean result = reportToThirdService.reportTkrk(waitPakin.getBatch(), waitPakin.getTkFlag(), waitPakin.getAnfme());
                            if (!result) {
                                exceptionHandle("退库入库上报ERP[workNo={0}]失败", wrkMast.getWrkNo());
                            }
                        }

                        // 保存入库通知档历史档

 src/main/resources/application.yml

@@ -88,7 +88,7 @@
NYNC:
  ip: http://192.168.5.200
  port: 1105
  pageSize: 100
  pageSize: 1000
  #1.销售出库单参照发货单新增
  saveRefDelivery: /nccloud/api/ic/saleout/saveRefDelivery
  #2.其他入库单参照转库新增