1.调整库存养护功能接口

src/main/java/com/glxp/api/controller/inv/InvProductController.java

@@ -176,4 +176,19 @@ public class InvProductController {
         return ResultVOUtils.success(pageResponse);
     }
 
+    /**
+     * 库存养护查询库存详情接口
+     *
+     * @param filterInvProductRequest
+     * @return
+     */
+    @GetMapping("/spms/inv/product/getInvMAProducts")
+    public BaseResponse getInvMAProducts(FilterInvProductRequest filterInvProductRequest) {
+        if (null == filterInvProductRequest || StrUtil.isBlank(filterInvProductRequest.getInvCode())) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        List<InvProductResponse> list = invProductService.getInvMAProducts(filterInvProductRequest);
+        PageInfo<InvProductResponse> pageInfo = new PageInfo<>(list);
+        return ResultVOUtils.page(pageInfo);
+    }
 }

src/main/java/com/glxp/api/dao/inv/InvProductDao.java

@@ -26,4 +26,12 @@ public interface InvProductDao extends BaseMapperPlus<InvProductDao, InvProductE
      * @return
      */
     List<InvProductResponse> stockStatistics(FilterInvProductRequest filterInvProductRequest);
+
+    /**
+     * 库存养护查询库存产品信息
+     *
+     * @param filterInvProductRequest
+     * @return
+     */
+    List<InvProductResponse> getMAInvProducts(FilterInvProductRequest filterInvProductRequest);
 }

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

@@ -98,4 +98,9 @@ public class FilterInvProductRequest extends ListPageRequest {
      */
     private String cplb;
 
+    /**
+     * 货位号
+     */
+    private String invSpaceCode;
+
 }

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

@@ -0,0 +1,46 @@
+package com.glxp.api.res.inv;
+
+import lombok.Data;
+
+/**
+ * 库存养护查询库存产品VO
+ */
+@Data
+public class InvMAProductResponse {
+
+    /**
+     * id
+     */
+    private String id;
+
+    /**
+     * 产品标识
+     */
+    private String nameCode;
+
+    /**
+     * 产品名称
+     */
+    private String cpmctymc;
+
+    /**
+     * 规格型号
+     */
+    private String ggxh;
+
+    /**
+     * 批次号
+     */
+    private String batchNo;
+
+    /**
+     * 生产日期
+     */
+    private String productionDate;
+
+    /**
+     * 失效日期
+     */
+    private String expireDate;
+
+}

src/main/java/com/glxp/api/service/inv/InvProductService.java

@@ -48,4 +48,13 @@ public interface InvProductService {
      * @return
      */
     List<InvProductResponse> stockStatistics(FilterInvProductRequest filterInvProductRequest);
+
+    /**
+     * 库存养护查询库存产品详情
+     *
+     * @param filterInvProductRequest
+     * @return
+     */
+    List<InvProductResponse> getInvMAProducts(FilterInvProductRequest filterInvProductRequest);
+
 }

src/main/java/com/glxp/api/service/inv/impl/InvMAOrderServiceImpl.java

@@ -63,7 +63,7 @@ public class InvMAOrderServiceImpl implements InvMAOrderService {
         //创建时间
         invMAOrderEntity.setCreateTime(new Date());
         //创建人
-        String createUser = customerService.getUserBean().getUserName();
+        String createUser = customerService.getUserIdStr();
         invMAOrderEntity.setCreateUser(createUser);
         //设置状态为草稿
         invMAOrderEntity.setStatus(0);
@@ -114,6 +114,10 @@ public class InvMAOrderServiceImpl implements InvMAOrderService {
         maOrder.setStatus(status);
         maOrder.setAuditTime(new Date());
         maOrder.setUpdateTime(new Date());
+        if (status == 2) {
+            //审核通过，更新审核人
+            maOrder.setAuditUser(customerService.getUserIdStr());
+        }
         invMAOrderDao.updateById(maOrder);
         return ResultVOUtils.success("更新成功");
     }

src/main/java/com/glxp/api/service/inv/impl/InvProductServiceImpl.java

@@ -74,4 +74,15 @@ public class InvProductServiceImpl implements InvProductService {
         return invProductDao.stockStatistics(filterInvProductRequest);
     }
 
+    @Override
+    public List<InvProductResponse> getInvMAProducts(FilterInvProductRequest filterInvProductRequest) {
+        if (null == filterInvProductRequest) {
+            return Collections.emptyList();
+        }
+        if (null != filterInvProductRequest.getPage() && null != filterInvProductRequest.getLimit()) {
+            PageHelper.offsetPage((filterInvProductRequest.getPage() - 1) * filterInvProductRequest.getLimit(), filterInvProductRequest.getLimit());
+        }
+        return invProductDao.getMAInvProducts(filterInvProductRequest);
+    }
+
 }

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

@@ -12,8 +12,8 @@
                ma.auditTime,
                ma.createUser,
                ma.auditUser,
-               (select name from auth_user where id = ma.createUser) createUserName,
+               (select employeeName from auth_user where id = ma.createUser) createUserName,
-               (select name from auth_user where id = ma.auditUser)  auditUserName,
+               (select employeeName from auth_user where id = ma.auditUser)  auditUserName,
                ma.remark,
                auth_warehouse.name                                   invName,
                auth_space.name                                       invSpaceName

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

@@ -138,4 +138,36 @@
             group by ip.relIdFk, ip.batchNo
         </where>
     </select>
+
+    <select id="getMAInvProducts" resultType="com.glxp.api.res.inv.InvProductResponse">
+        select ip.id, bp.nameCode, bp.cpmctymc, bp.ggxh, ip.batchNo, ip.productionDate, ip.expireDate
+        from inv_product ip
+                 left join inv_product_detail ipd
+                           on ip.relIdFk = ipd.relId and
+                              ifnull(ip.batchNo, 'empty') = ifnull(ipd.batchNo, 'empty')
+                 left join basic_udirel bu on bu.id = ip.relIdFk
+                 left join basic_products bp on bu.uuid = bp.uuid
+        <where>
+            (inCount - outCount) > 0
+            <if test="nameCode != null and nameCode != ''">
+                AND bp.nameCode like concat('%', #{nameCode}, '%')
+            </if>
+            <if test="cpmctymc != null and cpmctymc != ''">
+                AND bp.cpmctymc like concat('%', #{cpmctymc}, '%')
+            </if>
+            <if test="batchNo != null and batchNo != ''">
+                AND ip.batchNo like concat('%', #{batchNo}, '%')
+            </if>
+            <if test="invCode != null and invCode != ''">
+                AND ip.invCode = #{invCode}
+            </if>
+            <if test="invSpaceCode != null and invSpaceCode != ''">
+                AND ipd.invSpaceCode = #{invSpaceCode}
+            </if>
+            <if test="cplb != null and cplb != ''">
+                AND bp.cplb = #{cplb}
+            </if>
+        </where>
+        group by ip.id
+    </select>
 </mapper>