#

1

2026-01-22 a006bb4695b29bd0a78ccbf62f6841d08ceb7048

#

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

@@ -39,6 +39,7 @@
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<BasAgvMastLog> wrapper = new EntityWrapper<>();
        wrapper.orderBy("modi_time", false);
        excludeTrash(param);
        convert(param, wrapper);
        allLike(BasAgvMastLog.class, param.keySet(), wrapper, condition);

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

@@ -97,7 +97,7 @@
        final double LENGTH_MIN = 315, LENGTH_MAX = 1150;
        final double WIDTH_MIN = 160, WIDTH_MAX = 730;
        final double HEIGHT_MIN = 140, HEIGHT_MAX = 810;

        final double WIEGHT_MIN = 0,WIEGHT_MAX = 23;
        for (OrderDetlPakin detl : list) {
            Mat mat = matService.selectOne(
                    new EntityWrapper<Mat>().eq("matnr", detl.getMatnr())
@@ -110,6 +110,7 @@
            Double len = mat.getManLength();
            Double wid = mat.getWidth();
            Double hei = mat.getHeight();
            Double WET = mat.getWeight();

            if (len == null || len < LENGTH_MIN || len > LENGTH_MAX) {
                errorMessages.add(String.format("物料 %s 长度异常：必须 %.0f~%.0f mm，当前 %s",
@@ -123,6 +124,10 @@
                errorMessages.add(String.format("物料 %s 高度异常：必须 %.0f~%.0f mm，当前 %s",
                        detl.getMatnr(), HEIGHT_MIN, HEIGHT_MAX, hei));
            }
            if (hei == null || WET < WIEGHT_MIN || WET > WIEGHT_MAX) {
                errorMessages.add(String.format("物料 %s 毛重异常：必须 %.0f~%.0f mm，当前 %s",
                        detl.getMatnr(), WIEGHT_MIN, WIEGHT_MAX, hei));
            }
        }

        if (!errorMessages.isEmpty()) {

 src/main/java/com/zy/asrs/entity/BasAgvMast.java

@@ -196,6 +196,8 @@
                return "完成";
            case 3:
                return "转历史";
            case 4:
                return "上报完成";
            default:
                return String.valueOf(this.status);
        }

 src/main/java/com/zy/asrs/entity/BasAgvMastLog.java

@@ -209,6 +209,10 @@
                return "作业中";
            case 2:
                return "完成";
            case 3:
                return "转历史";
            case 4:
                return "上报完成";
            default:
                return String.valueOf(this.status);
        }

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

@@ -925,7 +925,7 @@
            if(combMat.getSupplier().equals("1")){
                List<OrderDetlPakin> orderDetlPakins2 = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>()
                        .eq("matnr", combMat.getMatnr()).eq("box_type3", combMat.getOrderNo())
                        .eq("box_type2","BU-00001"));
                        .in("box_type2", "BU-00001", "BU-00002"));
                if (orderDetlPakins2.size() > 0) {
                    orderNo1 = orderDetlPakins2.get(0).getOrderNo();
                } else {

 src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java

@@ -27,8 +27,8 @@
        inboundOrderHandler.syncMaterialData(); // 同步物料档案
    }

    //    @Scheduled(cron = "0 */6 * * * ?")
    @Scheduled(cron = "0/5 * * * * ?")
        @Scheduled(cron = "0 */6 * * * ?")
//    @Scheduled(cron = "0/5 * * * * ?")
    void login(){
        if(!InboundOrderSwitch){
            return;

 src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java

@@ -336,7 +336,7 @@
                                if (mat.getUpdateTime().compareTo(modifyTime) != 0) {
                                    // 更新字段
                                    if (!mat.getMaktx().equals(name)) mat.setMaktx(name);
                                    if (!mat.getMemo().equals(memo)) mat.setMemo(memo);
                                    if (mat.getMemo() == null || !mat.getMemo().equals(memo)) mat.setMemo(memo);
                                    if (mat.getWeight().compareTo(grossweight) != 0) mat.setWeight(grossweight);
                                    if (mat.getUnits().compareTo(netweight) != 0) mat.setUnits(netweight);
                                    if (mat.getSafeQty().compareTo(unit) != 0) mat.setSafeQty(unit);
@@ -489,14 +489,14 @@
                                    JSONObject jsonObjectNew2 = rows.getJSONObject(i);
                                    Order order = orderService.selectByNo(billNo);//检索单据
                                    LocOwner locOwner = null;
                                    if (ownerUuid != null) {
                                        locOwner = locOwnerService.selectByUuid(ownerUuid);
                                        if (locOwner == null) {
                                            callApiLogSaveOwner(locOwner,kingDeeUtilType, "货主检索失败，请先添加对应货主编号："+ownerUuid+"名称"+owner, false);continue;
                                        }
                                    } else{
                                        callApiLogSaveOwner(locOwner,kingDeeUtilType, "货主检索失败，未查询到货主编号！", false);continue;
                                    }
//                                    if (ownerUuid != null) {
//                                        locOwner = locOwnerService.selectByUuid(ownerUuid);
//                                        if (locOwner == null) {
//                                            callApiLogSaveOwner(locOwner,kingDeeUtilType, "货主检索失败，请先添加对应货主编号："+ownerUuid+"名称"+owner, false);continue;
//                                        }
//                                    } else{
//                                        callApiLogSaveOwner(locOwner,kingDeeUtilType, "货主检索失败，未查询到货主编号！", false);continue;
//                                    }
                                    if (Cools.isEmpty(order)) {
                                        // 单据主档
                                        order = new Order(
@@ -1581,16 +1581,19 @@
                            for (int k = 0; k < billEntryArray.size(); k++) {
                                JSONObject entry = billEntryArray.getJSONObject(k);
                                String matnr = entry.getString("material_number"); //物料编码，内部SKU
                                Double anfmeBox = 0.0;//箱数
                                Double anfmeBox = entry.getDouble("eap7_integerfield");//箱数
                                Double anfme = entry.getDouble("completqty");//个数
                                Double totalNumItems = entry.getDouble("eap7_decimalfield1");//总件数
                                Double totalVolume = entry.getDouble("eap7_decimalfield2");//总体积
                                String warehouse = entry.getString("warehouse_number");//仓库编码
                                if(kingDeeUtilType.formId.equals("OUI_RECEIVEBIll")){

                                }
                                String pOrderNo = entry.getString("eap7_textfield");//采购单号
                                String s3 = entry.getString("eap7_textfield4");//客户sku（客户编号）
                                String s3 = entry.getString("eap7_textfield2");//客户sku（客户编号）
                                String s2 = entry.getString("eap7_textfield1"); //条码UPC
                                String memo = entry.getString("eap7_textfield6"); //备注（英文描述）
                                String s1 = entry.getString("eap7_textfield7"); //客户PO
                                String memo = entry.getString("eap7_textfield5"); //备注（英文描述）
                                String s1 = entry.getString("eap7_textfield4"); //客户PO
                                String detlId = entry.getString("id"); //明细id
                                Long seq = entry.getLong("seq"); //分录行号
                                Double taxrate = entry.getDouble("taxrate");

 src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java

@@ -250,6 +250,7 @@
                        orderService.updateOrderStatus4(order1.getOrderNo());
                    }
                    order.setSettle(8L); // 更新状态为已上报审核 9->8
                    orderService.updateById(order);
                }
                orderService.updateById(order);
            } else {

 src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java

@@ -4,16 +4,16 @@
    BD_MATERIAL(0, "物料档案","BD_MATERIAL","","","",1),
    BD_RRGANIZATION(2, "供应商","BD_RRGANIZATION","","","",1),
    PUR_RECEIVEBIll(3, "收料单","PUR_RECEIVEBIll","","","",1),
//    SAL_OUTSTOCK(7, "销售出库单","SAL_OUTSTOCK","FRealQty","","",0),
//    STK_MisDelivery(19, "其他出库单","STK_MisDelivery","FQty","","",0),
//    STK_MISCELLANEOUS(18, "其他入库单","STK_MISCELLANEOUS","FQty","其他入库单","STK_MISCELLANEOUS",1),
    SAL_OUTSTOCK(7, "销售出库单","SAL_OUTSTOCK","FRealQty","","",0),
    STK_MisDelivery(19, "其他出库单","STK_MisDelivery","FQty","","",0),
    STK_MISCELLANEOUS(18, "其他入库单","STK_MISCELLANEOUS","FQty","其他入库单","STK_MISCELLANEOUS",1),

//    SAL_RETURNSTOCK(9, "销售退货单","SAL_RETURNSTOCK","","","",1),
//    PRD_PickMtrl(10, "生产领料单","PRD_PickMtrl","","","",0),
//    PRD_ReturnMtrl(12, "生产退料单","PRD_ReturnMtrl","","","",1),
//    PRD_FeedMtrl(14, "生产补料单","PRD_FeedMtrl","","","",0),
//    PRD_MORPT(16, "生产汇报单","PRD_MORPT","","生产入库单","",1),
//    OUI_RECEIVEBIll(24, "委外入库单","OUI_RECEIVEBIll","","","",1),
    SAL_RETURNSTOCK(9, "销售退货单","SAL_RETURNSTOCK","","","",1),
    PRD_PickMtrl(10, "生产领料单","PRD_PickMtrl","","","",0),
    PRD_ReturnMtrl(12, "生产退料单","PRD_ReturnMtrl","","","",1),
    PRD_FeedMtrl(14, "生产补料单","PRD_FeedMtrl","","","",0),
    PRD_MORPT(16, "生产汇报单","PRD_MORPT","","生产入库单","",1),
    OUI_RECEIVEBIll(24, "委外入库单","OUI_RECEIVEBIll","","","",1),

    //    PUR_MRB(2, "采购退料单","PUR_MRB","FRMREALQTY","","",1),
//    STK_TransferDirect(6, "直接调拨单","STK_TransferDirect","","FQty","",1),

 src/main/webapp/static/js/common.js

@@ -194,14 +194,14 @@
    // ,{field: 'unit', align: 'center',title: '单位', hide: true}
    // ,{field: 'price', align: 'center',title: '单价', hide: true}
    ,{field: 'standby2', align: 'center',title: '条码upc', hide: true}
    ,{field: 'units', align: 'center',title: '单箱毛重kg', hide: false}
    ,{field: 'weight', align: 'center',title: '单箱毛重kg', hide: false}
    ,{field: 'barcode', align: 'center',title: '条码', hide: true}
    ,{field: 'origin', align: 'center',title: '在库标记', hide: true}
    ,{field: 'manu', align: 'center',title: '仓库编码', hide: true}
    // ,{field: 'manuDate', align: 'center',title: '生产日期', hide: true}
    // ,{field: 'itemNum', align: 'center',title: '品项数', hide: true}
    ,{field: 'safeQty', align: 'center',title: '总件数', hide: true}
    ,{field: 'weight', align: 'center',title: '单箱净重kg', hide: false}
    ,{field: 'units', align: 'center',title: '单箱净重kg', hide: false}
    ,{field: 'manLength', align: 'center',title: '长（毫米）', hide: false}
    ,{field: 'width', align: 'center',title: '宽（毫米）', hide: false}
    ,{field: 'height', align: 'center',title: '高（毫米）', hide: false}