Browse Source

码单补码接口

xuezizhuo 1 year ago
parent
commit
770cc013f7

+ 1 - 1
zkqy-custom-business/src/main/java/com/zkqy/business/controller/ProductCodeListController.java

@@ -91,7 +91,7 @@ public class ProductCodeListController extends BaseController {
      */
     @GetMapping("/queryCodeListByQrCode/{qrCode}")
     public AjaxResult queryCodeListByQrCode(@PathVariable("qrCode") String qrCode) {
-        return success(productCodeListService.selectProductCodeListByQrCode(qrCode));
+        return success(productCodeListService.selectProductCodeInfoByQrCode(qrCode));
     }
 
 

+ 11 - 0
zkqy-custom-business/src/main/java/com/zkqy/business/domain/ProductCodeList.java

@@ -115,6 +115,17 @@ public class ProductCodeList extends BaseEntity
     /** 合计毛重 */
     private Double totalGrossWeight;
 
+    //码单uuid
+    private String qrCodeId;
+
+    public String getQrCodeId() {
+        return qrCodeId;
+    }
+
+    public void setQrCodeId(String qrCodeId) {
+        this.qrCodeId = qrCodeId;
+    }
+
     public Long getId() {
         return id;
     }

+ 5 - 0
zkqy-custom-business/src/main/java/com/zkqy/business/mapper/ProductCodeListMapper.java

@@ -75,6 +75,11 @@ public interface ProductCodeListMapper
      */
     List<ProductCodeList> selectProductCodeListByQrCode(String qrCode);
 
+    /**
+     * 根据码单号查询码单信息和码单唯一标识
+     */
+    List<ProductCodeList> selectProductCodeInfoByQrCode(String qrCode);
+
     /**
      * 获取当前吗码单完整信息
      */

+ 5 - 0
zkqy-custom-business/src/main/java/com/zkqy/business/service/IProductCodeListService.java

@@ -89,4 +89,9 @@ public interface IProductCodeListService
      */
     public AjaxResult deleteProductCodeListInfoByInfo(ProductCodeListVO productCodeListVO);
 
+    /**
+     * 根据码单号查询码单信息和唯一标识uuid
+     */
+    List<ProductCodeList> selectProductCodeInfoByQrCode(String qrCode);
+
 }

+ 5 - 0
zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/ProductCodeListServiceImpl.java

@@ -258,4 +258,9 @@ public class ProductCodeListServiceImpl implements IProductCodeListService {
         return iProductInventoryService.deleteInventorByProductCodeListVO(productCodeListVO);
     }
 
+    @Override
+    public List<ProductCodeList> selectProductCodeInfoByQrCode(String qrCode) {
+        return productCodeListMapper.selectProductCodeInfoByQrCode(qrCode);
+    }
+
 }

+ 18 - 0
zkqy-custom-business/src/main/resources/mapper/business/ProductCodeListMapper.xml

@@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="totalBoxNum" column="total_box_num"/>
         <result property="totalSuttle" column="total_suttle"/>
         <result property="totalGrossWeight" column="total_gross_weight"/>
+        <result property="qrCodeId" column="qr_code_id"/>
     </resultMap>
 
     <resultMap type="com.zkqy.business.domain.vo.ProductCodeListVO" id="ProductCodeListResultVO">
@@ -276,6 +277,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where qr_code = #{qrCode} and del_flag = '0'
     </select>
 
+    <select id="selectProductCodeInfoByQrCode" parameterType="string" resultMap="ProductCodeListResult">
+        SELECT
+            pcl.*,
+            pwr.qr_code_id
+        FROM
+            {DBNAME}.product_code_list pcl
+                LEFT JOIN {DBNAME}.product_warehousing_record pwr ON pcl.qr_code = pwr.qr_code
+                AND pcl.lot_num = pwr.lot_num
+                AND pcl.product_id = pwr.product_id
+                AND pcl.product_colour = pwr.product_colour
+                AND pcl.levels = pwr.levels
+                and pcl.box_num = pwr.box_num
+                and pwr.del_flag = '0'
+        where pcl.del_flag = '0' and pcl.qr_code = #{qrCode}
+    </select>
+
+
     <select id="getProductCodeListById" resultMap="ProductCodeListResultVO">
         SELECT
             *