Merge remote-tracking branch 'origin/master'

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

@@ -628,4 +628,19 @@ public class UdiRelevanceController {
     //业务单据选入耗材字典查询列表
 
 
+    /**
+     * 查询产品规格型号列表
+     *
+     * @param relId
+     * @return
+     */
+    @GetMapping("/udiwms/udiinfo/getGgxhList")
+    public BaseResponse getGgxhList(String relId) {
+        if (StrUtil.isBlank(relId)) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        List<String> ggxhList = udiProductService.getGgxhList(relId);
+        return ResultVOUtils.success(ggxhList);
+    }
+
 }

src/main/java/com/glxp/api/dao/basic/UdiProductDao.java

@@ -60,4 +60,12 @@ public interface UdiProductDao {
      * @return
      */
     Integer selectPackLevel(@Param("nameCode") String nameCode);
+
+    /**
+     * 查询产品规格型号列表
+     *
+     * @param relId
+     * @return
+     */
+    List<String> selectGgxhList(@Param("relId") String relId);
 }

src/main/java/com/glxp/api/req/inv/AddInvRemindSetRequest.java

@@ -15,6 +15,11 @@ public class AddInvRemindSetRequest {
      */
     private String relId;
 
+    /**
+     * 规格型号
+     */
+    private String ggxh;
+
     /**
      * 部门编码
      */
@@ -35,11 +40,6 @@ public class AddInvRemindSetRequest {
      */
     private Boolean lowStock;
 
-    /**
-     * 库存低于多少数量时预警
-     */
-    private Integer lowStockNum;
-
     /**
      * 是否开启库存负数预警
      */
@@ -50,11 +50,6 @@ public class AddInvRemindSetRequest {
      */
     private Boolean overStock;
 
-    /**
-     * 库存高于多少数量时预警
-     */
-    private Integer overStockNum;
-
     /**
      * 是否开启库存产品过期提醒
      */
@@ -65,11 +60,6 @@ public class AddInvRemindSetRequest {
      */
     private Boolean recentDate;
 
-    /**
-     * 近效期达到多少天时提醒
-     */
-    private Integer recentDateDay;
-
     /**
      * 备注
      */

src/main/java/com/glxp/api/req/inv/FilterInvRemindMsgRequest.java

@@ -19,6 +19,11 @@ public class FilterInvRemindMsgRequest extends ListPageRequest {
      */
     private String batchNo;
 
+    /**
+     * 规格型号
+     */
+    private String ggxh;
+
     /**
      * 部门编码
      */
@@ -44,4 +49,9 @@ public class FilterInvRemindMsgRequest extends ListPageRequest {
      */
     private String type;
 
+    /**
+     * 消息忽略状态： 0：不忽略；1：忽略7天；2：忽略15天；3：忽略30天
+     */
+    private Integer ignoreStatus;
+
 }

src/main/java/com/glxp/api/res/inv/DeviceReceiveOrderResponse.java

@@ -70,6 +70,11 @@ public class DeviceReceiveOrderResponse {
      */
     private String receiveUserName;
 
+    /**
+     * 领用人
+     */
+    private String receiveUser;
+
     /**
      * 领用时间
      */

src/main/java/com/glxp/api/service/basic/UdiProductService.java

@@ -40,5 +40,11 @@ public interface UdiProductService {
 
     boolean deleteByUuid(String uuid);
 
-
+    /**
+     * 查询产品规格型号列表
+     *
+     * @param relId
+     * @return
+     */
+    List<String> getGgxhList(String relId);
 }

src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java

@@ -124,4 +124,9 @@ public class UdiProductServiceImpl implements UdiProductService {
     public boolean deleteByUuid(String uuid) {
         return udiProductDao.deleteByUuid(uuid);
     }
+
+    @Override
+    public List<String> getGgxhList(String relId) {
+        return udiProductDao.selectGgxhList(relId);
+    }
 }

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

@@ -395,4 +395,11 @@
     <select id="selectPackLevel" resultType="java.lang.Integer">
         select packLevel from basic_products where nameCode = #{nameCode} limit 1
     </select>
+
+    <select id="selectGgxhList" resultType="java.lang.String">
+        select distinct ggxh
+        from basic_products
+                 left join basic_udirel on basic_products.uuid = basic_udirel.uuid
+        where basic_udirel.id = #{relId}
+    </select>
 </mapper>

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

@@ -853,9 +853,15 @@
             <if test="nameCode != null">
                 AND nameCode = #{nameCode}
             </if>
-            <if test="isDisable != null">
+            <if test="isDisable == false">
+                AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false)
+            </if>
+            <if test="isDisable != null  and isDisable == true">
                 AND isDisable = #{isDisable}
             </if>
+            <if test="isDisable != null  and isDisable == false">
+                AND (isDisable is null or isDisable = false)
+            </if>
 
         </where>
 

src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDao.xml

@@ -11,10 +11,13 @@
         dro.createTime,
         dro.updateTime,
         dro.STATUS,
+        dro.fromInvSpaceCode,
         dro.receiveUser,
         ( SELECT employeeName FROM auth_user WHERE id = dro.receiveUser ) receiveUserName,
         ( SELECT `name` FROM auth_dept WHERE CODE = dro.fromDeptCode ) fromDeptName,
+        ( SELECT `code` FROM auth_dept WHERE CODE = dro.fromDeptCode ) fromDeptCode,
         ( SELECT `name` FROM auth_warehouse WHERE CODE = dro.fromInvCode ) fromInvName,
+        ( SELECT `code` FROM auth_warehouse WHERE CODE = dro.fromInvCode ) fromInvCode,
         ( SELECT `name` FROM auth_space WHERE CODE = dro.fromInvSpaceCode ) fromInvSpaceName
         FROM
         device_receive_order dro

src/main/resources/mybatis/mapper/inv/invProductDao.xml

@@ -283,10 +283,9 @@
                 AND ipd.invSpaceCode = #{invSpaceCode}
             </if>
         </where>
+        group by ip.relIdFk, bp.ggxh
     </select>
 
-
-
     <select id="filterProductList" resultType="com.glxp.api.res.inv.InvProductResponse"
             parameterType="com.glxp.api.req.inv.FilterInvProductRequest">
         select ip.id,