Merge remote-tracking branch 'origin/dev_2.5_optimize' into dev_2.5_optimize

# Conflicts:
#	src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

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 {
         // 模拟数据库获取数据

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;
 
     /**
      * 关键字搜索

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;
 
     /**

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;
 
 
 

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;

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)
+    @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)
     @ColumnWidth(30)
     private String cpmctymc;
 
-
+    @ExcelProperty(value = "制剂规格", index = 1)
-    @ExcelProperty(value = "产品标识", index = 4)
     @ColumnWidth(30)
-    private String nameCode;
+    private String prepnSpec;
 
-
+    @ExcelProperty(value = "包装规格", index = 2)
-    @ExcelProperty(value = "规格型号", index = 5)
     @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;
+
 
 }

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;
 }

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

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);

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);

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())

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

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

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,
@@ -155,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>