diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java index fd235af4..30e5a5ce 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java @@ -131,8 +131,6 @@ public class SpsSyncDownloadController { private final InvSpaceDao invSpaceDao; - - // 下发单据接口 ,供给中继服务,UDI管理系统下载 @AuthRuleAnnotation("") @GetMapping("sps/sync/order") @@ -802,6 +800,7 @@ public class SpsSyncDownloadController { @Resource ThrManufacturerMapper thrManufacturerMapper; + private void saveUploadProBusinessData(SpsSyncProBusinessDataResponse bean) { if (CollectionUtil.isNotEmpty(bean.getThrManufacturerEntities())) { for (ThrManufacturerEntity entity : bean.getThrManufacturerEntities()) { @@ -810,6 +809,7 @@ public class SpsSyncDownloadController { boolean b = thrManufacturerMapper.replaceBatchs(bean.getThrManufacturerEntities()); } } + @Resource IoOrderDao orderDao; @Resource diff --git a/src/main/java/com/glxp/api/req/purchase/PurOrderDetailRequest.java b/src/main/java/com/glxp/api/req/purchase/PurOrderDetailRequest.java index 3b31b627..ba4b8370 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurOrderDetailRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurOrderDetailRequest.java @@ -40,6 +40,6 @@ public class PurOrderDetailRequest extends ListPageRequest { private String supId; - + private Integer productType; } diff --git a/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java b/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java index c7997382..a075f0bb 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java @@ -100,6 +100,6 @@ public class PurOrderRequest extends ListPageRequest { private String endAuditDate; private Integer dealStatus; private String orderBy; - private Integer productType = 1; + private Integer productType; } diff --git a/src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java b/src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java index 9f9d5d6a..4f7f1c88 100644 --- a/src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java +++ b/src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java @@ -81,4 +81,6 @@ public class PurOrderResponse { private String supName; private int dealStatus; + + private Integer productType; } diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 0277ef23..5d960353 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -1017,6 +1017,7 @@ CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'productType', 1); + CALL Pro_Temp_ColumnWork('thr_products_add_di', 'productsType', ' tinyint NULL DEFAULT NULL COMMENT ''产品类型; 1:器械 2:药品''', 1);