tijiao

src/main/java/com/steerinfo/dil/controller/WmspOutboundResultController.java

@@ -193,10 +193,8 @@ public class WmspOutboundResultController extends BaseRESTfulController {
         String materialOnlyCode=subResultMaterial.split("-")[7];
         BigDecimal resultId = new BigDecimal(map.get("resultId").toString());
         //物资唯一编码
-
-
         //判断物质是否已经被扫描
-        int isScan = wmspOutboundResultService.ExistScanResult(subResultMaterial);
+        int isScan = wmspOutboundResultService.ExistScanResult(subResultMaterial,resultId);
         //根据物资id查询相对应的入库实绩ID，并将其赋值给相对应的入库扫描实绩表,判断是否入库
         List<Map<String, Object>> list = wmspInboundScanResultMapper.getInboundResultIdByMaterial(subResultMaterial);
         if (list==null||list.size()==0){
@@ -273,7 +271,7 @@ public class WmspOutboundResultController extends BaseRESTfulController {
          * */
 
         ///判断物质是否已经被扫描
-        int scanCount = wmspOutboundResultService.ExistScanResult(subResultMaterial);
+        int scanCount = wmspOutboundResultService.ExistScanResult(subResultMaterial,null);
         ///如果没有被扫描
         if(scanCount==0){
             //wmspOutboundResultService.getOutBoundId(resultNumber);
@@ -532,7 +530,7 @@ public class WmspOutboundResultController extends BaseRESTfulController {
         int result = wmspOutboundResultService.deleteGridMaterial(materialOnlyCode);
 
         //判断物质是否已经被扫描
-        int isScan = wmspOutboundResultService.ExistScanResult(materialOnlyCode);
+        int isScan = wmspOutboundResultService.ExistScanResult(materialOnlyCode,null);
         if (result>0&&isScan==0&&list.size()>0){
             Map<String, Object> map1 = list.get(0);
             //创建出库实绩

src/main/java/com/steerinfo/dil/mapper/WmspOutboundResultMapper.java

@@ -51,7 +51,7 @@ public interface WmspOutboundResultMapper extends IBaseMapper<WmspOutboundResult
     //通过装卸工工号查询装卸工Id
     BigDecimal getPersonnelIdByJobnumber(String personnelJobNumber);
     //根据扫描结果查询扫描实绩是否存在
-    int ExistScanResult(String resultMaterial);
+    int ExistScanResult(@Param("resultMaterial") String resultMaterial,@Param("resultId") BigDecimal resultId);
     //通过物资物资唯一编码查询钢材物资表的物资Id
     BigDecimal getSteelMaterialIdByMaterialOnlyCode(String MaterialOnlyCode);
     //通过出库实绩Id查询物资Id

src/main/java/com/steerinfo/dil/service/IWmspOutboundResultService.java

@@ -53,7 +53,7 @@ public interface IWmspOutboundResultService {
     //通过装卸工工号查询装卸工Id
     BigDecimal getPersonnelIdByJobnumber(String personnelJobNumber);
     //根据扫描结果查询扫描实绩是否存在
-    int ExistScanResult(String resultMaterial);
+    int ExistScanResult(String resultMaterial,BigDecimal resultId);
     //通过物资物资唯一编码查询钢材物资表的物资Id
     BigDecimal getSteelMaterialIdByMaterialOnlyCode(String MaterialOnlyCode);
     //通过出库实绩Id查询物资Id

src/main/java/com/steerinfo/dil/service/impl/WmspOutboundResultServiceImpl.java

@@ -142,8 +142,8 @@ public class WmspOutboundResultServiceImpl  implements IWmspOutboundResultServic
     }
 
     @Override
-    public int ExistScanResult(String resultMaterial) {
-        return wmspOutboundResultMapper.ExistScanResult(resultMaterial);
+    public int ExistScanResult(String resultMaterial,BigDecimal resultId) {
+        return wmspOutboundResultMapper.ExistScanResult(resultMaterial,resultId);
     }
 
     @Override

src/main/resources/application-prod.yml

@@ -10,7 +10,7 @@ spring:
 #feign设置
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   Im:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   TmsTruckFeign:

src/main/resources/com/steerinfo/dil/mapper/WmspOutboundResultMapper.xml

@@ -950,7 +950,7 @@
   </select>
 
   <!--  根据扫描结果查询扫描实绩是否存在-->
-  <select id="ExistScanResult" parameterType="String" resultType="int">
+  <select id="ExistScanResult"  resultType="int">
     select count(*)
     from WMSP_OUTBOUND_SCAN_RESULT wosr
             join WMSP_OUTBOUND_RESULT wor
@@ -961,6 +961,7 @@
             on wisr.INBOUND_RESULT_ID = wir.INBOUND_ID
     where  (wir.RESULT_DELETED = 0 or  wor.RESULT_STATUS = 1)
           and wosr.RESULT_MATERIAL = #{resultMaterial}
+            and wor.result_id = #{resultId}
   </select>
 
   <!--  通过物资物资唯一编码查询钢材物资表的物资Id-->