Browse Source

PDA不合格品出库

k 2 years ago
parent
commit
fd8624b220

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

@@ -36,10 +36,30 @@ public class PdaInvLotLocIdController {
     private InvLotLocIdMapper invLotLocIdMapper;
 
 
+    /**
+     * 获取库存物料 合格
+     *
+     * @return
+     */
     @GetMapping("/getSku")
     public AjaxResult getSku() {
         InvLocIdSearchFrom invLocIdSearchFrom = new InvLocIdSearchFrom();
         invLocIdSearchFrom.setZoneId(Constant.ZONE_TYPE.STORAGE.getValue().toString());
+        invLocIdSearchFrom.setQualityStatus("HG");
+        List<InvLotLocIdLotattVO> invLotLocIdLotattVOList = invLotLocIdMapper.selectInvLocIdSkuListGroupBy(invLocIdSearchFrom);
+        return AjaxResult.success("", invLotLocIdLotattVOList);
+    }
+
+    /**
+     * 获取库存物料 不合格
+     *
+     * @return
+     */
+    @GetMapping("/getSkuBHG")
+    public AjaxResult getSkuBHG() {
+        InvLocIdSearchFrom invLocIdSearchFrom = new InvLocIdSearchFrom();
+        invLocIdSearchFrom.setZoneId(Constant.ZONE_TYPE.STORAGE.getValue().toString());
+        invLocIdSearchFrom.setQualityStatus("BHG");
         List<InvLotLocIdLotattVO> invLotLocIdLotattVOList = invLotLocIdMapper.selectInvLocIdSkuListGroupBy(invLocIdSearchFrom);
         return AjaxResult.success("", invLotLocIdLotattVOList);
     }

+ 10 - 1
warewms-ams/src/main/java/com/ruoyi/ams/inv/domain/form/InvLocIdSearchFrom.java

@@ -14,6 +14,7 @@ public class InvLocIdSearchFrom {
     private String isFull;
     private LotattDTO lotattDTO;
     private String palletNo;
+    private String qualityStatus;
 
     public String getSku() {
         return sku;
@@ -62,4 +63,12 @@ public class InvLocIdSearchFrom {
     public void setPalletNo(String palletNo) {
         this.palletNo = palletNo;
     }
-}
+
+    public String getQualityStatus() {
+        return qualityStatus;
+    }
+
+    public void setQualityStatus(String qualityStatus) {
+        this.qualityStatus = qualityStatus;
+    }
+}

+ 1 - 0
warewms-ams/src/main/resources/mapper/ams/InvLotLocIdMapper.xml

@@ -311,6 +311,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             1=1
             <if test="zoneId != null  and zoneId != ''"> and b.zone_id = #{zoneId}</if>
+            <if test="qualityStatus != null  and qualityStatus != ''"> and att.lotatt05 = #{qualityStatus}</if>
         </where>
         group by inv.sku
         order by inv.sku