添加工厂判断逻辑及优化库位查找

zhangc

2024-12-25 aa3476e8ff45d168f0bb9376ed3a114610a65f12

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

@@ -6,13 +6,12 @@
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.DocType;
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.DocTypeService;
import com.zy.asrs.service.OpenService;
import com.zy.common.utils.Synchro;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,14 +39,12 @@
    @Autowired
    private OpenService openService;

    @Autowired
    private DocTypeService docTypeService;

    /**
     * 库存统计
     */
    @RequestMapping("/stock/default/v1")
    public R queryStock(@RequestHeader(required = false) String appkey, HttpServletRequest request) {
    public R queryStock(@RequestHeader(required = false) String appkey,
                        HttpServletRequest request) {
        auth(appkey, null, request);
        return R.ok().add(openService.queryStock());
    }
@@ -57,7 +54,9 @@
     */
    @PostMapping("/mat/v1")
    @AppAuth(memo = "物料同步接口")
    public synchronized R syncMatInfoErp(@RequestHeader(required = false) String appkey, @RequestBody(required = false) MatSyncParam param, HttpServletRequest request) {
    public synchronized R syncMatInfoErp(@RequestHeader(required = false) String appkey,
                                         @RequestBody(required = false) MatSyncParam param,
                                         HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
@@ -84,65 +83,14 @@
    }


    @PostMapping("/order/pak/default/v1")
    @AppAuth(memo = "生成退货补货单据")
    public synchronized R orderAccept(@RequestHeader(required = false) String appkey, @RequestBody(required = true) OrderSyncParam param, HttpServletRequest request) {
        log.info("生成退货补货单据,{}", JSON.toJSONString(param));
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        DocType type = getType(param.get操作单据(), param.getChildren().get(0).getIQuantity());
        if (!Cools.isEmpty(type)) {
            if (type.getPakin() == 1) {
                openService.syncOrder(param, true, type.getDocName());
            } else {
                openService.syncOrder(param, false, type.getDocName());
            }
        } else {
            return R.ok("单据接受失败，不是约定的单据l类型");
        }
//        String docName = param.get操作单据();
//        boolean pakin = param.getPakin() == 1 ? true : false;
//
//        openService.syncOrder(param, pakin, docName);

        return R.ok("单据接受成功");

    }

    @PostMapping("/order/pakin/default/v1")
    @AppAuth(memo = "生成入库单据")
    public synchronized R orderPakin(@RequestHeader(required = false) String appkey, @RequestBody(required = true) OrderSyncParam param, HttpServletRequest request) {
        log.info("生成入库单据,{}", JSON.toJSONString(param));
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }

//        String docName = !Cools.isEmpty(param.getOrderType()) ? param.getOrderType() : param.getChildren().get(0).getIQuantity() > 0 ? "银座采购入库单" : "银座采购退货单";
//        boolean pakin = param.getChildren().get(0).getIQuantity() > 0 ? true : false;

        DocType type = getType(param.get操作单据(), param.getChildren().get(0).getIQuantity());
        if (!Cools.isEmpty(type)) {
            if (type.getPakin() == 1) {
                openService.syncOrder(param, true, type.getDocName());
            } else {
                openService.syncOrder(param, false, type.getDocName());
            }
        } else {
            return R.ok("单据接受失败，不是约定的单据l类型");
        }
        return R.ok("单据接受成功");

    }

    /*
    盘点接口
     */
  盘点接口
   */
    @PostMapping("/check/default/v1")
    @AppAuth(memo = "库存盘点")
    public synchronized R checkLoc(@RequestHeader(required = false) String appkey, @RequestBody(required = true) CheckParam param, HttpServletRequest request) {
    public synchronized R checkLoc(@RequestHeader(required = false) String appkey,
                                   @RequestBody CheckParam param,
                                   HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
@@ -154,64 +102,203 @@

    }


    @PostMapping("/order/pakout/default/v1")
    @AppAuth(memo = "同步工单单据")
    public synchronized R orderPakout(@RequestHeader(required = false) String appkey,
                                      //@RequestBody(required = false) HashMap<String,Object> param,
                                      @RequestBody(required = false) OrderProdSyncParam param, HttpServletRequest request) {
        log.info("同步工单单据,{}", JSON.toJSONString(param));
    @PostMapping("/order/pakin/default/v1")
    @AppAuth(memo = "生成入库单据")
    public synchronized R orderPakin(@RequestHeader(required = false) String appkey,
                                     @RequestBody Map<String, Object> map,
                                     HttpServletRequest request) {
        log.info("生成入库单据,{}", JSON.toJSONString(map));
        OrderProdSyncParam param = JSON.parseObject(JSON.toJSONString(map), OrderProdSyncParam.class);
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }

        DocType type = getType(param.get操作单据(), param.getIQuantity());
        if (!Cools.isEmpty(type)) {
            if (type.getDocName().equals("MO")) {
                mappingPakInOrderParam(param, true, type.getDocName());
                mappingPakOutOrderParam(param, false, "银座委外材料出库单");
            } else if (type.getDocName().equals("OM")) {
                mappingPakInOrderParam(param, true, type.getDocName());
                mappingPakOutOrderParam(param, false, "银座生产材料出库单");
            } else {
                if (type.getPakin() == 1) {
                    mappingPakInOrderParam(param, true, type.getDocName());
                    if (!Cools.isEmpty(param.getChildren())) {
                        mappingPakOutOrderParam(param, false, type.getDocName());
                    }
                } else {
                    mappingPakOutOrderParam(param, false, type.getDocName());
                }
            }
        } else {
            return R.ok("单据接受失败，不是约定的单据l类型");
        if (Cools.isEmpty(param.getOrderNo()) && Cools.isEmpty(param.getCPOID())) {
            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, "银座委外材料出库单");
                }
                break;
            case "OM":
                mappingPakInOrderParam(param, true, "银座生产订单");
                mappingOrderParam(param, false, "银座委外未包装成品出库单");
                if (!Cools.isEmpty(param.getChildren())) {
                    mappingOrderParamChild(param, false, "银座生产材料出库单");
                }
                break;
            case "采购入库单退货":
                mappingPakOutOrderParam(param, false, "银座采购入库单退货");
                break;
            case "委外入库单退货":
                mappingPakOutOrderParam(param, false, "银座委外入库单退货");
                break;
            case "其他出库单":
                mappingPakOutOrderParam(param, false, "其他出库单");
                break;
            case "其他入库单":
                mappingPakOutOrderParam(param, true, "其他入库单");
                break;
            case "委外材料出库退料":
                mappingPakOutOrderParam(param, true, "银座委外材料出库退料");
                break;
            case "生产材料出库退料":
                mappingPakOutOrderParam(param, true, "银座生产材料出库退料");
                break;
            case "委外材料出库补料":
                mappingPakOutOrderParam(param, false, "银座委外材料出库补料");
                break;
            case "生产材料出库补料":
                mappingPakOutOrderParam(param, false, "银座生产材料出库补料");
                break;

//        if (!Cools.eq("生产", param.getCVouchtype())) {
//            String docName = param.getIQuantity() > 0 ? "银座委外入库单" : "银座委外入库退货单";
//            boolean pakin = param.getIQuantity() > 0 ? true : false;
//            mappingPakInOrderParam(param, pakin, docName);
//
//            if (!Cools.isEmpty(param.getChildren())) {
//                String docName1 = param.getChildren().get(0).getIQuantity() > 0 ? "银座委外材料出库单" : "银座委外材料退料单";
//                boolean pakin1 = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
//                mappingPakOutOrderParam(param, pakin1, docName1);
//            }
//
//        } else if (!Cools.isEmpty(param.getChildren())) {
//            String docName1 = param.getChildren().get(0).getIQuantity() > 0 ? "银座生产材料出库单" : "银座生产材料退料单";
//            boolean pakin1 = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
//            mappingPakOutOrderParam(param, pakin1, docName1);
//        }
            case "半成品入库单":
                mappingPakOutOrderParam(param, true, "半成品入库单");
                break;
            case "成品入库单":
                mappingPakOutOrderParam(param, true, "成品入库单");
                break;
            default:
                log.info("未知的单据类型:{}", param);
                mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get操作单据());
                break;
        }

        return R.ok("单据接受成功");

    }


    @PostMapping("/order/pakout/default/v1")
    @AppAuth(memo = "同步工单单据")
    public synchronized R orderPakout(@RequestHeader(required = false) String appkey,
                                      @RequestBody Map<String, Object> map) {
        log.info("同步工单单据,{}", JSON.toJSONString(map));
        OrderProdSyncParam param = JSON.parseObject(JSON.toJSONString(map), OrderProdSyncParam.class);
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getOrderNo()) && Cools.isEmpty(param.getCPOID())) {
            return R.parse(BaseRes.PARAM);
        }
        String docName = param.get操作单据();
        switch (docName) {
            case "Purchase":
                mappingPakOutOrderParam(param, true, "银座采购入库单");
                break;
            case "MO":
                mappingPakInOrderParam(param, true, "银座生产订单");
                mappingOrderParam(param, false, "银座未包装成品出库单");
                if (!Cools.isEmpty(param.getChildren())) {
                    mappingOrderParamChild(param, false, "银座生产材料出库单");
                }
                break;
            case "OM":
                mappingPakInOrderParam(param, true, "银座委外生产订单");
                mappingOrderParam(param, false, "银座委外未包装成品出库单");
                if (!Cools.isEmpty(param.getChildren())) {
                    mappingOrderParamChild(param, false, "银座委外材料出库单");
                }
                break;
            case "采购入库单退货":
                mappingPakOutOrderParam(param, false, "银座采购入库单退货");
                break;
            case "委外入库单退货":
                mappingPakOutOrderParam(param, false, "银座委外入库单退货");
                break;
            case "其他出库单":
                mappingPakOutOrderParam(param, false, "其他出库单");
                break;
            case "其他入库单":
                mappingPakOutOrderParam(param, true, "其他入库单");
                break;
            case "委外材料出库退料":
                mappingPakOutOrderParam(param, true, "银座委外材料出库退料");
                break;
            case "生产材料出库退料":
                mappingPakOutOrderParam(param, true, "银座生产材料出库退料");
                break;
            case "委外材料出库补料":
                mappingPakOutOrderParam(param, false, "银座委外材料出库补料");
                break;
            case "生产材料出库补料":
                mappingPakOutOrderParam(param, false, "银座生产材料出库补料");
                break;
            case "半成品入库单":
                mappingPakOutOrderParam(param, true, "半成品入库单");
                break;
            case "成品入库单":
                mappingPakOutOrderParam(param, true, "成品入库单");
                break;
            default:
                log.info("未知的单据类型:{}", param);
                mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get操作单据());
                break;
        }
        return R.ok("单据接受成功");

    }

    @PostMapping("/order/pak/default/v1")
    @AppAuth(memo = "生成入库单据")
    public synchronized R orderPakin2(@RequestHeader(required = false) String appkey,
                                      @RequestBody Map<String, Object> map,
                                      HttpServletRequest request) {
        log.info("生成入库单据,{}", JSON.toJSONString(map));
        OrderProdSyncParam param = JSON.parseObject(JSON.toJSONString(map), OrderProdSyncParam.class);
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getOrderNo()) && Cools.isEmpty(param.getCPOID())) {
            return R.parse(BaseRes.PARAM);
        }
        String docName = param.getOrderType();
        if (Cools.isEmpty(docName)) {
            return R.parse(BaseRes.PARAM);
        }
        switch (docName) {
            case "银座生产领料申请单":
                mappingPakOutOrderParam(param, false, "银座生产领料申请单");
                break;
            case "银座生产退料申请单":
                mappingPakOutOrderParam(param, true, "银座生产退料申请单");
                break;
            case "银座生产补料申请单":
                mappingPakOutOrderParam(param, false, "银座生产补料申请单");
                break;
            case "银座生产入库申请单":
                mappingPakOutOrderParam(param, true, "银座生产入库申请单");
                break;
            default:
                log.info("未知的单据类型:{}", param);
                mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, docName);
                // return R.error("单据接受失败:未知的单据类型");
                break;
        }

        return R.ok("单据接受成功");

    }


    @PostMapping("/order/delete/default/v1")
    @AppAuth(memo = "单据删除审核")
    public synchronized R orderDelete(@RequestHeader(required = false) String appkey, @RequestBody(required = false) Map<String, Object> param, HttpServletRequest request) {
    public synchronized R orderDelete(@RequestHeader(required = false) String appkey,
                                      @RequestBody(required = false) Map<String, Object> param,
                                      HttpServletRequest request) {
        log.info("单据删除审核,{}", JSON.toJSONString(param));
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
@@ -231,19 +318,30 @@
    private void mappingPakInOrderParam(OrderProdSyncParam param, boolean pakin, String docName) {
        //生成单据主体
        OrderSyncParam orderSyncParam = new OrderSyncParam();
        orderSyncParam.set操作系统号(param.get操作系统号());
        orderSyncParam.setcPOID(param.getOrderNoT());
        orderSyncParam.setDdate(param.getOrderTime());
        orderSyncParam.setcMemo(param.getCMemo());
        Synchro.Copy(param, orderSyncParam);

        if (Cools.isEmpty(orderSyncParam.getCPOID())) {
            orderSyncParam.setCPOID(param.getOrderNoT());
        }
        if (Cools.isEmpty(orderSyncParam.getDdate())) {
            orderSyncParam.setDdate(param.getOrderTime());
        }

        if (!Cools.isEmpty(param.getCInvCode()) && param.getCInvCode().startsWith("60")) {
            return;
        }

        //生成单据明细
        OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
        orderDetl.setcInvCode(param.getCInvCode());
        orderDetl.setiQuantity(param.getIQuantity());
        orderDetl.setcDefine22(param.getDefine24());
        orderDetl.setbFree1(param.getBFree1());
        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<>();
@@ -259,89 +357,112 @@
        //return orderSyncParam;
    }


    private void mappingPakOutOrderParam(OrderProdSyncParam param, boolean pakin, String docName) {
        OrderSyncParam orderSyncParam = new OrderSyncParam();

        List<OrderProdSyncParam.ChildInfo> child = param.getChildren();

        //生成单据主体
        orderSyncParam.set操作系统号(param.get操作系统号());
        orderSyncParam.setcPOID(child.get(0).getOrderNoT());
        orderSyncParam.setDdate(param.getOrderTime());
        orderSyncParam.setcMemo("");
        Synchro.Copy(param, orderSyncParam);
        if (Cools.isEmpty(orderSyncParam.getCPOID())) {
            orderSyncParam.setCPOID(param.getOrderNoT());
            orderSyncParam.setDdate(param.getOrderTime());
        }

        //生成单据明细
        List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();

        for (OrderProdSyncParam.ChildInfo childInfo : child) {
            OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
            orderDetl.setcInvCode(childInfo.getCInvCode());
            orderDetl.setiQuantity(childInfo.getIQuantity());
            Synchro.Copy(childInfo, orderDetl);
            //orderDetl.setcInvCode(childInfo.getCInvCode());
            //orderDetl.setiQuantity(childInfo.getIQuantity());
            orderDetl.setCsocode(param.getCsocode());
            orderDetl.setbFree1(childInfo.getBFree1());
            orderDetl.setId(childInfo.getIds());
            //orderDetl.setbFree1(childInfo.getBFree1());
            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);

        openService.syncOrder(orderSyncParam, false, docName);
        openService.syncOrder(orderSyncParam, pakin, docName);

        //return orderSyncParam;
    }

    private void mappingOrderParamChild(OrderProdSyncParam param, boolean pakin, String docName) {
        OrderSyncParam orderSyncParam = new OrderSyncParam();

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

        //生成单据明细
        List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();

        for (OrderProdSyncParam.ChildInfo childInfo : child) {
            OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
            Synchro.Copy(childInfo, orderDetl);
            orderDetl.setCDefine22(param.getIvouchrowno());
            orderDetl.setCsocode(param.getCsocode());
            orderDetl.setId(childInfo.getIds());
            //orderDetl.setIvouchrowno(childInfo.getIvouchrowno());
            if (!Cools.isEmpty(childInfo.getCFree1())) {
                orderDetl.setBFree1(childInfo.getCFree1());
            }
            orderDetls.add(orderDetl);
        }
        orderSyncParam.setChildren(orderDetls);

        openService.syncOrder(orderSyncParam, pakin, docName);

        //return orderSyncParam;
    }


    private DocType getType(String type, Double iQuantity) {
        DocType docType = new DocType();
        switch (type) {
            case "Purchase":
                docType.setDocName("银座采购入库单");
                docType.setPakin(1);
                break;
            case "MO":
                docType.setDocName("银座生产订单");
                docType.setPakin(0);
                break;
            case "OM":
                docType.setDocName("银座委外生产订单");
                docType.setPakin(0);
                break;
            case "采购入库单退货":
                docType.setDocName("银座采购入库单退货单");
                docType.setPakin(0);
                break;
            case "委外入库单退货":
                docType.setDocName("银座委外入库单退货单");
                docType.setPakin(1);
                break;
            case "生产材料出库退料":
                docType.setDocName("银座生产材料出库退料单");
                docType.setPakin(1);
                break;
            case "委外材料出库退料":
                docType.setDocName("银座委外材料出库退料单");
                docType.setPakin(1);
                break;
            case "生产材料出库补料":
                docType.setDocName("银座生产材料出库补料单");
                docType.setPakin(0);
                break;
            case "委外材料出库补料":
                docType.setDocName("银座委外材料出库补料单");
                docType.setPakin(0);
                break;
            case "其他入库单":
                docType.setDocName("银座其他入库单");
                docType.setPakin(1);
                break;
            case "其他出库单":
                docType.setDocName("银座其他出库单");
                docType.setPakin(0);
                break;
            default:
                docType = docTypeService.selectOrAdd(type, iQuantity > 0);
    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());
        }
        return docType;
        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;
    }
}