13

zhang

2025-05-26 b9d80dfdb1cef36c9edb8bf6b2fdf9e6e1708d2b

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

@@ -100,6 +100,17 @@
                    }
                    break;
                case "转库-出库":
                    if (step == 1) {
                        process2 = processGENERALOUT2(orderDetls);
                        List<Object> zkck2 = new ArrayList<>();
                        zkck2.add(process2);
                        //发送请求
                        response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, generalout, JSONObject.toJSONString(zkck2));
                        if (!Cools.isEmpty(response) && response.isSuccess()) {
                            log.info("转库-出库2response:{}", response);
                            step = 10;
                        }
                    } else {
                    process1 = processZKCK(order, orderDetls);
                    List<Object> zkck1 = new ArrayList<>();
                    zkck1.add(process1);
@@ -107,8 +118,6 @@
                    response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, whstrans, JSONObject.toJSONString(zkck1));
                    if (!Cools.isEmpty(response) && response.isSuccess()) {
                        log.info("转库-出库1response:{}", response);
                        step = 1;
                    }

                    process2 = processGENERALOUT2(orderDetls);
                    List<Object> zkck2 = new ArrayList<>();
@@ -118,6 +127,10 @@
                    if (!Cools.isEmpty(response) && response.isSuccess()) {
                        log.info("转库-出库2response:{}", response);
                        step = 10;
                            }
                        } else {
                            step = 1;
                        }
                    }
                    break;
                case "集团内部调拨":
@@ -139,7 +152,7 @@
                }
            } else if (step != 0) {
                // 修改订单状态 做标记
                if (!orderService.updateSettleStep(order.getId(), 6L, null, step)) {
                if (!orderService.updateSettleStep(order.getId(), 4L, null, step)) {
                    throw new CoolException("服务器内部错误，请联系管理员");
                }
            }
@@ -247,9 +260,8 @@
        Map<String, Object> data = new HashMap<String, Object>();
        WhsTransBillHeaderVO whsTransBillHeaderVO = new WhsTransBillHeaderVO();
        whsTransBillHeaderVO.setPk_org("FYT");
        whsTransBillHeaderVO.setCwarehouseid(order.getItemId() + "");
        whsTransBillHeaderVO.setCotherbizid(order.getAllotItemId() + "");
        whsTransBillHeaderVO.setCtrantypeid("4K-Cxx-01");
        whsTransBillHeaderVO.setCwarehouseid(order.getItemId());
        whsTransBillHeaderVO.setCtrantypeid("4K-01");
        WhsTransBillBodyVO whsTransBillBodyVO = null;
        List<WhsTransBillBodyVO> whsTransBillBodyVOS = new ArrayList<>();
        for (OrderDetl orderDetl : orderDetls) {
@@ -258,9 +270,10 @@
            //if (!Cools.isEmpty(remark)) {
            //NccSaleXsfhmxWms nccSaleXsfhmxWms = JSONObject.parseObject(remark, NccSaleXsfhmxWms.class);
            whsTransBillBodyVO.setNnum(orderDetl.getQty());
            whsTransBillBodyVO.setVfree10(orderDetl.getBatch());
            whsTransBillBodyVO.setCmaterialoid(orderDetl.getMatnr());
            whsTransBillBodyVO.setVbatchcode(orderDetl.getBatch());
            //}
            whsTransBillHeaderVO.setCotherbizid(orderDetl.getStandby1());
            whsTransBillBodyVOS.add(whsTransBillBodyVO);
        }
        data.put("WhsTransBillHeaderVO", whsTransBillHeaderVO);