Merge remote-tracking branch 'origin/master'

# Conflicts:
#	zkqy-ui/src/utils/print/printUtils.js

zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/ProductInventoryServiceImpl.java

@@ -600,7 +600,7 @@ public class ProductInventoryServiceImpl implements IProductInventoryService {
 //            productCodeListVO.getQrCode();
 
             // 得到当前码单出库信息
-            ProductOutboundRecord productOutboundRecord = productOutboundRecordMapper.selectProductOutboundRecordWhetherExist(productCodeListVO.getQrCodeId(), productCodeListVO.getQrCode());
+            ProductOutboundRecord productOutboundRecord = productOutboundRecordMapper.selectProductOutboundRecordWhetherExist(productCodeListVO.getQrCode(),productCodeListVO.getQrCodeId());
             productOutboundRecord.getNoticeNumber(); // 通知单号
 
             // 根据通知单号查询出库单信息
@@ -626,7 +626,7 @@ public class ProductInventoryServiceImpl implements IProductInventoryService {
                     .orElse(null);
 
             // getBatchState() 0 表示正常登账状态不可以退库 1表示撤销登账状态可以退库
-            if (find != null && find.getBatchState() == 1) {
+            if (find != null && (find.getBatchState() == '0')) {
                 retList.add(productCodeListVO);
                 continue;
             }

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

@@ -422,8 +422,8 @@
             <if test="totalSuttle != null">total_suttle = #{totalSuttle},</if>
             <if test="totalGrossWeight != null">total_gross_weight = #{totalGrossWeight},</if>
             <if test="productColour != null">product_colour = #{productColour},</if>
-            <if test="withdrawingFlag != null">withdrawing_flag = #{withdrawingFlag}</if>
-            <if test="otherStates != null">other_states = #{otherStates}</if>
+            <if test="withdrawingFlag != null">withdrawing_flag = #{withdrawingFlag},</if>
+            <if test="otherStates != null">other_states = #{otherStates},</if>
             <if test="parentCode != null">parent_code = #{parentCode},</if>
 
         </trim>

zkqy-ui/src/utils/print/printUtils.js

@@ -80,10 +80,16 @@ function printCN_XSW(printRow) {
     boxNum,/*箱号*/
     packaging
   } = printRow;
-  console.log("A!!!!",printRow)
+  /*加一个色泽判断，因为productColor  和 productColour 的各文件应用次数较多无法完全替换*/
+  var color = "";
+  if(productColor == "" || productColor == null || productColor == undefined){
+    color = productColour;
+  }else{
+    color = productColor;
+  }
   let res = [];
   res.push({ key1: '品种', key2: productName || '', key3: '规格', key4: productSpecifications || '' })
-  res.push({ key1: '批号', key2: lotNum || '', key3: '色号', key4: productColor || '' })
+  res.push({ key1: '批号', key2: lotNum || '', key3: '色号', key4: color || '' })
   res.push({ key1: '等级', key2: levels || '', key3: '箱号', key4: qrCode || '', key5: boxNum || '' })
   res.push({ key1: '筒数', key2: canisterNum || '' + '    ' + tubeColor, key3: '捻向', key4: directionOfTwistLabel || ' ', })
   res.push({