修改装货扫码

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

@@ -131,4 +131,6 @@ public interface TmstruckLoadResultMapper extends IBaseMapper<TmstruckLoadResult
 
     Map<String, Object> getLoadResultMap(BigDecimal resultTotalId);
 
+
+
 }

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

@@ -200,6 +200,8 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     @Transactional(rollbackFor = Exception.class)
     public int addXS2LoadResult(Map<String, Object> map) throws Exception {
         TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
+        BigDecimal orderId=null;
+        int i=0;
         //通过运输订单号查询订单类型
         String orderNumber = (String) map.get("orderNumber");
         //通过订单号查询订单类型 及总实绩Id
@@ -207,24 +209,31 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         String capacityNumber = (String) mesMap.get("capacityNumber");
         int orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
         BigDecimal resultTotalId = DataChange.dataToBigDecimal(mesMap.get("totalId"));
+        orderId = DataChange.dataToBigDecimal(mesMap.get("orderId"));
         //装货时查询是否含有净重
         Integer netWeight = tmstruckUnloadResultMapper.getNetWeightByTotalId(resultTotalId);
         if(orderType == 11 || orderType == 15 || orderType == 16){
-            int sqe = DataChange.dataToBigDecimal(mesMap.get("Sqe")).intValue();
-            sqe = sqe + 1;
-            map.put("resultId",tmstruckLoadResultMapper.selectMaxId());
-            map.put("Sqe",sqe);//查询路段顺序号+1
-            map.put("resultTotalId", resultTotalId);
-            int i =tmstruckLoadResultMapper.insertSelective(generateLoad(map));
-            //更新路段顺序号
-            mesMap.put("orderLineSequence",sqe);
-            utilsService.updateOrderLineSqeByOrderNumber(mesMap);
-            //推送消息到websocket
-            utilsService.pushMesToWebsocket(capacityNumber, "装货");
-            BigDecimal orderId = DataChange.dataToBigDecimal(mesMap.get("orderId"));
+            //判断是否有装货实绩
+            BigDecimal resultId = tmstruckLoadResultMapper.getResultId(resultTotalId);
+            if (resultId==null) {
+                int sqe = DataChange.dataToBigDecimal(mesMap.get("Sqe")).intValue();
+                sqe = sqe + 1;
+                map.put("resultId", tmstruckLoadResultMapper.selectMaxId());
+                map.put("Sqe", sqe);//查询路段顺序号+1
+                map.put("resultTotalId", resultTotalId);
+                 i = tmstruckLoadResultMapper.insertSelective(generateLoad(map));
+                //更新路段顺序号
+                mesMap.put("orderLineSequence", sqe);
+                utilsService.updateOrderLineSqeByOrderNumber(mesMap);
+                //推送消息到websocket
+                utilsService.pushMesToWebsocket(capacityNumber, "装货");
+            }else {
+                //已装货的实绩
+                map.put("resultId",resultId);
+            }
             int i1 = addCapacityRemark(map);
-            if(i1 == -5){
-                return -5;
+            if (i1==-5){
+                return  -5;
             }
             //根据运输订单查找需求备注
             Map<String,Object>  remarkMap=tmstruckTimeTaskResultMapper.selectInwardDueTimeByOrderId(orderId);
@@ -278,7 +287,6 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             if(personnelId != null){
                 tmstruckLoadResult.setLoaderId(new BigDecimal(personnelId));
             }
-
         }
         // 更新装货点
         tmstruckLoadResult.setLoadingId(DataChange.dataToBigDecimal(map.get("warehouseId")));
@@ -303,7 +311,6 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         //推送消息到websocket
         utilsService.pushMesToWebsocket(capacityNumber, "装货");
         //map.put("orderTypee",orderType);
-
         if (map.get("warehouseId")==null){
           map.put("warehouseName",null);
         }else {
@@ -311,7 +318,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             String warehouseName = utilsMapper.queryWarehouseName(DataChange.dataToBigDecimal(map.get("warehouseId")));
             map.put("warehouseName",warehouseName);
         }
-        int i = tmstruckMeasureCommissionService.addMeasureCommissionForLoding(map);
+//        int i = tmstruckMeasureCommissionService.addMeasureCommissionForLoding(map);
         return 1;
     }
 
@@ -457,10 +464,10 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     public int addCapacityRemark(Map<String, Object> map) {
         int i=0;
         TmstruckLoadResult tmstruckLoadResult=new TmstruckLoadResult();
-        String capacityName = utilsMapper.getCapacityNameBySsoId((String) map.get("personnelSsoId") );
+        String capacityName = utilsMapper.getCapacityNameBySsoId((String) map.get("personnelSsoId"));
         if (capacityName!=null) {
-            //通过车牌去寻找装货实绩,减少多次装货
-            map.put("capacityName", capacityName);
+            map.put("capacityName",capacityName);
+            //判断装机是否重复扫码
             BigDecimal loadResultId = utilsMapper.getLoadResultId(map);
             if (loadResultId == null) {
                 tmstruckLoadResult.setResultId(DataChange.dataToBigDecimal(map.get("resultId")));

src/main/resources/application-dev.yml

@@ -36,7 +36,7 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.166:8012}
   OmsFeign:
-    url: ${OMSFEIGN_URL:172.16.33.166:8016}
+    url: ${OMSFEIGN_URL:localhost:8016}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.166:8006}
   QmsFeign:

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/truckTms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8