Merge branch 'dev'

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

@@ -85,7 +85,7 @@ public class TmstruckUnloadResultController extends BaseRESTfulController {
             @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
     })
     @PostMapping("/updateUnloadResult")
-    public RESTfulResult updateUnloadResult(@RequestBody Map<String, Object> mapValue){
+    public RESTfulResult updateUnloadResult(@RequestBody Map<String, Object> mapValue) throws Exception {
         int i = tmstruckUnloadResultService.updateUnloadResult(mapValue);
         if(i > 0){
             return success("卸货成功！");

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

@@ -37,8 +37,6 @@ public interface TmstruckTimeTaskResultMapper extends IBaseMapper<TmstruckTimeTa
     //根据运输订单号查找需要用车时长
     Map<String,Object>  selectInwardDueTimeByOrderId(BigDecimal orderId);
 
-
-
     //根据运输订单id查找实绩中是否含有已经计时结束的实绩
     int CountTimeTaskByOrderId(BigDecimal orderId);
 

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

@@ -62,7 +62,6 @@ public interface UtilsMapper {
     BigDecimal getTotalIdByOrderNumber(String orderNumber);
 
 
-
     //通过总实绩ID查找订单类型
     Map<String, Object> getOrderTypeByTotalId(BigDecimal resultTotalId);
 
@@ -120,7 +119,12 @@ public interface UtilsMapper {
    //通过运输订单id查找计时是否开始
     BigDecimal getTime(BigDecimal orderId);
 
+    //通过运输订单id查找计时开始时间
     BigDecimal getInwardStartTime(BigDecimal orderId);
 
+    //通过运输订单id查找计时结束时间
     BigDecimal getInwardEndTime(BigDecimal orderId);
+
+
+
 }

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

@@ -27,7 +27,7 @@ public interface ITmstruckUnloadResultService{
     int addUnloadResult(Map<String, Object> map);
 
     // 修改实绩内容
-    int updateUnloadResult(Map<String, Object> map);
+    int updateUnloadResult(Map<String, Object> map) throws Exception;
 
     //新增卸货实绩
     int addUnloadresultForconverted(Map<String,Object> map);

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

@@ -159,8 +159,9 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         int orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
         if(orderType == 11){//内转计时调用方法
             return orderType11Use(map, mesMap, capacityNumber, resultTotalId);
-        } else if (orderType == 21){//调用计时作业方法
-            return orderType21Use(map, orderNumber, DataChange.dataToBigDecimal(map.get("orderId")));
+        }
+        else if (orderType == 21){//调用计时作业方法
+            return orderType21Use(map, orderNumber, DataChange.dataToBigDecimal(mesMap.get("orderId")));
         }
         Map<String, Object> selectMap = tmstruckEnfactoryResultMapper.selectEnFactoryResultId(orderNumber);
         if(selectMap == null){

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

@@ -38,6 +38,9 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     @Autowired
     private TmstruckEnfactoryResultMapper tmstruckEnfactoryResultMapper;
 
+    @Autowired
+    private TmstruckTimeTaskResultServiceImpl tmstruckTimeTaskResultService;
+
     @Autowired
     private TmstruckReturnResultMapper tmstruckReturnResultMapper;
 
@@ -47,6 +50,9 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     @Autowired
     private TmstruckLeaveFactoryResultMapper tmstruckLeaveFactoryResultMapper;
 
+    @Autowired
+    private TmstruckTimeTaskResultMapper tmstruckTimeTaskResultMapper;
+
     @Autowired
     private WmshBoundFeign wmshBoundFeign;
 
@@ -219,6 +225,18 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             utilsService.updateOrderLineSqeByOrderNumber(mesMap);
             //推送消息到websocket
             utilsService.pushMesToWebsocket(capacityNumber, "装货");
+            BigDecimal orderId = DataChange.dataToBigDecimal(mesMap.get("orderId"));
+            //根据运输订单查找需求备注
+            Map<String,Object>  remarkMap=tmstruckTimeTaskResultMapper.selectInwardDueTimeByOrderId(orderId);
+            String remark =(String) remarkMap.get("remark");
+            if (remark.contains("计时")){
+                //判断计时是否开始
+                BigDecimal startTime = utilsMapper.getTime(DataChange.dataToBigDecimal(orderId));
+                if (startTime==null){
+                    map.put("inwardTypes",1);
+                    tmstruckTimeTaskResultService.addTimeTaskResult(map);
+                }
+            }
             return i;
         }
         //如果是零星多拼订单 需要查询这个物资是否已经装过了
@@ -419,7 +437,6 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
         //设置主键id
         tmstruckLoadResult.setResultId(tmstruckLoadResultMapper.selectMaxId());
-
         //获取开始时间
         Date startTime = (Date) map.get("startTime");
         //获取运输订单号

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

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

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

@@ -266,7 +266,7 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int addTimeTaskResult(Map<String, Object> map) throws Exception {
-           //判断是否是计时开始还是计时结束
+        //判断是否是计时开始还是计时结束
         int i=0;
         BigDecimal inwardType =DataChange.dataToBigDecimal(map.get("inwardTypes")) ;
         String orderNumber = (String) map.get("orderNumber");
@@ -280,7 +280,6 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
         if (countEndTimeNum >= 1) {
             throw new Exception("请勿重复计时");
         }
-
         tmstruckTimeTaskResult.setTimeTaskResultId(tmstruckTimeTaskResultMapper.selectMaxId());
         tmstruckTimeTaskResult.setResultTotalId(DataChange.dataToBigDecimal(resultTotalId));
         //获取计时开始的订单类型
@@ -313,9 +312,27 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
                     tmstruckTimeTaskResult.setUpdateUsername(personnelSsoId);
                 }
                 i += tmstruckTimeTaskResultMapper.updateByPrimaryKeySelective(tmstruckTimeTaskResult);
+               } else {
+                Map<String, Object> timeMaps = utilsMapper.FristTimeTask(map);
+                Date resultTime2 = (Date) timeMaps.get("resultTime");
+                Map<String, Object> timeStatus = utilsMapper.getTimeStatus(map);
+                Date resultTime1 = (Date) timeStatus.get("resultTime");
+                long dateTime1 = resultTime2.getTime() - resultTime1.getTime();
+                BigDecimal dateTime3 = new BigDecimal(dateTime1 / (1000 * 60));
+                tmstruckTimeTaskResult.setTimeTaskResultId(tmstruckTimeTaskResult.getTimeTaskResultId());
+                tmstruckTimeTaskResult.setResultValue(dateTime3);
+                tmstruckTimeTaskResult.setResultUomId(new BigDecimal(900));
+                if (personnelSsoId != null) {
+                    tmstruckTimeTaskResult.setUpdateUsername(personnelSsoId);
+                }
+                i += tmstruckTimeTaskResultMapper.updateByPrimaryKeySelective(tmstruckTimeTaskResult);
             }
-            pushOrderForPause(map);
-        }
+            Map<String, Object> orderMes = utilsMapper.getOrderTypeByOrderNumber(orderNumber);
+            BigDecimal orderType =DataChange.dataToBigDecimal(orderMes.get("orderType"));
+            if (orderType.intValue()==21) {
+                pushOrderForPause(map);
+            }
+         }
             return i;
         }
 

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

@@ -58,6 +58,10 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
 
     @Autowired
     TmstruckLeaveFactoryResultServiceImpl tmstruckLeaveFactoryResultService;
+    @Autowired
+    TmstruckTimeTaskResultServiceImpl tmstruckTimeTaskResultService;
+    @Autowired
+    TmstruckTimeTaskResultMapper tmstruckTimeTaskResultMapper;
 
     @Autowired
     private RulesServiceImpl rulesService;
@@ -135,7 +139,7 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
      */
     @Override
     @Transactional
-    public int updateUnloadResult(Map<String, Object> map) {
+    public int updateUnloadResult(Map<String, Object> map) throws Exception {
         //通过运输订单号查询订单类型
         String orderNumber = (String) map.get("orderNumber");
         //通过订单号查询订单类型 及总实绩Id
@@ -164,6 +168,14 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             }
             //卸货成功后推送消息给websocket
             utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "卸货");
+            //根据运输订单查找需求备注
+            BigDecimal orderId = DataChange.dataToBigDecimal(mesMap.get("orderId"));
+            Map<String,Object>  remarkMap=tmstruckTimeTaskResultMapper.selectInwardDueTimeByOrderId(orderId);
+            String remark =(String) remarkMap.get("remark");
+            if (remark.contains("计时")){
+                 map.put("inwardTypes",3);
+                 tmstruckTimeTaskResultService.addTimeTaskResult(map);
+            }
             return 1;
         }
         //如果是零星多拼订单 需要查询这个物资是否已经卸过了

src/main/resources/application-dev.yml

@@ -39,7 +39,7 @@ openfeign:
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.162:8015}
+    url: ${AMSFEIGN_URL:72.16.33.162:8015}
 
 server:
   port: 8008

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

@@ -808,7 +808,8 @@
   </select>
 
     <select id="selectInwardDueTimeByOrderId" resultType="java.util.Map" parameterType="java.math.BigDecimal">
-      select AIR.DUE_DATE  "dueTime"
+      select AIR.DUE_DATE  "dueTime",
+             AIR.INSERT_UPDATE_REMARK "remark"
       from OMSTRUCK_ORDER OO
       left join AMSTRUCK_INWARD_PLAN AIP
                        on AIP.PLAN_ID=OO.ORDER_PLAN_ID

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

@@ -328,7 +328,7 @@
         select sum(TTTR.RESULT_VALUE) "resultPauseTime"
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR
-        ON TTR.ORDER_ID=TTR.ORDER_ID
+        ON TTR.ORDER_ID=OO.ORDER_ID
         LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR
         ON TTTR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
         WHERE OO.ORDER_ID=#{orderId} and TTTR.RESULT_TIME_TYPE= #{type}