From 6214c1261bdc72caef3b29b593be80f004f55388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Tue, 21 Mar 2023 10:12:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/req/purchase/PurOrderRequest.java | 4 ++-- .../com/glxp/api/res/purchase/PurOrderDetailResponse.java | 1 + .../resources/mybatis/mapper/purchase/PurOrderDao.xml | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) 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 8a5afc89..a4ea787a 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java @@ -95,7 +95,7 @@ public class PurOrderRequest extends ListPageRequest { private String emergency; private Date arrivalTime; - private Date startAuditDate; - private Date endAuditDate; + private String startAuditDate; + private String endAuditDate; } diff --git a/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java b/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java index a6e5d488..c4c2f2c6 100644 --- a/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java +++ b/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java @@ -17,6 +17,7 @@ public class PurOrderDetailResponse { private String productDate; private Integer count; private int reCount; + private int planCount; private Integer sweepCount; private String ylqxzcrbarmc; private String zczbhhzbapzbh; diff --git a/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml b/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml index 4d505de0..b5efe840 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml @@ -53,16 +53,16 @@ AND billNo = #{billNo} - = #{startDate}]]> + = #{startDate}]]> - + - = #{startAuditDate}]]> + = #{startAuditDate}]]> - + and pur_order.status = #{status} From 2de1435c4f67a78f65a7b27d41f355053c239539 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Tue, 21 Mar 2023 11:43:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoOrderDetailResultController.java | 14 ++ .../api/dao/inout/IoOrderDetailResultDao.java | 9 ++ .../inout/FilterOrderDetailResultRequest.java | 6 + .../inout/IoOrderDetailResultResponse.java | 3 + .../inout/IoOrderDetailResultService.java | 2 + .../impl/IoOrderDetailResultServiceImpl.java | 12 ++ .../mapper/inout/IoOrderDetailResultDao.xml | 37 +++++ src/main/resources/schemas/schema_v2.1.sql | 150 +++++++++--------- 8 files changed, 160 insertions(+), 73 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java index cc3d5e37..660e3746 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java @@ -51,6 +51,20 @@ public class IoOrderDetailResultController { return ResultVOUtils.page(pageInfo); } + /** + * 查询单据扫码明细列表 + * + * @param orderDetailResultRequest + * @return + */ + @AuthRuleAnnotation("") + @GetMapping("/udiwms/inout/resultDetail/filterOrderList") + public BaseResponse filterOrderList(FilterOrderDetailResultRequest orderDetailResultRequest) { + List list = orderDetailResultService.filterOrderList(orderDetailResultRequest); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } + /** * pda下载业务单据详情复核 */ diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java index a0a94066..2a5fe106 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java @@ -17,4 +17,13 @@ public interface IoOrderDetailResultDao extends BaseMapperPlus filterList(FilterOrderDetailResultRequest orderDetailResultRequest); + /** + * 查询单据扫码明细VO列表 + * + * @param orderDetailResultRequest + * @return + */ + List filterOrderList(FilterOrderDetailResultRequest orderDetailResultRequest); + + } diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java index b342bcc7..cc4d1a7a 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java @@ -32,5 +32,11 @@ public class FilterOrderDetailResultRequest extends ListPageRequest { private int showType; private String productName; private String coName; + private String spec; + private String formName; + private String startTime; + private String endTime; + private String fromCorpName; + } diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java index a48c1bb2..a01323e4 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java @@ -152,5 +152,8 @@ public class IoOrderDetailResultResponse { */ private String remark5; private int acceptCount; + private String fromCorpName; + private String billTypeName; + } diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java index 5c7a3b25..fc8e1f92 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java @@ -22,4 +22,6 @@ public interface IoOrderDetailResultService { List filterList(FilterOrderDetailResultRequest orderDetailResultRequest); + List filterOrderList(FilterOrderDetailResultRequest orderDetailResultRequest); + } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java index bace91f9..20e61781 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java @@ -58,4 +58,16 @@ public class IoOrderDetailResultServiceImpl implements IoOrderDetailResultServic } return orderDetailResultDao.filterList(orderDetailResultRequest); } + + @Override + public List filterOrderList(FilterOrderDetailResultRequest orderDetailResultRequest) { + if (null == orderDetailResultRequest) { + return Collections.emptyList(); + } + if (null != orderDetailResultRequest.getPage() && null != orderDetailResultRequest.getLimit()) { + PageHelper.offsetPage((orderDetailResultRequest.getPage() - 1) * orderDetailResultRequest.getLimit(), orderDetailResultRequest.getLimit()); + } + return orderDetailResultDao.filterOrderList(orderDetailResultRequest); + } + } diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml index 3cd59c53..534686eb 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml @@ -22,4 +22,41 @@ + + \ No newline at end of file diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 42cd8c84..b5600b7c 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -1,73 +1,77 @@ --- 字段新增 （表名，字段名，字段类型，修改方式（1：新增，2：修改，3：删除） -CALL Pro_Temp_ColumnWork('io_order', 'fromReceiveBillNo', 'varchar(255) ', 1); -CALL Pro_Temp_ColumnWork('io_order', 'fromThrBillNo', 'varchar(255) ', 1); -CALL Pro_Temp_ColumnWork('io_order', 'syncStatus', 'tinyint ', 1); -CALL Pro_Temp_ColumnWork('io_order', 'busType', 'tinyint ', 1); -CALL Pro_Temp_ColumnWork('io_order', 'deliveryStatus', 'tinyint ', 1); - -CALL Pro_Temp_ColumnWork('thr_bustype_origin', 'thirdSysName', 'varchar(255) ', 3); -CALL Pro_Temp_ColumnWork('thr_system_bus_api', 'thirdBuyName', 'varchar(255) ', 3); - -CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'bindRlIds', 'varchar(255) ', 1); - -CALL Pro_Temp_ColumnWork('auth_warehouse', 'advanceType', 'tinyint', 1); -CALL Pro_Temp_ColumnWork('auth_warehouse', 'spUse', 'tinyint', 1); - - -CALL Pro_Temp_ColumnWork('basic_udirel', 'relCode', 'varchar(255) ', 1); -CALL Pro_Temp_ColumnWork('basic_udirel', 'lowStockNum', 'varchar(255) ', 1); -CALL Pro_Temp_ColumnWork('basic_udirel', 'useExpireTime', 'int', 1); -CALL Pro_Temp_ColumnWork('basic_udirel', 'dispatch', 'tinyint', 1); -CALL Pro_Temp_ColumnWork('basic_udirel', 'groupBuy', 'tinyint', 1); -CALL Pro_Temp_ColumnWork('basic_udirel', 'isDateBy', 'tinyint', 1); -CALL Pro_Temp_ColumnWork('basic_udirel', 'needCert', '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_bussiness_type', 'busType', 'tinyint', 1); -CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'inStock', 'tinyint', 1); -CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'actionType', 'tinyint', 1); - -CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckEnable', 'tinyint', 1); -CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckWebNew', 'tinyint', 1); -CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckPdaUn', 'tinyint', 1); -CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckPdaEd', 'tinyint', 1); -CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckUdims', 'tinyint', 1); -CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckPc', 'tinyint', 1); -CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckSp', 'tinyint', 1); -CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckChange', 'tinyint', 1); -CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckBalance', 'tinyint', 1); -CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckCopy', 'tinyint', 1); - - - -CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'batchNo', 'varchar(255) ', 1); -CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'productDate', 'varchar(255) ', 1); -CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'expireDate', 'varchar(255) ', 1); - -CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'batchNo', 'varchar(255) ', 1); -CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'productDate', 'varchar(255) ', 1); -CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'expireDate', 'varchar(255) ', 1); -CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'arrivalCount', 'int ', 1); -CALL Pro_Temp_ColumnWork('pur_arrival', 'supId', 'varchar(255) ', 1); - -CALL Pro_Temp_ColumnWork('pur_returned_detail', 'batchNo', 'varchar(255) ', 1); -CALL Pro_Temp_ColumnWork('pur_returned_detail', 'productDate', 'varchar(255) ', 1); -CALL Pro_Temp_ColumnWork('pur_returned_detail', 'expireDate', 'varchar(255) ', 1); - - -CALL Pro_Temp_ColumnWork('pur_delivery', 'supId', 'varchar(255) ', 1); -CALL Pro_Temp_ColumnWork('pur_returned', 'supId', 'varchar(255) ', 1); - - -CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'targetBusAction', 'varchar(255)', 1); -CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'busBeforeTime', 'tinyint', 1); -CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'beforeTime', 'tinyint', 1); -CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'auditStatus', 'tinyint', 1); -CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'busAuditStatus', 'tinyint', 1); - -CALL Pro_Temp_ColumnWork('basic_bustype_change', 'auditStatus', 'tinyint', 1); -CALL Pro_Temp_ColumnWork('basic_bustype_change', 'busAuditStatus', 'tinyint', 1); -CALL Pro_Temp_ColumnWork('basic_bustype_change', 'targetBusAction', 'varchar(255)', 1); -CALL Pro_Temp_ColumnWork('basic_bustype_change', 'beforeTime', 'tinyint', 1); -CALL Pro_Temp_ColumnWork('basic_bustype_change', 'busBeforeTime', 'tinyint', 1); +-- -- 字段新增 （表名，字段名，字段类型，修改方式（1：新增，2：修改，3：删除） +-- CALL Pro_Temp_ColumnWork('io_order', 'fromReceiveBillNo', 'varchar(255) ', 1); +-- CALL Pro_Temp_ColumnWork('io_order', 'fromThrBillNo', 'varchar(255) ', 1); +-- CALL Pro_Temp_ColumnWork('io_order', 'syncStatus', 'tinyint ', 1); +-- CALL Pro_Temp_ColumnWork('io_order', 'busType', 'tinyint ', 1); +-- CALL Pro_Temp_ColumnWork('io_order', 'deliveryStatus', 'tinyint ', 1); +-- +-- CALL Pro_Temp_ColumnWork('thr_bustype_origin', 'thirdSysName', 'varchar(255) ', 3); +-- CALL Pro_Temp_ColumnWork('thr_system_bus_api', 'thirdBuyName', 'varchar(255) ', 3); +-- +-- CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'bindRlIds', 'varchar(255) ', 1); +-- +-- CALL Pro_Temp_ColumnWork('auth_warehouse', 'advanceType', 'tinyint', 1); +-- CALL Pro_Temp_ColumnWork('auth_warehouse', 'spUse', 'tinyint', 1); +-- +-- +-- CALL Pro_Temp_ColumnWork('basic_udirel', 'relCode', 'varchar(255) ', 1); +-- CALL Pro_Temp_ColumnWork('basic_udirel', 'lowStockNum', 'varchar(255) ', 1); +-- CALL Pro_Temp_ColumnWork('basic_udirel', 'useExpireTime', 'int', 1); +-- CALL Pro_Temp_ColumnWork('basic_udirel', 'dispatch', 'tinyint', 1); +-- CALL Pro_Temp_ColumnWork('basic_udirel', 'groupBuy', 'tinyint', 1); +-- CALL Pro_Temp_ColumnWork('basic_udirel', 'isDateBy', 'tinyint', 1); +-- CALL Pro_Temp_ColumnWork('basic_udirel', 'needCert', '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_bussiness_type', 'busType', 'tinyint', 1); +-- CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'inStock', 'tinyint', 1); +-- CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'actionType', 'tinyint', 1); +-- +-- CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckEnable', 'tinyint', 1); +-- CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckWebNew', 'tinyint', 1); +-- CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckPdaUn', 'tinyint', 1); +-- CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckPdaEd', 'tinyint', 1); +-- CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckUdims', 'tinyint', 1); +-- CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckPc', 'tinyint', 1); +-- CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckSp', 'tinyint', 1); +-- CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckChange', 'tinyint', 1); +-- CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckBalance', 'tinyint', 1); +-- CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckCopy', 'tinyint', 1); +-- +-- +-- +-- CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'batchNo', 'varchar(255) ', 1); +-- CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'productDate', 'varchar(255) ', 1); +-- CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'expireDate', 'varchar(255) ', 1); +-- +-- CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'batchNo', 'varchar(255) ', 1); +-- CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'productDate', 'varchar(255) ', 1); +-- CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'expireDate', 'varchar(255) ', 1); +-- CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'arrivalCount', 'int ', 1); +-- CALL Pro_Temp_ColumnWork('pur_arrival', 'supId', 'varchar(255) ', 1); +-- +-- CALL Pro_Temp_ColumnWork('pur_returned_detail', 'batchNo', 'varchar(255) ', 1); +-- CALL Pro_Temp_ColumnWork('pur_returned_detail', 'productDate', 'varchar(255) ', 1); +-- CALL Pro_Temp_ColumnWork('pur_returned_detail', 'expireDate', 'varchar(255) ', 1); +-- +-- +-- CALL Pro_Temp_ColumnWork('pur_delivery', 'supId', 'varchar(255) ', 1); +-- CALL Pro_Temp_ColumnWork('pur_returned', 'supId', 'varchar(255) ', 1); +-- +-- +-- CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'targetBusAction', 'varchar(255)', 1); +-- CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'busBeforeTime', 'tinyint', 1); +-- CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'beforeTime', 'tinyint', 1); +-- CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'auditStatus', 'tinyint', 1); +-- CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'busAuditStatus', 'tinyint', 1); +-- +-- CALL Pro_Temp_ColumnWork('basic_bustype_change', 'auditStatus', 'tinyint', 1); +-- CALL Pro_Temp_ColumnWork('basic_bustype_change', 'busAuditStatus', 'tinyint', 1); +-- CALL Pro_Temp_ColumnWork('basic_bustype_change', 'targetBusAction', 'varchar(255)', 1); +-- CALL Pro_Temp_ColumnWork('basic_bustype_change', 'beforeTime', 'tinyint', 1); +-- CALL Pro_Temp_ColumnWork('basic_bustype_change', 'busBeforeTime', 'tinyint', 1); + +CALL Pro_Temp_ColumnWork('pur_order', 'emergency', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('pur_order', 'arrivalTime', 'datetime', 1); +CALL Pro_Temp_ColumnWork('pur_order_detail', 'planCount', 'tinyint', 1);