耗材字典使用单元，流通单元等配置修改

src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java

@@ -351,6 +351,16 @@ public class UdiRelevanceController extends BaseController {
         udiRelevanceEntity.setModifyTime(new Date());
         udiRelevanceEntity.setUpdateUser(customerService.getUserId() + "");
         udiRelevanceEntity.setUseMuti(udiRelevanceEntity.getUseMuti());
+        udiRelevanceEntity.setUseLeverCount(udiRelevanceSaveRequest.getUseLeverCount());
+        udiRelevanceEntity.setSplitEnable(udiRelevanceSaveRequest.getSplitEnable());
+        udiRelevanceEntity.setUseLevelDi(udiRelevanceSaveRequest.getUseLevelDi());
+        udiRelevanceEntity.setUseLevelUnit(udiRelevanceSaveRequest.getUseLevelUnit());
+        udiRelevanceEntity.setUseLevel(udiRelevanceSaveRequest.getUseLevel());
+        udiRelevanceEntity.setDistributeLevelDi(udiRelevanceSaveRequest.getDistributeLevelDi());
+        udiRelevanceEntity.setDistributeLevelUnit(udiRelevanceSaveRequest.getDistributeLevelUnit());
+        udiRelevanceEntity.setDistributeLevelCount(udiRelevanceSaveRequest.getDistributeLevelCount());
+        udiRelevanceEntity.setDistributeLevel(udiRelevanceSaveRequest.getDistributeLevel());
+        udiRelevanceEntity.setPayFeeCode(udiRelevanceSaveRequest.getPayFeeCode());
         udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
 
         //关联更新

src/main/java/com/glxp/api/entity/inout/IoSplitFifoInv.java

@@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.io.Serializable;
 import java.util.Date;
+
 import lombok.Data;
 
 @ApiModel(value = "io_split_fifo_inv")
@@ -102,6 +104,14 @@ public class IoSplitFifoInv implements Serializable {
     @ApiModelProperty(value = "出库数量")
     private String outCount;
 
+    /**
+     * 锁定数量
+     */
+    @TableField(value = "lockCount")
+    @ApiModelProperty(value = "锁定数量")
+    private String lockCount;
+
+
     /**
      * 创建时间
      */

src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java

@@ -166,7 +166,8 @@ public class UdiRelevanceSaveRequest {
     private String useLevelDi;
     private String useLevelUnit;
     private Integer useLeverCount;
-
+    private Integer useLevel;
+    private Integer distributeLevel;
     //工位预警数
     private Integer workPlaceCount;
 }

src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java

@@ -257,6 +257,7 @@ public class UdiRelevanceResponse {
      * 工位预警数量
      */
     private Integer workPlaceCount;
+
     public int getBhzxxsbzsl() {
         if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {
             return 1;
@@ -296,5 +297,6 @@ public class UdiRelevanceResponse {
         return isUseDy;
     }
 
-
+    private Integer distributeLevel;
+    private Integer useLevel;
 }

src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java

@@ -1234,19 +1234,20 @@ public class IoCheckInoutService {
             } else {
                 genInvService.genNorInv(orderEntity.getBillNo());
                 orderService.updateOrderInventory(orderEntity.getBillNo(), orderEntity.getStatus());
-                //若未拆零预出库单据则进入到拆零队列
-                if (orderEntity.getAction().equals(ConstantType.SPLIT_OUT)) {
-                    List<IoCodeEntity> codeList = codeService.findByOrderId(orderEntity.getBillNo());
-                    fifoInvService.insertInv(codeList, orderEntity.getWorkPlaceCode());
-                } else if (orderEntity.getAction().equals(ConstantType.SPLIT_RETURN)) {
-                    //拆零预出库退回
-                    List<IoCodeEntity> codeList = codeService.findByOrderId(orderEntity.getBillNo());
-                    fifoInvService.removeInv(codeList, orderEntity.getWorkPlaceCode());
-                }
             }
         } else {
             //不入库存，直接进行单据流转
             changeInoutService.changeOrder(orderEntity);
+
+            //若未拆零预出库单据则进入到拆零队列
+            if (orderEntity.getAction().equals(ConstantType.SPLIT_OUT)) {
+                List<IoCodeEntity> codeList = codeService.findByOrderId(orderEntity.getBillNo());
+                fifoInvService.insertInv(codeList, orderEntity.getWorkPlaceCode());
+            } else if (orderEntity.getAction().equals(ConstantType.SPLIT_RETURN)) {
+                //拆零预出库退回
+                List<IoCodeEntity> codeList = codeService.findByOrderId(orderEntity.getBillNo());
+                fifoInvService.removeInv(codeList, orderEntity.getWorkPlaceCode());
+            }
         }
     }
 

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -1526,6 +1526,12 @@
             <if test="useLeverCount != null">
                 useLeverCount=#{useLeverCount},
             </if>
+            <if test="useLevel != null">
+                useLevel=#{useLevel},
+            </if>
+            <if test="distributeLevel != null">
+                distributeLevel=#{distributeLevel},
+            </if>
         </trim>
         WHERE id = #{id}
     </update>

src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml

@@ -3,19 +3,35 @@
 <mapper namespace="com.glxp.api.dao.collect.IoCollectOrderMapper">
     <select id="filterList" parameterType="com.glxp.api.req.collect.CollectOrderRequest"
             resultType="com.glxp.api.res.collect.IoCollectOrderResponse">
-        SELECT
+        SELECT ico.billNo,
-        ico.billNo,ico.busType,ico.fromType,ico.fromTypeDesc,ico.fromCorp,ico.billTime,ico.orderCirType,
+               ico.busType,
-        ico.createTime,ico.workPlaceCode,ico.remark,ico.createUser,ico.updateTime,ico.updateUser,ico.tagStatus,ico.splitStatus,ico.splitMsg
+               ico.fromType,
-        ,ico.tagMsg,
+               ico.fromTypeDesc,
-        sys_workplace_document.busName busTypeName,
+               ico.fromCorp,
-        bc.name fromCorpName,
+               ico.billTime,
-        sw.workplaceId workPlaceCode,
+               ico.orderCirType,
-        sw.workplaceName,ico.id,ico.orderTime,
+               ico.createTime,
-        row_number() over ( order by ico.orderTime desc ) as orderSequence
+               ico.workPlaceCode,
+               ico.remark,
+               ico.createUser,
+               ico.updateTime,
+               ico.updateUser,
+               ico.tagStatus,
+               ico.splitStatus,
+               ico.splitMsg
+                ,
+               ico.tagMsg,
+               sys_workplace_document.busName                       busTypeName,
+               bc.name                                              fromCorpName,
+               sw.workplaceId                                       workPlaceCode,
+               sw.workplaceName,
+               ico.id,
+               ico.orderTime,
+               row_number() over ( order by ico.orderTime desc ) as orderSequence
         FROM io_collect_order ico
-        left join sys_workplace_document on ico.busType = sys_workplace_document.documentTypeCode
+                 left join sys_workplace_document on ico.busType = sys_workplace_document.documentTypeCode
-        left join basic_corp bc on ico.fromCorp = bc.erpId
+                 left join basic_corp bc on ico.fromCorp = bc.erpId
-        left join sys_workplace sw on ico.workPlaceCode = sw.workplaceId
+                 left join sys_workplace sw on ico.workPlaceCode = sw.workplaceId
         <where>
             <if test="billNo != '' and billNo != null">
                 AND billNo LIKE concat('%', #{billNo}, '%')
@@ -26,9 +42,6 @@
             <if test="busType != null and busType != ''">
                 AND busType = #{busType}
             </if>
-            <if test="fromType != null and fromType != ''">
-                AND sys_workplace_document.fromType LIKE concat('%', #{fromType}, '%')
-            </if>
             <if test="fromCorp != '' and fromCorp != null">
                 AND fromCorp LIKE concat('%', #{fromCorp}, '%')
             </if>
@@ -41,24 +54,23 @@
             <if test="tagStatus != null">
                 AND tagStatus = #{tagStatus}
             </if>
-            <if test="workPlaceCode != null ">
+            <if test="workPlaceCode != null">
                 AND ico.workPlaceCode = #{workPlaceCode}
             </if>
-            <if test="chargeUser != null ">
+            <if test="chargeUser != null">
                 AND sw.chargeUser = #{chargeUser}
             </if>
-            <if test="unionKey != null ">
+            <if test="unionKey != null">
-                AND
+                AND (
-                (
+                        ico.billNo like concat('%', #{unionKey}, '%')
-                ico.unionKey like concat('%', #{billNo}, '%')
+                        or ico.fromCorp like concat('%', #{unionKey}, '%')
-                or ico.unionKey like concat('%', #{fromCorp}, '%')
+                        or ico.fromCorpName like concat('%', #{unionKey}, '%')
-                or ico.unionKey like concat('%', #{fromCorpName}, '%')
+                        or ico.backupOrderRemark1 like concat('%', #{unionKey}, '%')
-                or ico.unionKey like concat('%', #{backupOrderRemark1}, '%')
+                        or ico.backupOrderRemark2 like concat('%', #{unionKey}, '%')
-                or ico.unionKey like concat('%', #{backupOrderRemark2}, '%')
+                        or ico.backupOrderRemark3 like concat('%', #{unionKey}, '%')
-                or ico.unionKey like concat('%', #{backupOrderRemark3}, '%')
+                        or ico.backupOrderRemark4 like concat('%', #{unionKey}, '%')
-                or ico.unionKey like concat('%', #{backupOrderRemark4}, '%')
+                        or ico.backupOrderRemark5 like concat('%', #{unionKey}, '%')
-                or ico.unionKey like concat('%', #{backupOrderRemark5}, '%')
+                        or ico.backupOrderRemark6 like concat('%', #{unionKey}, '%'))
-                or ico.unionKey like concat('%', #{backupOrderRemark6}, '%'))
             </if>
 
 
@@ -75,16 +87,17 @@
 
     <select id="clearOrder">
         -- 清除拆零队列
-                TRUNCATE io_split_code;
+        TRUNCATE io_split_code;
-                TRUNCATE io_split_code_detail;
+        TRUNCATE io_split_code_detail;
-                TRUNCATE io_split_fifo_code;
+        TRUNCATE io_split_fifo_code;
 
 
 -- 清除拆零，原始单据等
-                TRUNCATE io_collect_order;
+        TRUNCATE io_collect_code;
-                TRUNCATE io_collect_order_biz;
+        TRUNCATE io_collect_order;
-                TRUNCATE io_collect_order_code_auto;
+        TRUNCATE io_collect_order_biz;
-                TRUNCATE io_collect_order_code_man
+        TRUNCATE io_collect_order_code_auto;
+        TRUNCATE io_collect_order_code_man
     </select>
 
     <update id="updateInvAlert" parameterType="map">
@@ -92,5 +105,4 @@
         SET invAlert = #{invAlert}
         WHERE id = #{id}
     </update>
-
 </mapper>