修改

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

@@ -147,8 +147,10 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
                 return success("装货成功");
             }else if(i == -2){
                 return failed("已装过此物资");
-            }else if(i == -3){
+            }else if(i == -3) {
                 return failed("该订单没有装货作业");
+            }else if (i==-5){
+                return failed("请勿重复装车");
             }else {
                 return failed("装货异常，请联系管理员！");
             }

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

@@ -128,4 +128,7 @@ public interface UtilsMapper {
     //通过userId查找运力名字
     String getCapacityNameBySsoId(String userId);
 
+    //通过车牌号和运输订单号去寻找装车实绩
+    BigDecimal getLoadResultId(Map<String,Object> map);
+
 }

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

@@ -226,7 +226,10 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             //推送消息到websocket
             utilsService.pushMesToWebsocket(capacityNumber, "装货");
             BigDecimal orderId = DataChange.dataToBigDecimal(mesMap.get("orderId"));
-            addCapacityRemark(map);
+            int i1 = addCapacityRemark(map);
+            if (i1==-5){
+                return -5;
+            }
             //根据运输订单查找需求备注
             Map<String,Object>  remarkMap=tmstruckTimeTaskResultMapper.selectInwardDueTimeByOrderId(orderId);
             String remark =(String) remarkMap.get("remark");
@@ -432,11 +435,17 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         TmstruckLoadResult tmstruckLoadResult=new TmstruckLoadResult();
         String capacityName = utilsMapper.getCapacityNameBySsoId((String) map.get("personnelSsoId") );
         if (capacityName!=null) {
-            tmstruckLoadResult.setResultId(DataChange.dataToBigDecimal(map.get("resultId")));
-            tmstruckLoadResult.setCapacityRemark(capacityName);
-            i = tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
+            //通过车牌去寻找装货实绩,减少多次装货
+            map.put("capacityName", capacityName);
+            BigDecimal loadResultId = utilsMapper.getLoadResultId(map);
+            if (loadResultId == null) {
+                tmstruckLoadResult.setResultId(DataChange.dataToBigDecimal(map.get("resultId")));
+                tmstruckLoadResult.setCapacityRemark(capacityName);
+                i = tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
+            }else {
+                i=-5;
+            }
         }
-
         return i;
     }
 

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

@@ -342,8 +342,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             map.put("materialId", measureCommission.get("materialId"));
         addMeasureCommission(map); // 添加计量委托
         /*访问接口发送数据*/
-        return sendMesToMeasure(measureCommission);
-//        return 1;
+//        return sendMesToMeasure(measureCommission);
+        return 1;
 
     }
 

src/main/resources/application-dev.yml

@@ -31,7 +31,7 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OmsFeign:
-    url: ${OMSFEIGN_URL:localhost:8016}
+    url: ${OMSFEIGN_URL:172.16.33.162:8016}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.162:8006}
   QmsFeign:
@@ -39,7 +39,7 @@ openfeign:
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8015}
+    url: ${AMSFEIGN_URL:172.16.33.162:8015}
 
 server:
   port: 8008

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

@@ -359,4 +359,13 @@
         from RMS_CAPACITY RC
         where RC.CAPACITY_SSO_ID = #{userId}
     </select>
+    <select id="getLoadResultId" resultType="java.math.BigDecimal" parameterType="java.util.Map">
+        select TLR.RESULT_ID "resultId"
+        from OMSTRUCK_ORDER OO
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON OO.ORDER_ID=TTR.ORDER_ID
+        LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
+        ON TTR.RESULT_TOTAL_ID=TLR.RESULT_TOTAL_ID
+        WHERE OO.ORDER_NUMBER=#{orderNumber} and TLR.CAPACITY_REMARK =#{capacityName}
+    </select>
 </mapper>