Merge remote-tracking branch 'origin/busUser' into busUser

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java

@@ -306,12 +306,16 @@ public class UdiRelevanceController {
 
         UdiInfoReqeust udiInfoEntity = new UdiInfoReqeust();
         udiInfoEntity.setSptm(udiRelevanceResponse.getSptm());
+        udiInfoEntity.setNameCode(udiRelevanceResponse.getNameCode());
         udiInfoEntity.setYbbm(udiRelevanceResponse.getYbbm());
         udiInfoEntity.setMeasname(udiRelevanceResponse.getMeasname());
         udiInfoEntity.setManufactory(udiRelevanceResponse.getManufactory());
         udiInfoEntity.setCpms(udiRelevanceResponse.getCpms());
         udiInfoEntity.setPrice(udiRelevanceResponse.getPrice());
         udiInfoEntity.setSpmc(udiRelevanceResponse.getSpmc());
+        udiInfoEntity.setAllowNoBatch(udiRelevanceResponse.isAllowNoBatch());
+        udiInfoEntity.setAllowNoExpire(udiRelevanceResponse.isAllowNoExpire());
+        udiInfoEntity.setAllowNoProduct(udiRelevanceResponse.isAllowNoProduct());
         udiInfoEntity.setBasicPrductRemak1(udiRelevanceResponse.getBasicPrductRemak1());
         udiInfoEntity.setBasicPrductRemak2(udiRelevanceResponse.getBasicPrductRemak2());
         udiInfoEntity.setBasicPrductRemak3(udiRelevanceResponse.getBasicPrductRemak3());

api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java

@@ -54,4 +54,6 @@ public class StockOrderEntity {
 
     private String reviewUserName;
 
+    private Boolean  noInvOut;
+
 }

api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderPostRequest.java

@@ -32,4 +32,5 @@ public class StockOrderPostRequest {
     private Integer thirdPartyDate;
     private List<StockOrderDetailEntity> subErpOrders;
     private String customerId;
+    private boolean noInvOut;
 }

api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml

@@ -30,7 +30,7 @@
                                 thirdSysFk, status, statusInfo, `type`, sourceType,
                                 printStatus, unitIdFk, customerId, thirdOrderFk, orderIdFk,
                                 totalPrice, locStorageCode, supplementNo, createUser, reviewUser, entrustEnd, auditTime,
-                                updateTime, invWarehouseCode, fromSubInvCode, dept)
+                                updateTime, invWarehouseCode, fromSubInvCode, dept ,noInvOut)
         values (#{id},
                 #{billNo},
                 #{billdate},
@@ -45,7 +45,7 @@
                 #{sourceType},
                 #{printStatus}, #{unitIdFk}, #{customerId}, #{thirdOrderFk}, #{orderIdFk}, #{totalPrice},
                 #{locStorageCode}, #{supplementNo}, #{createUser}, #{reviewUser}, #{entrustEnd}, #{auditTime},
-                #{updateTime}, #{invWarehouseCode}, #{fromSubInvCode}, #{dept})
+                #{updateTime}, #{invWarehouseCode}, #{fromSubInvCode}, #{dept},#{noInvOut})
     </insert>
     <update id="updateById" parameterType="com.glxp.sale.admin.entity.inout.StockOrderEntity">
         UPDATE stock_order

api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml

@@ -202,7 +202,7 @@
         <if test="groupType != '' and groupType != null">
             GROUP BY #{groupType}
         </if>
-        group by inv_prein_product.id
+        group by inv_prein_product.orderIdFk
         order by inv_prein_product.updateTime desc
     </select>
     <insert id="insertInvProduct" keyProperty="id"

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

@@ -4,6 +4,8 @@ CALL Pro_Temp_ColumnWork ('basic_export_status','receiveStatus','varchar(255) ',
 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);
+
 
 
 -- 创建表时必须  create table if not exists 表名