#

Junjie

8 天以前 b67bafd95dc17136ac0eab068ba51cd55e1669f3

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

@@ -114,17 +114,19 @@
                    }
                    break;
                case "采购到货":
                    process1 = processCGDH(orderDetls);
                    List<Object> cg = new ArrayList<>();
                    cg.add(process1);
                    //发送请求
                    response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, purchasein, JSONObject.toJSONString(cg));
                    if (!Cools.isEmpty(response) && response.isSuccess()) {
                        log.info("采购到货response:{}", response);
                        step = 10;
                    } else {
                        remark = response.getMessage() + "--" + response.getErrorStack().substring(0, 100);
                    }
                    //不需要上报了
                    step = 10;
//                    process1 = processCGDH(orderDetls);
//                    List<Object> cg = new ArrayList<>();
//                    cg.add(process1);
//                    //发送请求
//                    response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, purchasein, JSONObject.toJSONString(cg));
//                    if (!Cools.isEmpty(response) && response.isSuccess()) {
//                        log.info("采购到货response:{}", response);
//                        step = 10;
//                    } else {
//                        remark = response.getMessage() + "--" + response.getErrorStack().substring(0, 100);
//                    }
                    break;
                case "转库-出库":
                    if (step == 1) {
@@ -345,7 +347,7 @@
            }

            whsTransBillBodyVO = new WhsTransBillBodyVO();
            whsTransBillBodyVO.setCstateid(nccScPcdaWms.getVcode());
            whsTransBillBodyVO.setCstateid(nccScPcdaWms.getPkBatchcode());

            String remark = orderDetl.getRemark();
            //if (!Cools.isEmpty(remark)) {
@@ -403,7 +405,8 @@
            generalout_b.setCotherwhid(rukucangku);
            generalout_b.setCothercalbodyvid(storeType2.getDepartmentId());

            generalout_b.setNshouldassistnum(orderDetl.getQty());
            //generalout_b.setNshouldassistnum(orderDetl.getQty());
            generalout_b.setNnum(orderDetl.getQty());
            generalout_b.setVbatchcode(orderDetl.getBatch());
            ic_purchasein_bs.add(generalout_b);
        }