华兰接口：质检提交

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

@@ -1,7 +1,10 @@
 package com.ruoyi.web.controller.warewms.api;
 
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
 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;
@@ -13,7 +16,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author JWK
@@ -28,6 +33,8 @@ public class HualanApiController {
 
     @Autowired
     private PdaDocAsnController pdaDocAsnController;
+    @Autowired
+    private PdaDocQcController pdaDocQcController;
 
     /**
      * 半成品回库
@@ -55,6 +62,38 @@ public class HualanApiController {
         return pdaDocAsnController.inToTran(asnHeader);
     }
 
+    /**
+     * 质检提交
+     *
+     * @param map
+     * @return
+     */
+    @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"));
+    }
+
+    /**
+     * 质检提交
+     *
+     * @param map
+     * @return
+     */
+    @Transactional
+    @ApiOperation("质检提交")
+    @PostMapping("qc/updateQcStatus")
+    public AjaxResult updateQcStatus(@RequestBody Map<String, String> map) {
+        String batchNum = map.get("batchNum");
+        String qcStatus = map.get("qcStatus");
+        Map<String, String> mapp = new HashMap<>();
+        mapp.put("sku", "");
+        mapp.put("batchNo", batchNum);
+        mapp.put("status", qcStatus);
+        return pdaDocQcController.qcSubmit(mapp);
+    }
+
+
     @Data
     public static class DocAsnHeader {
         private String location;

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

@@ -591,8 +591,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateQualityStatusByLotNumber" parameterType="String">
         UPDATE inv_lot_att t1
         SET t1.lotatt05 = #{status}
-        WHERE
-            t1.sku = #{sku} and t1.lotatt01 = #{batchNo} and t1.lotatt05 = 'DJ'
+        <where>
+            t1.lotatt01 = #{batchNo} and t1.lotatt05 = 'DJ'
+            <if test="sku != null  and sku != ''"> t1.sku = #{sku}</if>
+        </where>
           AND t1.lotnum IN ( SELECT lotnum FROM inv_lot_loc_id )
     </update>