From f1cd9fd1d61cfe9dfcadfe0cdc3982139b7eb894 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 2 Aug 2024 11:18:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9B=E7=BA=A7=E5=BA=93=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/constant/Constant.java | 8 +++ .../basic/BasicSickerController.java | 12 ++++ .../inout/IoCodeTempController.java | 2 +- .../glxp/api/req/inout/AddOrderRequest.java | 2 + .../glxp/api/res/inout/IoOrderResponse.java | 4 ++ .../api/res/inout/IoSplitCodeResponse.java | 12 ++++ .../impl/BasicBussinessTypeServiceImpl.java | 8 +++ .../service/inout/IoCheckInoutService.java | 17 +++++- .../inout/impl/IoOrderServiceImpl.java | 2 + .../mybatis/mapper/inout/IoOrderDao.xml | 57 +++++++++++++------ .../mapper/inout/IoSplitFifoCodeMapper.xml | 12 +++- src/main/resources/schemas/schema_v2.4.sql | 3 + 12 files changed, 120 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/glxp/api/constant/Constant.java b/src/main/java/com/glxp/api/constant/Constant.java index 7887d34eb..e2ed9b9f2 100644 --- a/src/main/java/com/glxp/api/constant/Constant.java +++ b/src/main/java/com/glxp/api/constant/Constant.java @@ -280,6 +280,13 @@ public class Constant { public static final String ORDER_STATUS_INCODE = "supInCode"; + + /** + * 单据--拆零预出库新增扫码单据标识 + */ + public static final String ORDER_STATUS_SPLIT_FINISH_CODEE = "split_finish"; + + /**前端页面查询相关单据类型标识*/ @@ -308,6 +315,7 @@ public class Constant { public static final String ORDER_ACTION_WAIT_DEAL = "waitDeal"; //待配货/拣货 public static final String ORDER_THIRD_UPLOAD = "thirdUpload"; public static final String ORDER_THIRD_STOCK = "stock"; //内部码 + public static final String ORDER_ACTION_SPLIT = "splitOrder"; //拆零页面 public static final String SYNC_REMARK = "syncRemark"; diff --git a/src/main/java/com/glxp/api/controller/basic/BasicSickerController.java b/src/main/java/com/glxp/api/controller/basic/BasicSickerController.java index 93d2cf171..96acc7340 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicSickerController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicSickerController.java @@ -13,6 +13,7 @@ import com.glxp.api.controller.BaseController; import com.glxp.api.entity.basic.BasicSkSickerEntity; import com.glxp.api.http.ErpBasicClient; import com.glxp.api.req.basic.BasicSkSickerRequest; +import com.glxp.api.req.basic.GetSickPrescribeRequest; import com.glxp.api.req.basic.GetSickRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.BasicSkSickerResponse; @@ -99,6 +100,17 @@ public class BasicSickerController extends BaseController { } + /** + * 在线实时获取处方信息 + * + * @return + */ + @GetMapping("/udiwms/basic/sk/sicker/prescribe/filter/onLine") + public BaseResponse filterSickerPrescribeOnLine(GetSickPrescribeRequest getSickRequest) { + return erpBasicClient.getSickPrescribe(getSickRequest); + } + + @CusRedissonAnnotation(cacheName = RedissonCacheKey.DL_SICKER, key = {"#getSickRequest.thirdSys"}, waitTime = 3, timeOutMsg = "后台正在下载，请勿重复提交") @PostMapping("/udiwms/basic/sk/sicker/download") public BaseResponse sickerDl(@RequestBody GetSickRequest getSickRequest, BindingResult bindingResult) { 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 61405a3b1..818731a42 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -777,10 +777,10 @@ public class IoCodeTempController extends BaseController { orderEntity.setOrderType(addOrderRequest.getOrderType()); orderEntity.setBusType(bussinessTypeEntity.getBusType()); orderEntity.setSickerAdNum(addOrderRequest.getSickerAdNum()); + orderEntity.setWorkPlaceCode(addOrderRequest.getWorkPlaceCode()); orderService.insertOrder(orderEntity); } - if (IntUtil.value(addOrderRequest.getOrderType()) == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable() && bussinessTypeEntity.getCheckWebNew() != 0) { boolean isBillExit = orderDetailBizService.isExit(orderEntity.getBillNo()); diff --git a/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java b/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java index 74afd32bb..1a3a82cfc 100644 --- a/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java @@ -43,4 +43,6 @@ public class AddOrderRequest { private String preInPrice; private String preInBatchNo; private String sickerAdNum; + + private String workPlaceCode; } diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java index 84694ed20..9109e482a 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java @@ -270,6 +270,10 @@ public class IoOrderResponse { * 工位代码 */ private String workPlaceCode; + /** + * 工位名称 + */ + private String workPlaceName; public String getFromName() { diff --git a/src/main/java/com/glxp/api/res/inout/IoSplitCodeResponse.java b/src/main/java/com/glxp/api/res/inout/IoSplitCodeResponse.java index 953a1be66..3240b574f 100644 --- a/src/main/java/com/glxp/api/res/inout/IoSplitCodeResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoSplitCodeResponse.java @@ -1,5 +1,6 @@ package com.glxp.api.res.inout; +import com.glxp.api.entity.basic.BasicProductsEntity; import lombok.Data; import java.util.Date; @@ -132,4 +133,15 @@ public class IoSplitCodeResponse { private Integer groupCount; + //产品信息----------------------------start---------------------- + private String cpmctymc; + private String ggxh; + private String ylqxzcrbarmc; + private String manufactory; + private String measname; + private String zczbhhzbapzbh; + private String ybbm; + private String zxxsdycpbs; + + } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java index 7eea169f2..68f8bcc51 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java @@ -340,6 +340,14 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl() + .eq("enable", true).and( + webNew -> webNew.in("action", "SC72197936495755", "SC72249388338364") + ) + ); + break; default: break; } diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index 2111522aa..134b938b6 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -1190,7 +1190,22 @@ public class IoCheckInoutService { genInvService.genNorInv(orderEntity.getBillNo()); orderService.updateOrderInventory(orderEntity.getBillNo(), orderEntity.getStatus()); //若未拆零预出库单据则进入到拆零队列 - if (orderEntity.getAction() == "SC72197936495755") { + if (orderEntity.getAction().equals("SC72197936495755")) { + List codeList = codeService.findByOrderId(orderEntity.getBillNo()); + List splitCodeEntities = new ArrayList<>(); + if (CollUtil.isNotEmpty(codeList)) { + for (IoCodeEntity codeEntity : codeList) { + IoSplitFifoCodeEntity splitCodeEntity = new IoSplitFifoCodeEntity(); + BeanUtils.copyProperties(codeEntity, splitCodeEntity); + splitCodeEntity.setInBactchNo(codeEntity.getInBatchNo()); + splitCodeEntity.setTotalCount(codeEntity.getReCount()); + splitCodeEntity.setId(null); + splitCodeEntities.add(splitCodeEntity); + } + } + splitFifoCodeService.saveBatch(splitCodeEntities); + } else if (orderEntity.getAction().equals("SC72249388338364")) { + //拆零预出库退回 List codeList = codeService.findByOrderId(orderEntity.getBillNo()); List splitCodeEntities = new ArrayList<>(); if (CollUtil.isNotEmpty(codeList)) { diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 224b40ba8..8e9f4f750 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -715,6 +715,7 @@ public class IoOrderServiceImpl implements IoOrderService { filterOrderRequest.setDealStatuses(Arrays.asList(2)); break; case Constant.ORDER_STATUS_AUDITED: + case Constant.ORDER_STATUS_SPLIT_FINISH_CODEE: filterOrderRequest.setStatuses(Arrays.asList(7)); filterOrderRequest.setDealStatuses(Arrays.asList(3, 4)); break; @@ -739,6 +740,7 @@ public class IoOrderServiceImpl implements IoOrderService { case Constant.ORDER_STATUS_UN_ALLOCATE: filterOrderRequest.setStatuses(Arrays.asList(ConstantStatus.ORDER_STATUS_ALLOCATE)); filterOrderRequest.setDealStatuses(Arrays.asList(2)); + break; default: break; } diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index 8bd5a864a..33d30e5c1 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -2,22 +2,47 @@ - SELECT io_split_fifo_code.*, sum(totalCount) as groupCount + SELECT io_split_fifo_code.*, + sum(totalCount) as groupCount, + bp.cpmctymc, + bp.ggxh, + bp.ylqxzcrbarmc, + bp.manufactory, + bp.measname, + bp.zczbhhzbapzbh, + bp.ybbm,bp.zxxsdycpbs FROM io_split_fifo_code + LEFT JOIN basic_udirel bu ON bu.id = io_split_fifo_code.relId + LEFT JOIN basic_products bp ON bu.uuid = bp.uuid AND code LIKE #{code} diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index eebb9993a..9e460ac61 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -3927,6 +3927,9 @@ CALL Pro_Temp_ColumnWork('basic_products', 'medicareType', CALL Pro_Temp_ColumnWork('basic_products', 'indate', ' datetime NULL DEFAULT NULL COMMENT ''有效日期''', 1); +CALL Pro_Temp_ColumnWork('basic_products', 'zxxsdycpbs', + 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''最小销售产品标识''', + 1);