From f4ff112ea995af66f44cce51886e8b6fcaa9d1b0 Mon Sep 17 00:00:00 2001 From: yewj Date: Mon, 6 Jan 2025 09:32:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=85=8D=E7=BD=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=98=AF=E5=90=A6=E5=90=AF=E7=94=A8=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E6=8B=86=E9=9B=B6=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/collect/IoCollectOrderController.java | 5 +++++ .../controller/collect/IoCollectSetController.java | 2 +- .../com/glxp/api/entity/collect/IoCollectSet.java | 7 ++++++- .../service/collect/IoCollectOrderCodeManService.java | 11 ++++++++--- src/main/resources/application-dev.yml | 2 +- src/main/resources/schemas/schema_v2.4.sql | 6 +++++- 6 files changed, 26 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index c9a67d126..89f09f724 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -438,6 +438,11 @@ public class IoCollectOrderController extends BaseController { /** * 取货确认 */ + IoCollectSet collectSet = collectSetService.getSet(); + //根据配置是否需要拆零确认 + if (!IntUtil.value(collectSet.getGetSplitConfirm())) { + confirmOrderBiz.setSkipSplitConfirm(true); + } ConfirmResponse splitInfo = splitCodeService.confirmBizAutiTagCode(confirmOrderBiz, confirmOrderBiz.getQueueCode(), confirmOrderBiz.getConfirmSplitCode(), confirmOrderBiz.getSkipSplitConfirm()); return ResultVOUtils.success(splitInfo); diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectSetController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectSetController.java index 842369db9..307d00265 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectSetController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectSetController.java @@ -25,7 +25,7 @@ public class IoCollectSetController extends BaseController { @GetMapping("/udiwms/ioSplit/collect/getSet") public BaseResponse getSet() { - IoCollectSet collectSet = collectSetService.getSet(); + IoCollectSet collectSet = collectSetService.getSet(); return ResultVOUtils.success(collectSet); } 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 ae949a1f7..8dd145a80 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java @@ -72,9 +72,14 @@ public class IoCollectSet implements Serializable { private Date startUploadTime; @TableField(value = "lastCodeSplit") - @ApiModelProperty(value = "是否最后追溯码拆零") + @ApiModelProperty(value = "是否启用扫码拆零确认") private Boolean lastCodeSplit; + + @TableField(value = "getSplitConfirm") + @ApiModelProperty(value = "是否启用取药拆零确认") + private Boolean getSplitConfirm; + @TableField(value = "lastCodeSplit") @ApiModelProperty(value = "自动上传已完成单据轮询时间") private Integer startUploadHour; diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java index a4e317fbf..fca3be4a9 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java @@ -185,7 +185,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl() .eq(IoCollectCodeBackup::getCode, code) @@ -350,7 +350,10 @@ public class IoCollectOrderCodeManService extends ServiceImpl