上传至物资出现两个注册问题

api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderRemakEntity.java

@@ -16,6 +16,7 @@ public class StockOrderRemakEntity {
     private String secSalesInvNo;
     private String invoiceDate;
     private String remark;
+    private String zczbhhzbapzbh;
 
 
 }

api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java

@@ -528,7 +528,7 @@ public class IoTransInoutService {
             if (originSupId != null) {
                 warehouseEntity.setSupId(originSupId);
             }
-           if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && warehouseEntity.getRelId() == null) {//同一个DI绑定多个产品西信息
+            if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && warehouseEntity.getRelId() == null) {//同一个DI绑定多个产品西信息
                 warehouseEntity.setRelId(null);
                 warehouseEntity.setStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI);
             } else if (udiRelevanceEntities == null || udiRelevanceEntities.size() == 0) {//未找到产品信息，一般不会出现
@@ -854,6 +854,7 @@ public class IoTransInoutService {
                                 stockOrderDetailEntity.setFirstSalesInvNo(stockOrderRemakEntity.getFirstSalesInvNo());
                                 stockOrderDetailEntity.setSecSalesInvNo(stockOrderRemakEntity.getSecSalesInvNo());
                                 stockOrderDetailEntity.setInvoiceDate(stockOrderRemakEntity.getInvoiceDate());
+                                stockOrderDetailEntity.setZczbhhzbapzbh(stockOrderRemakEntity.getZczbhhzbapzbh());
                             }
                         }
                     }

api-admin/src/main/resources/mybatis/mapper/business/StockOrderRemakDao.xml

@@ -15,7 +15,7 @@
             parameterType="com.glxp.api.admin.entity.business.StockOrderRemakEntity">
         insert INTO stock_order_remak(
         orderIdFk,batchNo,price,relId
-        ,firstSalesInvNo,secSalesInvNo,secSalesListNo,invoiceDate,remark)
+        ,firstSalesInvNo,secSalesInvNo,secSalesListNo,invoiceDate,remark,zczbhhzbapzbh)
         values
         <foreach collection="orderRemakEntities" item="item" index="index"
                  separator=",">
@@ -23,7 +23,7 @@
             #{item.orderIdFk},
             #{item.batchNo},
             #{item.price},#{item.relId},#{item.firstSalesInvNo},#{item.secSalesInvNo},
-            #{item.secSalesListNo},#{item.invoiceDate},#{item.remark}
+            #{item.secSalesListNo},#{item.invoiceDate},#{item.remark},#{item.zczbhhzbapzbh}
             )
         </foreach>
 

api-admin/src/main/resources/schemas/schema_v2.1.sql

@@ -4,6 +4,7 @@ CALL Pro_Temp_ColumnWork ('io_order','wzUploadStatus','varchar(255) ', 1);
 CALL Pro_Temp_ColumnWork ('io_order','wzUploadResult','varchar(255) ', 1);
 
 CALL Pro_Temp_ColumnWork ('stock_order','noInvOut','tinyint', 1);
+CALL Pro_Temp_ColumnWork ('stock_order_detail','zczbhhzbapzbh','varchar(255)', 1);
 
 
 -- 新增数据