Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

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/TmstruckLeaveFactoryResultServiceImpl.java

@@ -246,6 +246,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 }catch (Exception ex){
 
                 }
+//                bmsTruckFeign.addDetailsOrder(orderId);
                 break;
             case 2:
             case 3:

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"));
-            int i1 = addCapacityRemark(map);
-            if(i1 == -5){
-                return -5;
+            //判断是否有装货实绩
+            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);
+            }
+             i += addCapacityRemark(map);
+            if (i==-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/java/com/steerinfo/dil/service/impl/TmstruckMeasureCommissionServiceImpl.java

@@ -104,7 +104,11 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 String loadingPace = (String) map.get("warehouseName");
                 String url = "http://172.16.33.122:44325/api/logistics/modifyLoadPlace";
                 String ysdd = (String) map.get("orderNumber");
+                String memo = (String) map.get("insertUpdateRemark");
                 String sendUrl = url + "?ysdd=" + ysdd + "&loadingPace=" + loadingPace;
+                if (memo != null) {
+                    sendUrl += "&memo=" + memo;
+                }
                 String jsonData = getRequestUtils.doGet(sendUrl);
                 System.out.println(sendUrl);
                 System.out.println("委托已发送" + jsonData);

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

@@ -1875,6 +1875,7 @@
                     ASM.SALE_MATERIAL_ID "saleMaterialId",
                     ASM.MATERIAL_NUMBER "materialNum",
                     ASM.EAS_PRIMARY_ID "closeEntryId",
+                    ASM.DELETED "deletedStatus",
                     RC.CONSIGNEE_COMPANY_NAME "consigneeName",
                     ASOM.SALE_ORDER_MATERIAL_ID "saleOrderMaterialId",
                     RS.SHIPPER_NAME "shipperName",
@@ -1914,6 +1915,7 @@
                     ASOM.SALE_DATE_OF_RECEIPT   "saleDateReceipt",
                     R_CARRIER.CARRIER_ID        "carrierId",
                     NVL(R_CARRIER.CARRIER_ID,0) "carrierIds",
+                    OO.ORDER_STATUS              "carStatus",
                     DECODE(ASO.SALE_ORDER_STATUS,1,'销售订单已上报',
                                                  2,'销售已提交',
                                                  4,'财务已审批',