From 3ff1d6f977fbb0a374fbeecddf8b83c5689fd206 Mon Sep 17 00:00:00 2001 From: x_z Date: Tue, 13 Dec 2022 15:02:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E9=A2=84=E9=AA=8C?= =?UTF-8?q?=E6=94=B6=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mybatis/mapper/inventory/InvPreInProductDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml index c33717c..0ea328e 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml @@ -202,7 +202,7 @@ GROUP BY #{groupType} - group by inv_prein_product.id + group by inv_prein_product.orderIdFk order by inv_prein_product.updateTime desc Date: Tue, 13 Dec 2022 15:19:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A0=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sale/admin/controller/basic/UdiRelevanceController.java | 4 ++++ .../com/glxp/sale/admin/entity/inout/StockOrderEntity.java | 2 ++ .../com/glxp/sale/admin/req/inout/StockOrderPostRequest.java | 1 + .../src/main/resources/mybatis/mapper/inout/StockOrderDao.xml | 4 ++-- api-admin/src/main/resources/schemas/schema_v2.1.sql | 2 ++ 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java index 807153c..4f46f5c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java +++ b/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()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java index 9ceb230..c1f928d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java +++ b/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; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderPostRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderPostRequest.java index 9375a06..dfe4a02 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderPostRequest.java +++ b/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 subErpOrders; private String customerId; + private boolean noInvOut; } diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml index 31194e0..586e017 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml +++ b/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}) UPDATE stock_order diff --git a/api-admin/src/main/resources/schemas/schema_v2.1.sql b/api-admin/src/main/resources/schemas/schema_v2.1.sql index 587b80f..8070d1b 100644 --- a/api-admin/src/main/resources/schemas/schema_v2.1.sql +++ b/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 表名 \ No newline at end of file