Merge remote-tracking branch 'origin/master'

src/main/java/com/gaotao/modules/outsourcing/controller/OutsourcingIssueController.java

@@ -68,7 +68,7 @@ public class OutsourcingIssueController {
         try {
             MaterialLabelInfo labelInfo = outsourcingIssueService.scanOutsourcingMaterialLabel(dto.getScannedLabel(), dto.getSite(), dto.getComponentPartNo());
             if (labelInfo == null) {
-                return R.error("无法解析物料标签");
+                return R.error("物料库存不存在或标签不是在库状态");
             }
             return R.ok().put("labelInfo", labelInfo);
         } catch (Exception e) {

src/main/java/com/gaotao/modules/outsourcing/controller/OutsourcingReturnController.java

@@ -80,7 +80,7 @@ public class OutsourcingReturnController {
         try {
             MaterialLabelInfo labelInfo = outsourcingReturnService.scanMaterialLabelForOutsourcing(dto.getScannedLabel(), dto.getSite(), dto.getBatchNo(), dto.getComponentPartNo());
             if (labelInfo == null) {
-                return R.error("无法解析物料标签");
+                return R.error("标签不是未入库状态");
             }
             return R.ok().put("labelInfo", labelInfo);
         } catch (Exception e) {

src/main/java/com/gaotao/modules/production/controller/ProductionIssueController.java

@@ -222,7 +222,7 @@ public class ProductionIssueController {
     public R scanMaterialLabel(@RequestBody DirectIssueDto dto) throws Exception{
             MaterialLabelInfo labelInfo = productionIssueService.scanMaterialLabel(dto.getScannedLabel(), dto.getSite(),dto.getComponentPartNo());
             if (labelInfo == null) {
-                return R.error("无法解析物料标签");
+                return R.error("物料库存不存在或者标签不是在库状态");
             }
             return R.ok().put("labelInfo", labelInfo);
     }

src/main/java/com/gaotao/modules/production/controller/ProductionReturnController.java

@@ -102,7 +102,7 @@ public class ProductionReturnController {
     public R scanMaterialLabel(@RequestBody DirectIssueDto dto) throws Exception{
         MaterialLabelInfo labelInfo = productionReturnService.scanMaterialLabel(dto.getScannedLabel(), dto.getSite(),dto.getBatchNo(),dto.getComponentPartNo());
         if (labelInfo == null) {
-            return R.error("无法解析物料标签");
+            return R.error("标签不是未入库状态");
         }
         return R.ok().put("labelInfo", labelInfo);
     }

src/main/resources/mapper/mr/MrIssueMapper.xml

@@ -54,6 +54,6 @@
             a.status_db,
             a.created_date
         from handling_unit a
-        where a.site=#{site} and a.unit_id=#{labelCode} and a.in_stock_flag='N' and a.part_no = #{partNo}
+        where a.site=#{site} and a.unit_id=#{labelCode} and (a.in_stock_flag='N' or a.in_stock_flag='X') and a.part_no = #{partNo}
     </select>
 </mapper>

src/main/resources/mapper/production/ProductionReturnMapper.xml

@@ -33,7 +33,7 @@
             a.status_db,
             a.created_date
         from handling_unit a
-        where a.site=#{site} and a.unit_id=#{labelCode} and a.in_stock_flag='N' and a.batch_no = #{batchNo} and a.part_no = #{partNo}
+        where a.site=#{site} and a.unit_id=#{labelCode} and (a.in_stock_flag='N' or a.in_stock_flag='X') and a.batch_no = #{batchNo} and a.part_no = #{partNo}
     </select>
     <update id="updateHandingUnit" parameterType="java.util.List">
         <foreach collection="list" item="hu" separator=";">