补充提交

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

@@ -127,6 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertProductCodeList" parameterType="com.zkqy.business.domain.ProductCodeList" useGeneratedKeys="true" keyProperty="id">
         insert into {DBNAME}.product_code_list
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="qrCode != null">qr_code,</if>
             <if test="lotNum != null">lot_num,</if>
             <if test="productId != null">product_id,</if>
@@ -160,6 +161,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             del_flag
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="qrCode != null">#{qrCode},</if>
             <if test="lotNum != null">#{lotNum},</if>
             <if test="productId != null">#{productId},</if>

zkqy-custom-business/src/main/resources/mapper/business/SaleProductsMapper.xml

@@ -437,7 +437,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     r.levels
             ) AS a
                 LEFT JOIN {DBNAME}.sale_products sp ON sp.sale_order_no = a.sale_order_no
-                AND sp.product_no = a.productCode
+                AND sp.product_no = a.productCode and sp.del_flag = '0'
 
     </select>
 
@@ -476,7 +476,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     r.levels
             ) AS a
                 LEFT JOIN {DBNAME}.sale_products sp ON sp.sale_order_no = a.sale_order_no
-            AND sp.product_no = a.productCode
+            AND sp.product_no = a.productCode and sp.del_flag = '0'
 
     </select>