生产单xml导入问题修复：1、xmlvo目录结构改变；2、板件下封边条创建配件空属性控制；

2026-08-12 21:02:08 +08:00 · 2025-03-05 11:17:27 +08:00
parent 474f8a9127
commit 8374365163
31 changed files with 74 additions and 60 deletions
@@ -1,4 +1,4 @@
-package com.cf.imes.module.plan.controller.orderImport.vo;
+package com.cf.imes.module.plan.controller.admin.orderImport.vo;

 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
@@ -1,4 +1,4 @@
-package com.cf.imes.module.plan.controller.orderImport.vo;
+package com.cf.imes.module.plan.controller.admin.orderImport.vo;

 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -1,4 +1,4 @@
-package com.cf.imes.module.plan.controller.orderImport.xml.vo;
+package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo;

 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -1,4 +1,4 @@
-package com.cf.imes.module.plan.controller.orderImport.xml.vo;
+package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo;

 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -1,4 +1,4 @@
-package com.cf.imes.module.plan.controller.orderImport.xml.vo;
+package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo;

 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -1,4 +1,4 @@
-package com.cf.imes.module.plan.controller.orderImport.xml.vo;
+package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo;

 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -1,4 +1,4 @@
-package com.cf.imes.module.plan.controller.orderImport.xml.vo;
+package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo;

 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -1,4 +1,4 @@
-package com.cf.imes.module.plan.controller.orderImport.xml.vo;
+package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo;

 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -1,4 +1,4 @@
-package com.cf.imes.module.plan.controller.orderImport.xml.vo;
+package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo;

 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
@@ -1,4 +1,4 @@
-package com.cf.imes.module.plan.controller.orderImport.xml.vo;
+package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo;

 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -1,4 +1,4 @@
-package com.cf.imes.module.plan.controller.orderImport.xml.vo;
+package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo;

 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -1,4 +1,4 @@
-package com.cf.imes.module.plan.controller.orderImport.xml.vo;
+package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo;

 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -1,4 +1,4 @@
-package com.cf.imes.module.plan.controller.orderImport.xml.vo;
+package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo;

 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -1,4 +1,4 @@
-package com.cf.imes.module.plan.controller.orderImport.xml.vo;
+package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo;

 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -1,4 +1,4 @@
-package com.cf.imes.module.plan.controller.orderImport.xml.vo;
+package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo;

 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -1,4 +1,4 @@
-package com.cf.imes.module.plan.controller.orderImport.xml.vo;
+package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo;

 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -1,4 +1,4 @@
-package com.cf.imes.module.plan.controller.orderImport.xml.vo;
+package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo;

 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -1,4 +1,4 @@
-package com.cf.imes.module.plan.controller.orderImport.xml.vo;
+package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo;

 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -1,4 +1,4 @@
-package com.cf.imes.module.plan.controller.orderImport.xml.vo;
+package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo;

 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -1,4 +1,4 @@
-package com.cf.imes.module.plan.controller.orderImport.xml.vo;
+package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo;

 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -1,4 +1,4 @@
-package com.cf.imes.module.plan.controller.orderImport.xml.vo;
+package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo;

 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -1,4 +1,4 @@
-package com.cf.imes.module.plan.controller.orderImport.xml.vo;
+package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo;

 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -1,4 +1,4 @@
-package com.cf.imes.module.plan.controller.orderImport.xml.vo;
+package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo;

 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -1,4 +1,4 @@
-package com.cf.imes.module.plan.controller.orderImport.xml.vo;
+package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo;

 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -1,4 +1,4 @@
-package com.cf.imes.module.plan.controller.orderImport.xml.vo;
+package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo;

 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
@@ -1,4 +1,4 @@
-package com.cf.imes.module.plan.controller.orderImport.xml.vo;
+package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo;

 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -1,4 +1,4 @@
-package com.cf.imes.module.plan.controller.orderImport.xml.vo;
+package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo;

 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -1,4 +1,4 @@
-package com.cf.imes.module.plan.controller.orderImport.xml.vo;
+package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo;

 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -1,7 +1,7 @@
 package com.cf.imes.module.plan.dal.mysql.orderImport;

 import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX;
-import com.cf.imes.module.plan.controller.orderImport.vo.OrderImportTempDataReqVO;
+import com.cf.imes.module.plan.controller.admin.orderImport.vo.OrderImportTempDataReqVO;
 import com.cf.imes.module.plan.dal.dataobject.orderImport.OrderImportTempDataDO;
 import com.cf.imes.module.plan.dal.dataobject.orderImport.OrderImportTempDataGoodsGroupDO;
 import com.cf.imes.module.plan.dal.dataobject.orderImport.OrderImportTempDataGoodsIdGroupDO;
@@ -26,8 +26,8 @@ import com.cf.imes.module.executor.enums.OrderImportConstants;
 import com.cf.imes.module.executor.enums.OrderImportStatusEnum;
 import com.cf.imes.module.executor.enums.OrderImportTmpDataTypeEnum;
 import com.cf.imes.module.executor.enums.OrderItemTypeEnum;
-import com.cf.imes.module.plan.controller.orderImport.vo.OrderImportTempDataReqVO;
-import com.cf.imes.module.plan.controller.orderImport.vo.OrderPlateImportExcelVO;
+import com.cf.imes.module.plan.controller.admin.orderImport.vo.OrderImportTempDataReqVO;
+import com.cf.imes.module.plan.controller.admin.orderImport.vo.OrderPlateImportExcelVO;
 import com.cf.imes.module.plan.dal.dataobject.goods.GoodsDO;
 import com.cf.imes.module.plan.dal.dataobject.order.OrderDO;
 import com.cf.imes.module.plan.dal.dataobject.orderBody.OrderBodyDO;
@@ -25,32 +25,32 @@ import com.cf.imes.module.executor.enums.DictTypeConstants;
 import com.cf.imes.module.executor.enums.OrderImportStatusEnum;
 import com.cf.imes.module.executor.enums.OrderImportTmpDataTypeEnum;
 import com.cf.imes.module.executor.enums.OrderItemTypeEnum;
-import com.cf.imes.module.plan.controller.orderImport.vo.OrderImportTempDataReqVO;
-import com.cf.imes.module.plan.controller.orderImport.xml.vo.AssemblyXmlVO;
-import com.cf.imes.module.plan.controller.orderImport.xml.vo.BlockXmlVO;
-import com.cf.imes.module.plan.controller.orderImport.xml.vo.CorrelationXmlVO;
-import com.cf.imes.module.plan.controller.orderImport.xml.vo.CorrelationXmlVOS;
-import com.cf.imes.module.plan.controller.orderImport.xml.vo.CuttingOutlineXmlVO;
-import com.cf.imes.module.plan.controller.orderImport.xml.vo.EdgingXmlVO;
-import com.cf.imes.module.plan.controller.orderImport.xml.vo.ExtraVO;
-import com.cf.imes.module.plan.controller.orderImport.xml.vo.GrooveXmlVO;
-import com.cf.imes.module.plan.controller.orderImport.xml.vo.GrooveXmlVOS;
-import com.cf.imes.module.plan.controller.orderImport.xml.vo.GroupXmlVO;
-import com.cf.imes.module.plan.controller.orderImport.xml.vo.HardwareXmlVO;
-import com.cf.imes.module.plan.controller.orderImport.xml.vo.HoleXmlVO;
-import com.cf.imes.module.plan.controller.orderImport.xml.vo.HoleXmlVOS;
-import com.cf.imes.module.plan.controller.orderImport.xml.vo.IsletXmlVO;
-import com.cf.imes.module.plan.controller.orderImport.xml.vo.IsletXmlVOS;
-import com.cf.imes.module.plan.controller.orderImport.xml.vo.OffsetLineXmlVO;
-import com.cf.imes.module.plan.controller.orderImport.xml.vo.OffsetLineXmlVOS;
-import com.cf.imes.module.plan.controller.orderImport.xml.vo.OutlineXmlVO;
-import com.cf.imes.module.plan.controller.orderImport.xml.vo.PlateXmlVO;
-import com.cf.imes.module.plan.controller.orderImport.xml.vo.PointXmlVO;
-import com.cf.imes.module.plan.controller.orderImport.xml.vo.PointXmlVOS;
-import com.cf.imes.module.plan.controller.orderImport.xml.vo.RawOutlineXmlVO;
-import com.cf.imes.module.plan.controller.orderImport.xml.vo.RectSealVO;
-import com.cf.imes.module.plan.controller.orderImport.xml.vo.RemarkXmlVO;
-import com.cf.imes.module.plan.controller.orderImport.xml.vo.RoomBoxXmlVO;
+import com.cf.imes.module.plan.controller.admin.orderImport.vo.OrderImportTempDataReqVO;
+import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.AssemblyXmlVO;
+import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.BlockXmlVO;
+import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.CorrelationXmlVO;
+import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.CorrelationXmlVOS;
+import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.CuttingOutlineXmlVO;
+import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.EdgingXmlVO;
+import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.ExtraVO;
+import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.GrooveXmlVO;
+import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.GrooveXmlVOS;
+import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.GroupXmlVO;
+import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.HardwareXmlVO;
+import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.HoleXmlVO;
+import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.HoleXmlVOS;
+import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.IsletXmlVO;
+import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.IsletXmlVOS;
+import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.OffsetLineXmlVO;
+import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.OffsetLineXmlVOS;
+import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.OutlineXmlVO;
+import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.PlateXmlVO;
+import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.PointXmlVO;
+import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.PointXmlVOS;
+import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.RawOutlineXmlVO;
+import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.RectSealVO;
+import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.RemarkXmlVO;
+import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.RoomBoxXmlVO;
 import com.cf.imes.module.plan.dal.dataobject.goods.GoodsDO;
 import com.cf.imes.module.plan.dal.dataobject.order.OrderDO;
 import com.cf.imes.module.plan.dal.dataobject.orderBody.OrderBodyDO;
@@ -152,6 +152,7 @@ public class DefaultXmlOrderImportFactory {

    private static final String EMPTY_STRING = new String();
    private static final BigDecimal BIG_ZERO = new BigDecimal(0);
+    private static final Double DOUBLE_ZERO  = NumberUtil.parseDouble("0.0");

    private static final int GOODS_TYPE = OrderImportTmpDataTypeEnum.GOODS.getType();
    private static final int BODY_TYPE = OrderImportTmpDataTypeEnum.BODY.getType();
@@ -654,6 +655,7 @@ public class DefaultXmlOrderImportFactory {
        orderInfoBatchInsertWithinThreshold(plateMapper, plateDOS, true);
        // 批量插入造型数据
        orderModelsBatchInsertWithinThreshold(true);
+
        // 所有自定义板编号生成完成后更新配置到生产单
        customPlateNoGenerateService.updateCustomPlateNoGenerateConfig(plateNoGenerateConfigVO, orderDO);
    }
@@ -769,15 +771,25 @@ public class DefaultXmlOrderImportFactory {
        String itemCode = pointXmlVO.getItemCode();
        OrderPartsDO orderPartsDOinMap = orderPartsDOMap.get(itemCode);
        if (ObjectUtil.isNull(orderPartsDOinMap)) {
+            String edgingMaterial = pointXmlVO.getEdgingMaterial();
+            String edgingColor = pointXmlVO.getEdgingColor();
            OrderPartsDO orderPartsDO = OrderPartsDO.builder()
                    .id((Long) snowFlakeGenerator.nextId(null))
                    .name(pointXmlVO.getEdgingName())
                    .goodsId(itemCode)
                    .type("封边条")
+                    .category("封边条")
                    .orderId(orderId)
-                    .material(pointXmlVO.getEdgingMaterial())
+                    .material(StringUtils.isNotEmpty(edgingMaterial) ? edgingMaterial : EMPTY_STRING)
+                    .color(StringUtils.isNotEmpty(edgingColor) ? edgingColor : EMPTY_STRING)
                    .unit(pointXmlVO.getCountUnit())
                    .isComposite(false)
+                    .width(DOUBLE_ZERO)
+                    .length(DOUBLE_ZERO)
+                    .spec(EMPTY_STRING)
+                    .brand(EMPTY_STRING)
+                    .factory(EMPTY_STRING)
+                    .thickness(NumberUtil.parseDouble(pointXmlVO.getEdgingThickness()))
                    .subparts(EMPTY_STRING)
                    .remark(EMPTY_STRING)
                    .model(EMPTY_STRING)
@@ -800,7 +812,7 @@ public class DefaultXmlOrderImportFactory {

            // 封边总长度单位换算
            Double count = changeUnit(pointXmlVO.getCount(), pointXmlVO.getCountUnit(), DictTypeConstants.UNIT_LENGTH);
-            OrderItemDO.builder()
+            OrderItemDO newEdgePartOrderItem = OrderItemDO.builder()
                    .id((Long) snowFlakeGenerator.nextId(null))
                    .orderId(orderId)
                    .type(OrderItemTypeEnum.PARTS_ITEM.getStatus())
@@ -810,9 +822,11 @@ public class DefaultXmlOrderImportFactory {
                    .bodyId(orderItemDO.getBodyId())
                    .num(count)
                    .organId(organId)
+                    .packageId(0L)
+                    .plateId(0L)
                    .build();
            // 批量插入order_item
-            orderItemDOS.add(orderItemDO);
+            orderItemDOS.add(newEdgePartOrderItem);
            orderInfoBatchInsertWithinThreshold(orderItemMapper, orderItemDOS, false);
        }
    }