Merge branch 'phyzwms2' into phyzasrs-erp

zhangchao

2024-11-08 07fc18f77a9764bd47857e30d65abc03cc1e439c

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

@@ -123,7 +123,7 @@
            case "MO":
                mappingPakInOrderParam(param, true, "银座委外生产订单");
                if (!Cools.isEmpty(param.getChildren())) {
                    mappingOrderParamChild(param, false, "银座委外生产材料出库单");
                    mappingOrderParamChild(param, false, "银座委外材料出库单");
                }
                break;
            case "OM":
@@ -157,7 +157,8 @@
                mappingPakOutOrderParam(param, false, "银座生产材料出库补料");
                break;
            default:
                log.info("未知的单据类型:{}", docName);
                log.info("未知的单据类型:{}", param);
                mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get操作单据());
                break;
        }

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

@@ -307,7 +309,7 @@

        //生成单据明细
        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());
@@ -350,7 +352,7 @@
            //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());


@@ -368,6 +370,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 +383,7 @@
            orderDetl.setCDefine22(param.getIvouchrowno());
            orderDetl.setCsocode(param.getCsocode());
            orderDetl.setId(childInfo.getIds());
            orderDetl.setIvouchrowno(childInfo.getIvouchrowno());

            //orderDetl.setIvouchrowno(childInfo.getIvouchrowno());
            orderDetls.add(orderDetl);
        }
        orderSyncParam.setChildren(orderDetls);