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); + +