From a8bba33860f44e35cfe33730535e32f5d2780dc0 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Sat, 8 Feb 2025 09:46:49 +0800 Subject: [PATCH 1/5] =?UTF-8?q?2/8=20=E6=89=AB=E7=A0=81=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/entity/collect/IoCollectSet.java | 5 +++++ src/main/resources/schemas/schema_v2.4.sql | 3 +++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java b/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java index 47895c48a..d7778e58d 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java @@ -95,5 +95,10 @@ public class IoCollectSet implements Serializable { @ApiModelProperty(value = "只允许上货单一产品开关0") private Boolean splitOutOnlyProductSwitch; + + @TableField(value = "scanMaxCount") + @ApiModelProperty(value = "扫码最大数量") + private Integer scanMaxCount; + private static final long serialVersionUID = 1L; } diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 1c35652d9..0d637be86 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -5220,4 +5220,7 @@ CALL Pro_Temp_ColumnWork('io_collect_code_backup', 'relCodeCount', INSERT IGNORE INTO sys_scheduled(`id`, `cronName`, `cron`, `customerId`, `remark`) VALUES (510,'collectOrderEelCodeCountTask', '0 0 */8 * * *', NULL, '定时拉取关联关系数量到上传医保码表'); +CALL Pro_Temp_ColumnWork('io_collect_set', 'scanMaxCount', + 'int NULL DEFAULT NULL COMMENT ''扫码最大数量''', + 1); From edb2d95a6d7d38b70cd64c9b5be283a990326ccf Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Sat, 8 Feb 2025 09:52:06 +0800 Subject: [PATCH 2/5] =?UTF-8?q?2/8=20=E6=89=AB=E7=A0=81=E6=95=B0=E9=87=8F1?= =?UTF-8?q?.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/entity/collect/IoCollectSet.java | 10 +++++++++- src/main/resources/schemas/schema_v2.4.sql | 12 +++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java b/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java index d7778e58d..c1aa604d1 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java @@ -97,8 +97,16 @@ public class IoCollectSet implements Serializable { @TableField(value = "scanMaxCount") - @ApiModelProperty(value = "扫码最大数量") + @ApiModelProperty(value = "扫码数量") private Integer scanMaxCount; + @TableField(value = "pdaMaxCount") + @ApiModelProperty(value = "PDA扫码数量") + private Integer pdaMaxCount; + + @TableField(value = "ipcMaxCount") + @ApiModelProperty(value = "工控扫码数量") + private Integer ipcMaxCount; + private static final long serialVersionUID = 1L; } diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 0d637be86..b38e8b37f 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -5221,6 +5221,16 @@ INSERT IGNORE INTO sys_scheduled(`id`, `cronName`, `cron`, `customerId`, `remark VALUES (510,'collectOrderEelCodeCountTask', '0 0 */8 * * *', NULL, '定时拉取关联关系数量到上传医保码表'); CALL Pro_Temp_ColumnWork('io_collect_set', 'scanMaxCount', - 'int NULL DEFAULT NULL COMMENT ''扫码最大数量''', + 'int NULL DEFAULT NULL COMMENT ''扫码数量''', + 1); +CALL Pro_Temp_ColumnWork('io_collect_set', 'scanMaxCount', + 'int NULL DEFAULT NULL COMMENT ''扫码数量''', + 1); +CALL Pro_Temp_ColumnWork('io_collect_set', 'pdaMaxCount', + 'int NULL DEFAULT NULL COMMENT ''PDA扫码数量''', + 1); + +CALL Pro_Temp_ColumnWork('io_collect_set', 'ipcMaxCount', + 'int NULL DEFAULT NULL COMMENT ''PDA扫码数量''', 1); From 96a3e9b1840278b73823c1e74058cd7a97507526 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Sat, 8 Feb 2025 15:43:37 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=E7=A7=91=E5=AE=A4=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E5=87=BA=E5=BA=93=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoOrderDetailResultController.java | 19 +++++++ .../api/dao/inout/IoOrderDetailResultDao.java | 2 + .../service/collect/IoCollectSetService.java | 9 +++- .../inout/IoOrderDetailResultService.java | 2 + .../impl/IoOrderDetailResultServiceImpl.java | 11 ++++ src/main/resources/application-dev.yml | 2 +- .../mapper/inout/IoOrderDetailResultDao.xml | 51 +++++++++++++++++++ src/main/resources/schemas/schema_v2.4.sql | 4 +- 8 files changed, 95 insertions(+), 5 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 89f55776c..27075b1b8 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java @@ -120,6 +120,16 @@ public class IoOrderDetailResultController extends BaseController { return ResultVOUtils.page(pageInfo); } + /** + * 查询科室产品领用出库 + * @param orderDetailResultRequest + * @return + */ + @GetMapping("/udiwms/inout/resultDetail/filterProductOutList") + public BaseResponse filterProductOutList(FilterOrderDetailResultRequest orderDetailResultRequest) { + PageInfo pageInfo = new PageInfo<>(getOrderResultProductOut(orderDetailResultRequest)); + return ResultVOUtils.page(pageInfo); + } public List getOrderResult(FilterOrderDetailResultRequest orderDetailResultRequest) { if (CollUtil.isNotEmpty(orderDetailResultRequest.getList())) { @@ -160,6 +170,15 @@ public class IoOrderDetailResultController extends BaseController { } + + public List getOrderResultProductOut(FilterOrderDetailResultRequest orderDetailResultRequest) { + + List list = orderDetailResultService.filterOrderProductOutList(orderDetailResultRequest); + + return list; + } + + @GetMapping("/udiwms/inout/resultDetail/exportExcel") public void exportTemplate(FilterOrderDetailResultRequest orderDetailResultRequest, HttpServletResponse response) throws IOException { // 模拟数据库获取数据 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 4d2c5489c..ef222ee6b 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java @@ -30,6 +30,8 @@ public interface IoOrderDetailResultDao extends BaseMapperPlus filterOrderList(FilterOrderDetailResultRequest orderDetailResultRequest); + List filterOrderProductOutList(FilterOrderDetailResultRequest orderDetailResultRequest); + /** * 根据起止时间查询单据信息 * diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectSetService.java b/src/main/java/com/glxp/api/service/collect/IoCollectSetService.java index 347b78cb6..4baae2eb0 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectSetService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectSetService.java @@ -2,6 +2,7 @@ package com.glxp.api.service.collect; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.entity.collect.IoCollectSet; @@ -10,7 +11,13 @@ import com.glxp.api.dao.collect.IoCollectSetMapper; public class IoCollectSetService extends ServiceImpl { public IoCollectSet getSet() { - List collectSets = this.list(); + List collectSets = new ArrayList<>(); + try { + collectSets = this.list(); + }catch (Exception e){ + return new IoCollectSet(); + } + return collectSets.get(0); } } 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 48fab077f..d6d825428 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java @@ -27,6 +27,8 @@ public interface IoOrderDetailResultService { List filterOrderList(FilterOrderDetailResultRequest orderDetailResultRequest); + List filterOrderProductOutList(FilterOrderDetailResultRequest orderDetailResultRequest); + List cptTrace(CptTraceRequest cptTraceRequest); 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 b3ef1ba53..cd7e7b812 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 @@ -75,6 +75,17 @@ public class IoOrderDetailResultServiceImpl implements IoOrderDetailResultServic return orderDetailResultDao.filterOrderList(orderDetailResultRequest); } + @Override + public List filterOrderProductOutList(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.filterOrderProductOutList(orderDetailResultRequest); + } + @Override public List cptTrace(CptTraceRequest cptTraceRequest) { if (StrUtil.isNotEmpty(cptTraceRequest.getSerialNo())) { diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index d981393af..fb7b5315e 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://192.168.0.166:3306/udi_wms_cl?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://192.168.0.43:3306/nj_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 hikari: diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml index 06780de7a..dfc088a1e 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml @@ -141,6 +141,57 @@ group by a2.id + + + +