#新增和得码入库流程，渝程进仓后续下发货主转换

lty

1 天以前 f08dd93e49e8461f362c8f45f17fe10e0fbdebec

 src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java

@@ -26,6 +26,7 @@
import java.util.Arrays;
import java.util.HashMap;
import java.util.Set;
import java.util.concurrent.TimeUnit;

/**
 * Created by vincent on 2023/10/21
@@ -56,15 +57,19 @@
    @Value("${erp.address.imMdcMftfeedorderReport}")
    //生产补料单上报
    private String imMdcMftfeedorderReport;
    @Value("${erp.address.imProductinbillReport}")
    @Value("${erp.address.imProductinbillBatchAudit}")
    //生产汇报单上报
    private String imProductinbillReport;
    private String imProductinbillBatchAudit;
    @Value("${erp.address.imOtheroutbillAudi}")
    //其他出库审核上报
    private String imOtheroutbillAudi;
    @Value("${erp.address.imOtherinbillAudit}")
    //其他入库审核上报
    private String imOtherinbillAudit;

    @Value("${erp.address.imMdcOmprdinbillBatchAudit}")
    //其他入库审核上报
    private String imMdcOmprdinbillBatchAudit;
    @Autowired
    private OrderService orderService;
    @Autowired
@@ -107,7 +112,10 @@
                                          SimpleDateFormat sdf1, SimpleDateFormat sdf2) {
        JSONArray idArray = new JSONArray();
        JSONObject dataObj = new JSONObject();
        switch (kingDeeUtilType.formId) {
        if(kingDeeUtilType == null){
            return null;
        }
        switch(kingDeeUtilType.formId) {
            case "PUR_RECEIVEBIll": // 进仓通知单提交
                path = imPurinbillBatchAudit;
                idArray.add(order.getNumber());
@@ -116,6 +124,16 @@
            case "SAL_OUTSTOCK"://销售出库上报
                path = imSaloutbillReport;
                idArray.add(order.getOrderNo());
                dataObj.fluentPut("billno", idArray);
                return new JSONObject().fluentPut("data", dataObj);
            case "STK_imSaloutbill":
                path = imSaloutbillReport;
                idArray.add(order.getShipCode());
                dataObj.fluentPut("billno", idArray);
                return new JSONObject().fluentPut("data", dataObj);
            case "OUI_RECEIVEBIll":
                path = imMdcOmprdinbillBatchAudit;
                idArray.add(order.getShipCode());
                dataObj.fluentPut("billno", idArray);
                return new JSONObject().fluentPut("data", dataObj);
            case "SAL_RETURNSTOCK"://销售退料单
@@ -138,10 +156,11 @@
                dataObj.fluentPut("id", idArray);
                return new JSONObject().fluentPut("data", dataObj);
            case "PRD_MORPT"://生产汇报单
                path = imProductinbillReport;
                path = imProductinbillBatchAudit;
                idArray.add(order.getNumber());
                dataObj.fluentPut("id", idArray);
                dataObj.fluentPut("ids", idArray);
                return new JSONObject().fluentPut("data", dataObj);

            case "STK_MISCELLANEOUS"://其他入库单
                path = imOtheroutbillAudi;
                idArray.add(order.getId());
@@ -171,6 +190,7 @@
                    .setUri(URL)
                    .setPath(path)
                    .setJson(add.toJSONString()) // 将 JSONObject 转换为 String
                    .setTimeout(30, TimeUnit.SECONDS)
                    .build()
                    .doPost();

@@ -190,14 +210,14 @@
                        .setUri(URL)
                        .setPath(path)
                        .setJson(add.toJSONString()) // 将 JSONObject 转换为 String
                        .setTimeout(30, TimeUnit.SECONDS)
                        .build()
                        .doPost();
            }
            // 解析返回的响应
            JSONObject data = jsonResponse.getJSONObject("data");
            String errorCode = jsonResponse.getString("errorCode");
            boolean status = jsonResponse.getBooleanValue("status");
            if ("0".equals(errorCode) && status) {
            if (status) {
                // 获取成功与失败的数量
                int successCount = data.getInteger("successCount");
                int failCount = data.getInteger("failCount");
@@ -221,8 +241,16 @@
                        }
                    }
                }

                order.setSettle(8L); // 更新状态为已上报审核 9->8
                if((order.getDocType() == 16L || order.getDocType() == 24L || order.getDocType() == 3) && order.getCstmrName().equals("和得科技")){
                    order.setDocType(23L);
                    order.setSettle(4L);//转为出库单据上报
                }else{
                    if(order.getDocType() == 23L){
                        Order order1 = orderService.selectOne(new EntityWrapper<Order>().eq("salesman",order.getOrderNo()));
                        orderService.updateOrderStatus4(order1.getOrderNo());
                    }
                    order.setSettle(8L); // 更新状态为已上报审核 9->8
                }
                orderService.updateById(order);
            } else {
                log.error("接口调用失败，错误信息: {}", jsonResponse.getString("message"));