From 3a924e64ed5718b875ff31dadbb82c2de3238e1f Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 6 Mar 2023 16:09:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=97=E6=9D=90=E5=AD=97=E5=85=B8=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98=EF=BC=8C=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E8=AF=A6=E6=83=85=E5=B1=95=E7=A4=BA=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/inventory/InvProductDetailResponse.java | 1 - .../glxp/sale/admin/thread/UdiDlHttpClient.java | 14 +++++++------- .../src/main/resources/schemas/schema_v2.2.sql | 5 +++++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvProductDetailResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvProductDetailResponse.java index 30a2f05..bac548a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvProductDetailResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvProductDetailResponse.java @@ -16,7 +16,6 @@ public class InvProductDetailResponse { private String mainAction; private String action; private Integer count; - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date updateTime; private Integer purchaseType; private String batchNo; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/UdiDlHttpClient.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/UdiDlHttpClient.java index 90992f9..de9d8ed 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/UdiDlHttpClient.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/UdiDlHttpClient.java @@ -60,13 +60,13 @@ public class UdiDlHttpClient { public List getOrUpdateByUuid(String uuid) { List udiInfoEntities = getUdiByUuid(uuid); - if (CollUtil.isNotEmpty(udiInfoEntities)) { - UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(udiInfoEntities.get(0).getNameCode()); - if (udiInfoEntity != null) { - List exitUdis = udiInfoService.findByUuids(udiInfoEntity.getUuid()); - return exitUdis; - } - } +// if (CollUtil.isNotEmpty(udiInfoEntities)) { +// UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(udiInfoEntities.get(0).getNameCode()); +// if (udiInfoEntity != null) { +// List exitUdis = udiInfoService.findByUuids(udiInfoEntity.getUuid()); +// return exitUdis; +// } +// } return udiInfoEntities; } diff --git a/api-admin/src/main/resources/schemas/schema_v2.2.sql b/api-admin/src/main/resources/schemas/schema_v2.2.sql index 2f7caa5..96d4762 100644 --- a/api-admin/src/main/resources/schemas/schema_v2.2.sql +++ b/api-admin/src/main/resources/schemas/schema_v2.2.sql @@ -11,3 +11,8 @@ CALL Pro_Temp_ColumnWork('basic_udirel', 'groupBuy', 'tinyint', 1); CALL Pro_Temp_ColumnWork('basic_udirel', 'dispatch', 'tinyint', 1); CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailDispatch', 'tinyint', 1); CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailGroupBuy', 'tinyint', 1); + +CALL Pro_Temp_ColumnWork('basic_udirel', 'useMuti', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_udirel', 'useNum', 'int', 1); + +