优化逻辑并调整线程池配置

zhangc

2024-12-17 b830ec60edf8b4a581e6ed7ca4a62e16a82d7081

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

@@ -1,13 +1,15 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.core.annotations.AppAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.param.CheckParam;
import com.zy.asrs.entity.param.MatSyncParam;
import com.zy.asrs.entity.param.OrderProdSyncParam;
import com.zy.asrs.entity.param.OrderSyncParam;
import com.zy.asrs.service.OpenService;
import com.zy.common.utils.Synchro;
import com.zy.common.web.BaseController;
@@ -116,18 +118,23 @@
            return R.parse(BaseRes.PARAM);
        }
        String docName = param.get操作单据();
        if (Cools.isEmpty(docName)) {
            docName = param.getOrderType();
        }
        switch (docName) {
            case "Purchase":
                mappingPakOutOrderParam(param, true, "银座采购入库单");
                break;
            case "MO":
                mappingPakInOrderParam(param, true, "银座委外生产订单");
                mappingOrderParam(param, false, "银座未包装成品出库单");
                if (!Cools.isEmpty(param.getChildren())) {
                    mappingOrderParamChild(param, false, "银座委外生产材料出库单");
                    mappingOrderParamChild(param, false, "银座委外材料出库单");
                }
                break;
            case "OM":
                mappingPakInOrderParam(param, true, "银座生产订单");
                mappingOrderParam(param, false, "银座委外未包装成品出库单");
                if (!Cools.isEmpty(param.getChildren())) {
                    mappingOrderParamChild(param, false, "银座生产材料出库单");
                }
@@ -156,8 +163,16 @@
            case "生产材料出库补料":
                mappingPakOutOrderParam(param, false, "银座生产材料出库补料");
                break;

            case "半成品入库单":
                mappingPakOutOrderParam(param, true, "半成品入库单");
                break;
            case "成品入库单":
                mappingPakOutOrderParam(param, true, "成品入库单");
                break;
            default:
                log.info("未知的单据类型:{}", docName);
                log.info("未知的单据类型:{}", param);
                mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get操作单据());
                break;
        }

@@ -211,15 +226,17 @@
                mappingPakOutOrderParam(param, true, "银座采购入库单");
                break;
            case "MO":
                mappingPakInOrderParam(param, true, "银座委外生产订单");
                mappingPakInOrderParam(param, true, "银座生产订单");
                mappingOrderParam(param, false, "银座未包装成品出库单");
                if (!Cools.isEmpty(param.getChildren())) {
                    mappingOrderParamChild(param, false, "银座委外生产材料出库单");
                    mappingOrderParamChild(param, false, "银座生产材料出库单");
                }
                break;
            case "OM":
                mappingPakInOrderParam(param, true, "银座生产订单");
                mappingPakInOrderParam(param, true, "银座委外生产订单");
                mappingOrderParam(param, false, "银座委外未包装成品出库单");
                if (!Cools.isEmpty(param.getChildren())) {
                    mappingOrderParamChild(param, false, "银座生产材料出库单");
                    mappingOrderParamChild(param, false, "银座委外材料出库单");
                }
                break;
            case "采购入库单退货":
@@ -246,8 +263,15 @@
            case "生产材料出库补料":
                mappingPakOutOrderParam(param, false, "银座生产材料出库补料");
                break;
            case "半成品入库单":
                mappingPakOutOrderParam(param, true, "半成品入库单");
                break;
            case "成品入库单":
                mappingPakOutOrderParam(param, true, "成品入库单");
                break;
            default:
                log.info("未知的单据类型:{}", docName);
                log.info("未知的单据类型:{}", param);
                mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get操作单据());
                break;
        }

@@ -307,13 +331,15 @@

        //生成单据明细
        OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
        Synchro.Copy(param,orderDetl);
        Synchro.Copy(param, orderDetl);
        //orderDetl.setcInvCode(param.getCInvCode());
        //orderDetl.setiQuantity(param.getIQuantity());
        orderDetl.setCDefine22(param.getIvouchrowno());
        //orderDetl.setbFree1(param.getBFree1());
        orderDetl.setId(param.getId());
        orderDetl.setIvouchrowno(param.getIvouchrowno());
        orderDetl.setINum(param.getINum());
        orderDetl.setIinvexchrate(param.getIinvexchrate());

        //添加单据明细到单据主体
        List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
@@ -350,10 +376,11 @@
            //orderDetl.setiQuantity(childInfo.getIQuantity());
            orderDetl.setCsocode(param.getCsocode());
            //orderDetl.setbFree1(childInfo.getBFree1());
            orderDetl.setId(childInfo.getIds());
            orderDetl.setId(Cools.isEmpty(childInfo.getIPOsID()) ? childInfo.getId() : childInfo.getIPOsID());
            orderDetl.setIvouchrowno(childInfo.getIvouchrowno());


            if (!Cools.isEmpty(childInfo.getCFree1())) {
                orderDetl.setBFree1(childInfo.getCFree1());
            }
            orderDetls.add(orderDetl);
        }
        orderSyncParam.setChildren(orderDetls);
@@ -368,6 +395,7 @@

        List<OrderProdSyncParam.ChildInfo> child = param.getChildren();
        Synchro.Copy(param, orderSyncParam);
        orderSyncParam.set操作系统号(param.get操作系统号());
        orderSyncParam.setCPOID(child.get(0).getOrderNoT());
        orderSyncParam.setDdate(param.getOrderTime());

@@ -380,8 +408,10 @@
            orderDetl.setCDefine22(param.getIvouchrowno());
            orderDetl.setCsocode(param.getCsocode());
            orderDetl.setId(childInfo.getIds());
            orderDetl.setIvouchrowno(childInfo.getIvouchrowno());

            //orderDetl.setIvouchrowno(childInfo.getIvouchrowno());
            if (!Cools.isEmpty(childInfo.getCFree1())) {
                orderDetl.setBFree1(childInfo.getCFree1());
            }
            orderDetls.add(orderDetl);
        }
        orderSyncParam.setChildren(orderDetls);
@@ -390,4 +420,47 @@

        //return orderSyncParam;
    }


    private void mappingOrderParam(OrderProdSyncParam param, boolean pakin, String docName) {
        //生成单据主体
        OrderSyncParam orderSyncParam = new OrderSyncParam();
        Synchro.Copy(param, orderSyncParam);

        if (Cools.isEmpty(orderSyncParam.getCPOID())) {
            orderSyncParam.setCPOID(param.getOrderNoT());
        }
        if (Cools.isEmpty(orderSyncParam.getDdate())) {
            orderSyncParam.setDdate(param.getOrderTime());
        }
        orderSyncParam.setCPOID("C" + orderSyncParam.getCPOID());
        //生成单据明细
        OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
        Synchro.Copy(param, orderDetl);

        if (!param.getCInvCode().startsWith("50")) {
            return;
        }
        //orderDetl.setcInvCode(param.getCInvCode());
        //orderDetl.setiQuantity(param.getIQuantity());
        orderDetl.setCDefine22(param.getIvouchrowno());
        //orderDetl.setbFree1(param.getBFree1());
        orderDetl.setId(param.getId());
        orderDetl.setIvouchrowno(param.getIvouchrowno());
        orderDetl.setINum(param.getINum());
        orderDetl.setIinvexchrate(param.getIinvexchrate());

        //添加单据明细到单据主体
        List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
        orderDetls.add(orderDetl);

        orderSyncParam.setChildren(orderDetls);

//        String docName = param.getIQuantity() > 0 ?  "银座产品生产入库单" : "入库退回单";
//        boolean pakin = param.getIQuantity() > 0 ? true : false;

        openService.syncOrder(orderSyncParam, pakin, docName);

        //return orderSyncParam;
    }
}