From 34a75705febab53efb753d4994744f83e9dc8f2f Mon Sep 17 00:00:00 2001 From: yewj Date: Thu, 22 Aug 2024 18:41:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/inout/IoCodeTempController.java | 12 ++++++------ .../service/basic/BasicCollectBustypeService.java | 5 +++++ .../service/basic/SysWorkplaceDocumentService.java | 3 +++ .../api/service/collect/IoCollectOrderService.java | 12 ++++++------ .../glxp/api/service/inout/IoCheckInoutService.java | 2 +- .../mybatis/mapper/collect/IoCollectOrderMapper.xml | 2 +- 6 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 71245def6..284468f32 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -1047,17 +1047,17 @@ public class IoCodeTempController extends BaseController { genDetaiEntity.setCount(1); if (bussinessTypeEntity.isUse()) { - genDetaiEntity.setReCount( udiCalCountUtil.getUseActCount(udiRelevanceResponses.get(0))); + genDetaiEntity.setReCount(udiCalCountUtil.getUseActCount(udiRelevanceResponses.get(0))); } else { - genDetaiEntity.setReCount( udiCalCountUtil.getCirActCount(udiRelevanceResponses.get(0))); + genDetaiEntity.setReCount(udiCalCountUtil.getCirActCount(udiRelevanceResponses.get(0))); } exitLocalEntity.setCount(exitLocalEntity.getMyCount() + 1); if (bussinessTypeEntity.isUse()) { - exitLocalEntity.setReCount(exitLocalEntity.getMyCount() * udiCalCountUtil.getUseActCount(udiRelevanceResponses.get(0))); + exitLocalEntity.setReCount(exitLocalEntity.getMyCount() * udiCalCountUtil.getUseActCount(udiRelevanceResponses.get(0))); } else { - exitLocalEntity.setReCount(exitLocalEntity.getMyCount() * udiCalCountUtil.getCirActCount(udiRelevanceResponses.get(0))); + exitLocalEntity.setReCount(exitLocalEntity.getMyCount() * udiCalCountUtil.getCirActCount(udiRelevanceResponses.get(0))); } if (!StringUtils.isBlank(exitLocalEntity.getSerialNo())) { @@ -1188,9 +1188,9 @@ public class IoCodeTempController extends BaseController { //计算实际数量 if (bussinessTypeEntity.isUse()) { - codeEnttity.setReCount(codeEnttity.getMyCount() * udiCalCountUtil.getUseActCount(udiRelevanceResponse)); + codeEnttity.setReCount(codeEnttity.getMyCount() * udiCalCountUtil.getUseActCount(udiRelevanceResponses.get(0))); } else { - codeEnttity.setReCount(codeEnttity.getMyCount() * udiCalCountUtil.getCirActCount(udiRelevanceResponse)); + codeEnttity.setReCount(codeEnttity.getMyCount() * udiCalCountUtil.getCirActCount(udiRelevanceResponses.get(0))); } } else if (udiRelevanceResponses.size() == 0) { if (unitFk == null) diff --git a/src/main/java/com/glxp/api/service/basic/BasicCollectBustypeService.java b/src/main/java/com/glxp/api/service/basic/BasicCollectBustypeService.java index 71c35a350..787c3bb3b 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicCollectBustypeService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicCollectBustypeService.java @@ -40,6 +40,11 @@ public class BasicCollectBustypeService extends ServiceImpl().eq(BasicCollectBustypeEntity::getCode, code).last("limit 1 ")); } + public BasicCollectBustypeEntity findByFromCode(String code) { + return basicCollectBustypeMapper.selectOne(new LambdaQueryWrapper().eq(BasicCollectBustypeEntity::getFromBusTypeCode, code).last("limit 1 ")); + } + + public BasicCollectBustypeEntity findByAddr(String addr) { return basicCollectBustypeMapper.selectOne(new LambdaQueryWrapper().eq(BasicCollectBustypeEntity::getFromInterAddress, addr).last("limit 1 ")); } diff --git a/src/main/java/com/glxp/api/service/basic/SysWorkplaceDocumentService.java b/src/main/java/com/glxp/api/service/basic/SysWorkplaceDocumentService.java index 0c6338e88..31fac7939 100644 --- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceDocumentService.java +++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceDocumentService.java @@ -34,6 +34,9 @@ public class SysWorkplaceDocumentService extends ServiceImpl().eq(SysWorkplaceDocumentEntity::getDocumentTypeCode, busType).last("limit 1")); + } public SysWorkplaceDocumentEntity findByWorkplaceCode(Long workplaceCode, String busType) { return sysWorkplaceDocumentDao.selectOne(new LambdaQueryWrapper() diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index a7512e23d..8070fef5e 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -137,8 +137,6 @@ public class IoCollectOrderService extends ServiceImpl list = orderService.filterList(filterOrderRequest); @@ -151,9 +149,11 @@ public class IoCollectOrderService extends ServiceImpl sysWorkplaces = sysWorkplaceService.getAllByBusType(ioOrderEntity.getAction()); - //自动分配工位 final Long[] defaultWorkplace = {null}; if (CollUtil.isNotEmpty(sysWorkplaces)) { @@ -240,7 +240,7 @@ public class IoCollectOrderService extends ServiceImpl collectOrderList = new ArrayList<>(); for (BasicSkPrescribeEntity basicSkPrescribeEntity : basicSkPrescribeEntities) { - BasicCollectBustypeEntity collectBustypeEntity = collectBustypeService.findByCode(String.valueOf(basicSkPrescribeEntity.getAddr())); + BasicCollectBustypeEntity collectBustypeEntity = collectBustypeService.findByFromCode(String.valueOf(basicSkPrescribeEntity.getAddr())); if (collectBustypeEntity == null) continue; if (collectOrderMapper.exists(new LambdaQueryWrapper().eq(IoCollectOrder::getBillNo, basicSkPrescribeEntity.getCode()))) { @@ -248,7 +248,7 @@ public class IoCollectOrderService extends ServiceImpl sysWorkplaces = sysWorkplaceService.getAllByBusType(collectBustypeEntity.getCode()); + List sysWorkplaces = sysWorkplaceService.getAllByBusType(collectBustypeEntity.getFromDocumentType()); if (CollUtil.isNotEmpty(sysWorkplaces)) { if (sysWorkplaces.size() == 1) { defaultWorkplace[0] = sysWorkplaces.get(0).getWorkplaceId(); @@ -276,7 +276,7 @@ public class IoCollectOrderService extends ServiceImpl - AND workPlaceCode = #{workPlaceCode} + AND ico.workPlaceCode = #{workPlaceCode} and tagStatus in From 8d06717f05bac39b52eb3a12638169868f9f5944 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Thu, 22 Aug 2024 20:37:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E6=89=AB=E7=A0=81=E5=8D=95?= =?UTF-8?q?=E5=87=8F=E4=B8=80=E5=88=A0=E9=99=A4biz?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/collect/IoCollectOrderService.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index 8070fef5e..8de3faf5c 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -350,10 +350,23 @@ public class IoCollectOrderService extends ServiceImpl() .eq(IoCollectOrderBiz::getId, bizIdFk)); if (bizServiceOne == null) throw new JsonException("扫码详情未查找到"); + //反差单据类型 查看是否来源业务单 + String orderIdFk = bizServiceOne.getOrderIdFk(); + IoCollectOrder ioCollectOrder = collectOrderMapper.selectOne(new LambdaQueryWrapper().eq(IoCollectOrder::getBillNo, orderIdFk)); + if (ioCollectOrder == null) throw new JsonException("反差单据失败"); + String busType = ioCollectOrder.getBusType(); + Long workPlaceCode = ioCollectOrder.getWorkPlaceCode(); + SysWorkplaceDocumentEntity byWorkplaceCode = sysWorkplaceDocumentService.findByWorkplaceCode(workPlaceCode, busType); + if (byWorkplaceCode == null) throw new JsonException("反差工位单据类型失败"); + Integer scanType = byWorkplaceCode.getScanType(); Integer oneScanCount = bizServiceOne.getScanCount(); Integer newCount = oneScanCount - delCount; - bizServiceOne.setScanCount(newCount); - collectOrderBizService.updateById(bizServiceOne); + if (scanType == 1 && newCount <= 0){ + collectOrderBizService.removeById(bizServiceOne); + }else { + bizServiceOne.setScanCount(newCount); + collectOrderBizService.updateById(bizServiceOne); + } } } From b424a12df9a73646a5f2c3ea8d133d3dc42179e3 Mon Sep 17 00:00:00 2001 From: yewj Date: Thu, 22 Aug 2024 20:53:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=89=AB=E7=A0=81=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/CollectOrderCodeManRequest.java | 2 ++ .../collect/IoCollectOrderCodeManService.java | 15 ++++++++------- .../collect/IoCollectOrderService.java | 16 ++++++++++------ .../collect/IoCollectOrderCodeAutoMapper.xml | 19 ++++++++++--------- .../collect/IoCollectOrderCodeManMapper.xml | 16 ++++++++++------ 5 files changed, 40 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/glxp/api/req/collect/CollectOrderCodeManRequest.java b/src/main/java/com/glxp/api/req/collect/CollectOrderCodeManRequest.java index b4af15f3d..ad6093180 100644 --- a/src/main/java/com/glxp/api/req/collect/CollectOrderCodeManRequest.java +++ b/src/main/java/com/glxp/api/req/collect/CollectOrderCodeManRequest.java @@ -28,4 +28,6 @@ public class CollectOrderCodeManRequest extends ListPageRequest { private Long updateUser; + private Long bizIdFk; + } 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 c4f177366..982544064 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java @@ -97,6 +97,9 @@ public class IoCollectOrderCodeManService extends ServiceImpl collectOrderBizs = collectOrderBizService.listByBillNo(addTagCodeReqeust.getBillNo()); //2.校验是否处方单UDI码 - if (IntUtil.value(workPlace.getOperationType()) == WorkOperType.TYPE_GEN_ORDER) { + if (IntUtil.value(sysWorkplaceDocumentEntity.getScanType()) == WorkOperType.TYPE_GEN_ORDER) { if (StrUtil.isEmpty(addTagCodeReqeust.getBillNo())) { String orderNo = gennerOrderUtils.createWdOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER, "yyyyMMdd")); - SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByWorkplaceCode(workPlace.getWorkplaceId(), addTagCodeReqeust.getBusType()); - collectOrder = IoCollectOrder.builder() .billNo(orderNo) .busType(sysWorkplaceDocumentEntity.getDocumentTypeCode()) @@ -147,7 +148,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl collectOrderList = new ArrayList<>(); for (BasicSkPrescribeEntity basicSkPrescribeEntity : basicSkPrescribeEntities) { - BasicCollectBustypeEntity collectBustypeEntity = collectBustypeService.findByFromCode(String.valueOf(basicSkPrescribeEntity.getAddr())); - if (collectBustypeEntity == null) - continue; +// BasicCollectBustypeEntity collectBustypeEntity = collectBustypeService.findByFromCode(String.valueOf(basicSkPrescribeEntity.getAddr())); +// if (collectBustypeEntity == null) +// continue; if (collectOrderMapper.exists(new LambdaQueryWrapper().eq(IoCollectOrder::getBillNo, basicSkPrescribeEntity.getCode()))) { continue; } + + SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByBusType(basicSkPrescribeEntity.getAddr()); + if (sysWorkplaceDocumentEntity == null) + continue; //自动分配工位 final Long[] defaultWorkplace = {null}; - List sysWorkplaces = sysWorkplaceService.getAllByBusType(collectBustypeEntity.getFromDocumentType()); + List sysWorkplaces = sysWorkplaceService.getAllByBusType(basicSkPrescribeEntity.getAddr()); if (CollUtil.isNotEmpty(sysWorkplaces)) { if (sysWorkplaces.size() == 1) { defaultWorkplace[0] = sysWorkplaces.get(0).getWorkplaceId(); @@ -276,8 +280,8 @@ public class IoCollectOrderService extends ServiceImpl SELECT icoca.*, - bp.nameCode, - bp.cpmctymc, - bp.ggxh, - bp.zczbhhzbapzbh, - bp.manufactory + bp.nameCode, + bp.cpmctymc, + COALESCE(bp.ggxh, bp.bzgg) AS ggxh, + bp.bzgg, + bp.zczbhhzbapzbh, + bp.manufactory FROM io_collect_order_code_auto icoca - left join io_split_code isc - on icoca.codeIdFk = isc.id - left join basic_udirel bu on icoca.relId = bu.id - left join basic_products bp on bu.uuid = bp.uuid + left join io_split_code isc + on icoca.codeIdFk = isc.id + left join basic_udirel bu on icoca.relId = bu.id + left join basic_products bp on bu.uuid = bp.uuid AND icoca.codeIdFk = #{codeIdFk} diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeManMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeManMapper.xml index dcd64c328..9885a4863 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeManMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeManMapper.xml @@ -4,13 +4,14 @@