优化地图搜索及生成逻辑

zhangc

2024-11-25 f70e3397fb1d108440ec3478bee8675687f0a1c3

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

@@ -116,6 +116,9 @@
            return R.parse(BaseRes.PARAM);
        }
        String docName = param.get操作单据();
        if (Cools.isEmpty(docName)) {
            docName = param.getOrderType();
        }
        switch (docName) {
            case "Purchase":
                mappingPakOutOrderParam(param, true, "银座采购入库单");
@@ -156,9 +159,16 @@
            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操作单据());
                mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get操作单据());
                break;
        }

@@ -249,7 +259,7 @@
                break;
            default:
                log.info("未知的单据类型:{}", param);
                mappingPakOutOrderParam(param,  param.getPakin() == 1 ? true : false, param.get操作单据());
                mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get操作单据());
                break;
        }

@@ -316,6 +326,8 @@
        //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<>();
@@ -352,10 +364,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);
@@ -384,6 +397,9 @@
            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);