四期

zhangc

2025-02-26 189beaf2f9925fe852ca3ac0b4b2ab2d629232ad

四期

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

@@ -134,7 +134,7 @@
                mappingPakInOrderParam(param, true, "银座委外生产订单");
                mappingOrderParam(param, false, "银座未包装成品出库单");
                mappingOrderParamDB40(param, false, "半成品调拨单");
                mappingOrderParam40(param, false, "半成品出库单");
                //mappingOrderParam40(param, false, "半成品出库单");
                if (!Cools.isEmpty(param.getChildren())) {
                    mappingOrderParamChild(param, false, "银座委外材料出库单");
                }
@@ -210,7 +210,7 @@
                mappingPakInOrderParam(param, true, "银座生产订单");
                mappingOrderParam(param, false, "银座未包装成品出库单");
                mappingOrderParamDB40(param, false, "半成品调拨单");
                mappingOrderParam40(param, false, "半成品出库单");
                //mappingOrderParam40(param, false, "半成品出库单");
                if (!Cools.isEmpty(param.getChildren())) {
                    mappingOrderParamChild(param, false, "银座生产材料出库单");
                }
@@ -518,47 +518,7 @@
        //return orderSyncParam;
    }

    private void mappingOrderParam40(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("EB" + orderSyncParam.getCPOID());
        //生成单据明细
        OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
        Synchro.Copy(param, orderDetl);

        if (!(param.getCInvCode().startsWith("401") || param.getCInvCode().startsWith("402"))) {
            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;
    }

//    @PostMapping("/order/add")
//    public R re(@RequestHeader(required = false) String appkey,

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

@@ -201,8 +201,14 @@
            String[] split = o.toString().split(",");
            //-1说明是半成品箱壳出库单
            if (split[0].equals("-1")) {
                wrapper.like("order_no", "EB", SqlLike.RIGHT);
                wrapper.in("source", split);
                List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
                List<Long> docIds = new ArrayList<>();
                for (DocType pakin : pakins) {
                    if (pakin.getDocId() != 33) {
                        docIds.add(pakin.getDocId());
                    }
                }
                wrapper.in("source", docIds).andNew().like("matnr", "401", SqlLike.RIGHT).or().like("matnr", "402", SqlLike.RIGHT);
            } else {
                wrapper.in("source", split);
            }

 src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java

@@ -234,6 +234,7 @@
        Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "FOUR"));
        if (config != null && config.getStatus() == 1 && config.getValue().equals("1") && processUseTiShengJi(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo())) {
                // TODO 四期
            agvTaskCreateParam.setTaskTyp("F100");
        } else {
            switch (agvWrkMast.getIoType()) {
                case 114:

 src/main/resources/application.yml

@@ -1,4 +1,4 @@
spring:
  profiles:
    #dev loc prod
    active: loc
    active: prod