From 78cf390d5cdac918463fb84182f9c739ec8d22ef Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Tue, 18 Feb 2025 16:44:36 +0800
Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/res/collect/CollectOrderBizResponse.java  | 1 +
 .../com/glxp/api/service/collect/IoCollectLedGroupService.java  | 2 +-
 .../mybatis/mapper/collect/IoCollectOrderBizMapper.xml          | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java
index e722f2c64..1dfe13285 100644
--- a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java
+++ b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java
@@ -184,6 +184,7 @@ public class CollectOrderBizResponse {
     private String checkCode;
 
     private String queueCode;
+    private String prepnSpec;
     private Integer ledNum;
 
     /**
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java
index eb91d0e4a..d4700239d 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java
@@ -157,7 +157,7 @@ public class IoCollectLedGroupService extends ServiceImpl<IoCollectLedGroupMappe
         //如果为null 当前灯组已满
         if (orderLeds.isEmpty()) {
             // 如果没有可用灯组，抛出异常或返回 null
-            throw new JsonException("当前灯组已满!");
+            throw new JsonException("没有可用灯组!");
         }
         SysOrderLed orderLed = orderLeds.get(0);
         //if 没有满 设置订单id
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml
index 965db569f..0ba9e7ece 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml
@@ -8,6 +8,7 @@
                bp.zczbhhzbapzbh,
                bp.manufactory,
                COALESCE(bp.bzgg, icob.ggxh) AS spec,
+               bp.prepnSpec AS prepnSpec,
                sys_workplace_queue.code
         FROM io_collect_order_biz icob
                  left join basic_udirel bu on icob.relId = bu.id

From 545bc6e2c7f54af2d0aacb097da12b43e9a80abc Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Tue, 18 Feb 2025 17:11:34 +0800
Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=8E=A8=E8=8D=90?=
 =?UTF-8?q?=E4=B8=8A=E8=B4=A7=E5=8D=95=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/res/inout/IoSplitInvResponse.java     |  1 +
 .../api/res/inout/IoSplitInvViewResponse.java | 38 ++++++-------------
 .../mapper/inout/IoSplitFifoInvMapper.xml     |  1 +
 3 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java b/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java
index 3fb954f36..9b65a1c35 100644
--- a/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java
@@ -135,6 +135,7 @@ public class IoSplitInvResponse {
     private String zxxsdycpbs;
     private String bzgg;
     private String useLevelUnit;
+    private String prepnSpec;
 
 
     private String nameCode;
diff --git a/src/main/java/com/glxp/api/res/inout/IoSplitInvViewResponse.java b/src/main/java/com/glxp/api/res/inout/IoSplitInvViewResponse.java
index 58f4a0ed5..6f21abb7d 100644
--- a/src/main/java/com/glxp/api/res/inout/IoSplitInvViewResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/IoSplitInvViewResponse.java
@@ -11,48 +11,32 @@ import java.util.Date;
 @Data
 public class IoSplitInvViewResponse {
 
-    @ExcelProperty(value = "区域编码", index = 0)
-    @ColumnWidth(30)
-    private Integer freightRow;
-
-
-    @ExcelProperty(value = "出货槽编码", index = 1)
-    @ColumnWidth(30)
-    private String workPlaceQueueCode;
-
-
-    @ExcelProperty(value = "出货槽名称", index = 2)
-    @ColumnWidth(30)
-    private String workPlaceQueueCodeName;
-
-
-    @ExcelProperty(value = "产品通用名", index = 3)
+    @ExcelProperty(value = "产品通用名", index = 0)
     @ColumnWidth(30)
     private String cpmctymc;
 
-
-    @ExcelProperty(value = "产品标识", index = 4)
+    @ExcelProperty(value = "制剂规格", index = 1)
     @ColumnWidth(30)
-    private String nameCode;
+    private String prepnSpec;
 
-
-    @ExcelProperty(value = "规格型号", index = 5)
+    @ExcelProperty(value = "包装规格", index = 2)
     @ColumnWidth(30)
     private String ggxh;
 
 
-    @ExcelProperty(value = "剩余数量", index = 6)
+    @ExcelProperty(value = "推荐上货数量", index = 3)
     @ColumnWidth(30)
-    private Integer reCount;
+    private Integer suggestOutCount;
 
 
-    @ExcelProperty(value = "最大存药数量", index = 7)
+    @ExcelProperty(value = "区域编码", index = 4)
     @ColumnWidth(30)
-    private Integer maxDrugCount;
+    private Integer freightRow;
 
 
-    @ExcelProperty(value = "推荐上货数量", index = 8)
+    @ExcelProperty(value = "取货槽编码", index = 5)
     @ColumnWidth(30)
-    private Integer suggestOutCount;
+    private String workPlaceQueueCode;
+
 
 }
diff --git a/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml b/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml
index 48d50043c..436ce0a3c 100644
--- a/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml
@@ -117,6 +117,7 @@
   <select id="filterKcyjList" parameterType="com.glxp.api.req.inout.IoSplitFifoInvRequest" resultType="com.glxp.api.res.inout.IoSplitInvResponse">
     select isfi.*,
            bp.cpmctymc,
+           bp.prepnSpec,
            CASE   WHEN bp.ggxh IS NULL THEN bp.bzgg  ELSE bp.ggxh END AS ggxh,
            bp.bzgg,
            bu.useLevelUnit,

From 82e0eb517c609fb21efdcf06d962da8561150d75 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Tue, 18 Feb 2025 17:32:55 +0800
Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/req/inout/IoSplitFifoInvRequest.java     | 1 +
 .../resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml    | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/main/java/com/glxp/api/req/inout/IoSplitFifoInvRequest.java b/src/main/java/com/glxp/api/req/inout/IoSplitFifoInvRequest.java
index 42900f039..259f73457 100644
--- a/src/main/java/com/glxp/api/req/inout/IoSplitFifoInvRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/IoSplitFifoInvRequest.java
@@ -113,6 +113,7 @@ public class IoSplitFifoInvRequest extends ListPageRequest {
     private String remark;
 
     private String nameCode;
+    private String freightRow;
 
     /**
      * 关键字搜索
diff --git a/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml b/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml
index 436ce0a3c..0b5b4ee91 100644
--- a/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml
@@ -156,6 +156,9 @@
           <if test="nameCode != '' and nameCode != null">
               AND bp.nameCode = #{nameCode}
           </if>
+          <if test="freightRow != '' and freightRow != null">
+             AND swf.freightRow like concat('%', #{freightRow}, '%')
+          </if>
           <if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
               AND bp.zczbhhzbapzbh like concat('%', #{zczbhhzbapzbh}, '%')
           </if>

From d4b691d10f56d127b396efb681892146b21cd3ba Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Tue, 18 Feb 2025 18:06:50 +0800
Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/glxp/api/res/inout/AddEnterCodeResponse.java  | 2 +-
 .../java/com/glxp/api/res/inout/VailCodeResultResponse.java     | 1 +
 .../glxp/api/service/collect/IoCollectOrderCodeManService.java  | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/res/inout/AddEnterCodeResponse.java b/src/main/java/com/glxp/api/res/inout/AddEnterCodeResponse.java
index 412f4bf03..f9ddf973b 100644
--- a/src/main/java/com/glxp/api/res/inout/AddEnterCodeResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/AddEnterCodeResponse.java
@@ -24,7 +24,7 @@ public class AddEnterCodeResponse {
     private String prepnSpec;
     private String prepnUnit;
     private String packUnit;
-
+    private Long bizIdFk;
 
 
 
diff --git a/src/main/java/com/glxp/api/res/inout/VailCodeResultResponse.java b/src/main/java/com/glxp/api/res/inout/VailCodeResultResponse.java
index 35c8f99b3..60c5ca845 100644
--- a/src/main/java/com/glxp/api/res/inout/VailCodeResultResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/VailCodeResultResponse.java
@@ -15,4 +15,5 @@ public class VailCodeResultResponse {
     private String cpmctymc;
     private String productInfo;
     private String bizId;
+    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 e2ab8c06b..b73b0c7f2 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
@@ -723,6 +723,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
             udiEntity.setCode(request.getUdiCode());
 
             AddEnterCodeResponse addEnterCodeResponse = setAddEnterCodeResponse(udiEntity, udiRelevanceResponse);
+            addEnterCodeResponse.setBizIdFk(ioCollectOrderCodeMan.getBizIdFk());
             return ResultVOUtils.success(addEnterCodeResponse);
         } else {
             List<VailCodeResultResponse> vailCodeResultResponses = new ArrayList<>();
@@ -735,6 +736,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                     vailCodeResultResponse.setStatus(1);
                     vailCodeResultResponse.setCode(code);
                     vailCodeResultResponse.setSucMsg("校验成功");
+                    vailCodeResultResponse.setBizIdFk(ioCollectOrderCodeMan.getBizIdFk());
                     vailCodeResultResponses.add(vailCodeResultResponse);
                 } else {
                     vailCodeResultResponse.setStatus(2);

From 72928b2d9e3bd013b2abd1b688690618d5fdc772 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Tue, 18 Feb 2025 18:44:20 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=BA=93=E5=AD=98=EF=BC=8C=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E6=89=AB=E7=A0=81=E6=95=B0=E9=87=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/controller/inout/IoCodeTempController.java   | 3 +--
 .../glxp/api/controller/inout/IoSplitFifoInvController.java   | 2 --
 .../com/glxp/api/service/collect/IoCollectOrderService.java   | 2 +-
 .../com/glxp/api/service/inout/IoSplitFifoInvService.java     | 3 ++-
 src/main/resources/application-dev.yml                        | 4 +++-
 5 files changed, 7 insertions(+), 7 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 d56f10fbd..3c11e1c48 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -1360,7 +1360,7 @@ public class IoCodeTempController extends BaseController {
     @Autowired
     RelCodeBatchService relCodeBatchService;
 
-//    @Transactional(rollbackFor = Exception.class)
+    //    @Transactional(rollbackFor = Exception.class)
     public BaseResponse addDrugOrder(AddOrderRequest addOrderRequest, UdiEntity udiEntity, String code) {
         AddCodeResult addCodeResult = new AddCodeResult();
         BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(addOrderRequest.getAction());
@@ -1935,7 +1935,6 @@ public class IoCodeTempController extends BaseController {
     }
 
 
-
     public void updateRelCode(BasicBussinessTypeEntity bussinessTypeEntity, String code) {
         if (!(bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT) || bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_RETURN)))
             relCodeBatchService.threadUpdateIoCodeTempEntity(code);
diff --git a/src/main/java/com/glxp/api/controller/inout/IoSplitFifoInvController.java b/src/main/java/com/glxp/api/controller/inout/IoSplitFifoInvController.java
index 1632fe084..04e4b0ea2 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoSplitFifoInvController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoSplitFifoInvController.java
@@ -129,8 +129,6 @@ public class IoSplitFifoInvController extends BaseController {
     }
 
 
-
-
     @GetMapping("/udiwms/ioSplit/inv/exportExcel")
     public void exportExcel(IoSplitFifoInvRequest ioSplitFifoInvRequest, HttpServletResponse response) throws IOException {
         // 模拟数据库获取数据
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 af2bc6683..5b0296406 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
@@ -397,7 +397,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
                             .updateUser(1l)
                             .scanCount(1)
                             .isSplitCode(false)
-                            .scanActCount(1)
+                            .scanActCount(codeEntity.getMyReCount())
                             .build());
                 }
                 collectOrderCodeManService.saveBatch(collectOrderCodeManList);
diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
index 429e7b7c4..0f99b0945 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
@@ -98,7 +98,7 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
                     splitCodeEntity.setWorkPlaceCode(orderEntity.getWorkPlaceCode());
                     splitCodeEntity.setWorkPlaceQueueCode(orderEntity.getWorkPlaceQueueCode());
                     splitCodeEntity.setFifoSplit(codeEntity.getFifoSplit());
-                    UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByRelId(codeEntity.getRelId() + "");
+//                    UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByRelId(codeEntity.getRelId() + "");
 //                    if (udiRelevanceResponse != null) {
 //                        splitCodeEntity.setYbbm(udiRelevanceResponse.getYbbm());
 //                    }
@@ -130,6 +130,7 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
                         .productType(ioSplitFifoCodeEntity.getProductType())
                         .fifoSplit(ioSplitFifoCodeEntity.getFifoSplit())
                         .relId(ioSplitFifoCodeEntity.getRelId())
+                        .inCodeCount(ioSplitFifoCodeEntity.getScanCount())
                         .batchNo(ioSplitFifoCodeEntity.getBatchNo())
                         .produceDate(ioSplitFifoCodeEntity.getProduceDate())
                         .expireDate(ioSplitFifoCodeEntity.getExpireDate())
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 36d318eff..6524e6bd2 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.43:3306/udi_wms_cl?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_cl?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:
@@ -59,4 +59,6 @@ back_file_path: D:/share/udisps/back/
 API_KEY: 1101
 API_SECRET: zBITspLNvuoEd4FaamlSoqxRHmNsmQ6L
 WEB_TITLE: 平潭协和医院
+SYST_NAME: 天眼UDI管理系统
+LOGO_URL: http://192.168.0.166:9150/log.jpg
 SPMS_WEBSOCKET_TOKEN: 07rKFDFkQvBkbxgc7aUBlONo4gWNdx8b