PDA质检接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/pda/PdaDocQcController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.warewms.pda;
+package com.ruoyi.nieyan.controller.pda;
 
 import com.ruoyi.ams.qc.domain.vo.DocQcListVo;
 import com.ruoyi.ams.qc.service.IDocQcDetailsService;
@@ -53,7 +53,10 @@ public class PdaDocQcController {
     @Log(title = "PDA质检提交（根据库存质检）", businessType = BusinessType.UPDATE)
     @PostMapping("/submit")
     public AjaxResult qcSubmit(@RequestBody Map<String, String> map) {
-        return iDocQcHeaderService.qcSubmit(map.get("sku"), map.get("batchNo"), map.get("status"));
+        return iDocQcHeaderService.qcSubmit(map.get("sku")
+                , map.get("batchNo")
+                , map.get("status")
+                , map.get("notes"));
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/api/HualanApiController.java

@@ -2,8 +2,8 @@ package com.ruoyi.web.controller.warewms.api;
 
 import cn.hutool.http.HttpRequest;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.nieyan.controller.pda.PdaDocQcController;
 import com.ruoyi.web.controller.warewms.pda.PdaDocAsnController;
-import com.ruoyi.web.controller.warewms.pda.PdaDocQcController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.Data;
@@ -81,10 +81,12 @@ public class HualanApiController {
     public AjaxResult updateQcStatus(@RequestBody Map<String, String> map) {
         String batchNum = map.get("batchNum");
         String qcStatus = map.get("qcStatus");
+        String notes = map.get("notes");
         Map<String, String> mapp = new HashMap<>();
         mapp.put("sku", "");
         mapp.put("batchNo", batchNum);
         mapp.put("status", qcStatus);
+        mapp.put("notes", notes);
         return pdaDocQcController.qcSubmit(mapp);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/pda/PdaInvLotLocIdController.java

@@ -43,7 +43,7 @@ public class PdaInvLotLocIdController {
     @GetMapping("/getSkuDJ")
     public AjaxResult getSkuDJ() {
         InvLocIdSearchFrom invLocIdSearchFrom = new InvLocIdSearchFrom();
-        invLocIdSearchFrom.setZoneId(Constant.ZONE_TYPE.STORAGE.getValue().toString());
+//        invLocIdSearchFrom.setZoneId(Constant.ZONE_TYPE.STORAGE.getValue().toString());
         invLocIdSearchFrom.setQualityStatus("DJ");
         List<InvLotLocIdLotattVO> invLotLocIdLotattVOList = invLotLocIdMapper.selectInvLocIdSkuListGroupBy(invLocIdSearchFrom);
         return AjaxResult.success("", invLotLocIdLotattVOList);
@@ -57,7 +57,7 @@ public class PdaInvLotLocIdController {
     @GetMapping("/getSku")
     public AjaxResult getSku() {
         InvLocIdSearchFrom invLocIdSearchFrom = new InvLocIdSearchFrom();
-        invLocIdSearchFrom.setZoneId(Constant.ZONE_TYPE.STORAGE.getValue().toString());
+//        invLocIdSearchFrom.setZoneId(Constant.ZONE_TYPE.STORAGE.getValue().toString());
         invLocIdSearchFrom.setQualityStatus("HG");
         List<InvLotLocIdLotattVO> invLotLocIdLotattVOList = invLotLocIdMapper.selectInvLocIdSkuListGroupBy(invLocIdSearchFrom);
         return AjaxResult.success("", invLotLocIdLotattVOList);
@@ -71,7 +71,7 @@ public class PdaInvLotLocIdController {
     @GetMapping("/getSkuBHG")
     public AjaxResult getSkuBHG() {
         InvLocIdSearchFrom invLocIdSearchFrom = new InvLocIdSearchFrom();
-        invLocIdSearchFrom.setZoneId(Constant.ZONE_TYPE.STORAGE.getValue().toString());
+//        invLocIdSearchFrom.setZoneId(Constant.ZONE_TYPE.STORAGE.getValue().toString());
         invLocIdSearchFrom.setQualityStatus("BHG");
         List<InvLotLocIdLotattVO> invLotLocIdLotattVOList = invLotLocIdMapper.selectInvLocIdSkuListGroupBy(invLocIdSearchFrom);
         return AjaxResult.success("", invLotLocIdLotattVOList);
@@ -80,7 +80,7 @@ public class PdaInvLotLocIdController {
     @GetMapping("/getLotatt")
     public AjaxResult getLotatt() {
         InvLocIdSearchFrom invLocIdSearchFrom = new InvLocIdSearchFrom();
-        invLocIdSearchFrom.setZoneId(Constant.ZONE_TYPE.STORAGE.getValue().toString());
+//        invLocIdSearchFrom.setZoneId(Constant.ZONE_TYPE.STORAGE.getValue().toString());
         List<InvLotLocIdLotattVO> invLotLocIdLotattVOList = invLotLocIdMapper.selectInvLocIdLotattListGroupBy(invLocIdSearchFrom);
         List<String> lists = invLotLocIdLotattVOList
                 .stream()

warewms-ams/src/main/java/com/ruoyi/ams/inv/mapper/InvLotLocIdMapper.java

@@ -285,7 +285,9 @@ public interface InvLotLocIdMapper {
      * @param status
      * @return
      */
-    int updateQualityStatusByLotNumber(@Param("sku")String sku,@Param("batchNo") String batchNo,@Param("status") String status);
+    int updateQualityStatusByLotNumber(@Param("sku")String sku,@Param("batchNo") String batchNo
+            ,@Param("status") String status
+            ,@Param("notes") String notes);
 
     /**
      * 根据托盘号和物料分类查询是否有相同的库存

warewms-ams/src/main/java/com/ruoyi/ams/qc/service/IDocQcHeaderService.java

@@ -90,7 +90,8 @@ public interface IDocQcHeaderService {
      * @param sku
      * @param batchNo
      * @param status
+     * @param notes
      * @return
      */
-    AjaxResult qcSubmit(String sku, String batchNo, String status);
+    AjaxResult qcSubmit(String sku, String batchNo, String status,String notes);
 }

warewms-ams/src/main/java/com/ruoyi/ams/qc/service/impl/DocQcHeaderServiceImpl.java

@@ -169,7 +169,7 @@ public class DocQcHeaderServiceImpl implements IDocQcHeaderService {
     }
 
     @Override
-    public AjaxResult qcSubmit(String sku, String batchNo, String status) {
+    public AjaxResult qcSubmit(String sku, String batchNo, String status,String notes) {
         int successQuantity;
 
         if (Constant.QUALITY_STATUS.DJ.getValue().equals(status)) {
@@ -177,9 +177,11 @@ public class DocQcHeaderServiceImpl implements IDocQcHeaderService {
         }
 
         // 修改批号对应的库存质量状态
-        int i = invLotLocIdMapper.updateQualityStatusByLotNumber(sku, batchNo, status);
+        int i = invLotLocIdMapper.updateQualityStatusByLotNumber(sku, batchNo, status,notes);
         successQuantity = i;
-
+        if (i <= 0) {
+            return AjaxResult.error("质检条数为0条！");
+        }
         return AjaxResult.success(String.format("操作成功！修改了%d条!",successQuantity));
     }
 }

warewms-ams/src/main/resources/mapper/ams/InvLotLocIdMapper.xml

@@ -310,7 +310,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join base_sku sk on inv.sku = sk.sku
         <where>
             1=1
-            <if test="zoneId != null  and zoneId != ''"> and b.zone_id = #{zoneId}</if>
+            <if test="zoneId != null  and zoneId != ''"> and b.zone_id in('8','9','10','11')</if>
             <if test="qualityStatus != null  and qualityStatus != ''"> and att.lotatt05 = #{qualityStatus}</if>
         </where>
         group by inv.sku
@@ -327,7 +327,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join base_sku sk on inv.sku = sk.sku
         <where>
             1=1
-            <if test="zoneId != null  and zoneId != ''"> and b.zone_id = #{zoneId}</if>
+            <if test="zoneId != null  and zoneId != ''"> and b.zone_id in('8','9','10','11')</if>
         </where>
         group by att.lotatt01
         order by att.lotatt01
@@ -593,7 +593,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="updateQualityStatusByLotNumber" parameterType="String">
         UPDATE inv_lot_att t1
-        SET t1.lotatt05 = #{status}
+        SET t1.lotatt05 = #{status}, t1.lotatt17 = #{notes}
         <where>
             t1.lotatt01 = #{batchNo} and t1.lotatt05 = 'DJ'
             <if test="sku != null  and sku != ''">and t1.sku = #{sku}</if>