Merge branch 'master' into dev

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

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

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

@@ -91,7 +91,9 @@ public class TmstruckUnloadResultController extends BaseRESTfulController {
             return success("卸货成功！");
         }else if(i == -2){
             return failed("已卸过此物资");
-        }else {
+        }else if(i == -3){
+            return failed("该订单没有卸货作业");
+        } else{
             return failed("卸货失败，请联系管理员！");
         }
     }

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

@@ -121,6 +121,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 12:
             case 13:
             case 14:
+            case 19:
             case 100:
                 return tmstruckEnfactoryResultMapper.getSporadicSuppliesEnFactoryResult(map);// apiId:416
         }
@@ -213,6 +214,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 12:
             case 13:
             case 14:
+            case 19:
                 //发送计量委托(查询物资顺序第一个装卸货的物资)
                 Integer materialId = utilsMapper.getLxFirstMaterialId(DataChange.dataToBigDecimal(map.get("orderId")));
                 map.put("materialId", materialId);

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

@@ -147,6 +147,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             case 12:
             case 13:
             case 14:
+            case 19:
             case 100:
                  return tmstruckLeaveFactoryResultMapper.getSporadicLeaveFactory(map);//apiId:421
         }

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

@@ -117,6 +117,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             case 12:
             case 13:
             case 14:
+            case 19:
             case 100:
                  return tmstruckLoadResultMapper.getSporadicSuppliesLoadResult(map); //apiId = 430
         }
@@ -243,13 +244,12 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             mesMap.put("updateUnloadResult", 1);
             Integer checkMaterial = tmstruckLoadResultMapper.checkMaterialIdLoad(resultTotalId, DataChange.dataToBigDecimal(map.get("materialId")));
             if(checkMaterial != null){
-                return -2;
+                return -2; //已装过此物资
             }
         }
         Map<String, Object> dataMap = tmstruckLoadResultMapper.getLoadResultIdByMIdAndTotalId(mesMap);
         if(dataMap == null){
-            mesMap.put("updateUnloadResult", 1);
-            dataMap = tmstruckLoadResultMapper.getLoadResultIdByMIdAndTotalId(mesMap);
+            return -3; //该订单没有装车作业
         }
         //查询装车实绩ID
         map.putAll(dataMap);

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

@@ -304,6 +304,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 12:
             case 13:     //零星进厂、出厂
             case 14:
+            case 19:
                 measureCommission = tmstruckMeasureCommissionMapper.sproadicMeasure(map);
                 if(measureCommission == null){
                     return 0;
@@ -315,8 +316,10 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                     measureCommission.put("flowTo","进厂");
                 }else if(orderType == 13){
                     measureCommission.put("flowTo","出厂");
-                }else {
+                }else if(orderType == 14){
                     measureCommission.put("flowTo","中转");
+                }else{
+                    measureCommission.put("flowTo","退货");
                 }
                 measureCommission.put("isDel", false);
                 measureCommission.put("isInsert", true);
@@ -339,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;
 
     }
 
@@ -404,6 +407,12 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission = tmstruckMeasureCommissionMapper.sporadicDXMeasure(map);
                 if(measureCommission == null)
                     return 0;
+                if(orderType.intValue() == 14){
+                    Integer weightResultCount14 = tmstruckMeasureCommissionMapper.selectNoNetWeightResult(DataChange.dataToBigDecimal(map.get("resultTotalId")));
+                    if(weightResultCount14 == 1){
+                        measureCommission.put("item", measureCommission.get("item") + ",1");
+                    }
+                }
                 measureCommission.put("regionName", "无法确定汽车衡"); //无法确定汽车衡
                 measureCommission.put("deliveryType", "计重");
                 measureCommission.put("billType", "2");
@@ -528,6 +537,9 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                     }
                 }
                 i+=sendMeasureCommissionByGatepost(map);
+                break;
+            case 14:
+
                 break;
             case 15:
             case 20:

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

@@ -70,11 +70,10 @@ public class TmstruckReceiptResultServiceImpl implements ITmstruckReceiptResultS
 
     /**
      * 新增一条虚拟收货实绩
-     * @param map {resultTotalId：总实绩ID}
+     * @param  {resultTotalId：总实绩ID}
      * @return
      */
-    public int addReceiptResult(Map<String, Object> map){
-        BigDecimal resultTotalId = DataChange.dataToBigDecimal(map.get("resultTotalId"));
+    public int addReceiptResult(BigDecimal resultTotalId){
         //根据总实绩ID查询收货实绩查看是否已收货
         Integer receiptResult = tmstruckReceiptResultMapper.getReceiptResult(resultTotalId);
         if(receiptResult != null){

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

@@ -125,6 +125,7 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             case 12:
             case 13:
             case 14:
+            case 19:
             case 100:
                 return  tmstruckUnloadResultMapper.getSporadicSuppliesUnloadResult(map);//apiId:389
         }
@@ -166,7 +167,7 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
                 omsFeign.closeInwardOrder(DataChange.dataToBigDecimal(mesMap.get("orderId")).intValue(), sqe);
             }
             //卸货成功后推送消息给websocket
-            utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "卸货");
+            utilsService.pushMesToWebsocket((String) mesMap.get("capacityNumber"), "卸货");
             //根据运输订单查找需求备注
             BigDecimal orderId = DataChange.dataToBigDecimal(mesMap.get("orderId"));
             Map<String,Object>  remarkMap=tmstruckTimeTaskResultMapper.selectInwardDueTimeByOrderId(orderId);
@@ -182,17 +183,17 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             map.put("updateLoadResult", 1); //需要路段顺序号查询
             Integer checkMaterial = tmstruckUnloadResultMapper.checkMaterialIdUnload(DataChange.dataToBigDecimal(mesMap.get("totalId")), DataChange.dataToBigDecimal(map.get("materialId")));
             if(checkMaterial != null){
-                return -2;
+                return -2;  //已卸过此物资
             }
         }
         Map<String, Object> dataMap = tmstruckUnloadResultMapper.selectUnloadMesByOrderNo(map);
         if(dataMap == null){
-            map.put("updateLoadResult", 1); //二次重复装货
-            dataMap = tmstruckUnloadResultMapper.selectUnloadMesByOrderNo(map);
+            return -3;  //该订单没有卸货作业
         }
         map.putAll(dataMap);
         updateUnloadResultBy(map); //更新卸货实绩
         //路段顺序号 + 1
+        map.put("orderId", mesMap.get("orderId"));
         utilsService.updateOrderLineSequence(map);
         switch (orderType){
             case 5:
@@ -205,11 +206,11 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             case 17:
             case 18:
             case 20:
-                tmstruckReceiptResultService.addReceiptResult(map); //新增完卸车实绩后新增一条收货实绩
+                tmstruckReceiptResultService.addReceiptResult(DataChange.dataToBigDecimal(map.get("resultTotalId"))); //新增完卸车实绩后新增一条收货实绩
                 break;
         }
         //卸货成功后推送消息给websocket
-        utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "卸货");
+        utilsService.pushMesToWebsocket((String) mesMap.get("capacityNumber"), "卸货");
         return 1;
     }
 

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

@@ -136,6 +136,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             case 12:
             case 13:
             case 14:
+            case 19:
             case 100:
                 return tmstruckWeightResultMapper.getSporadicSuppliesJiMiaoResult(map); //apiId:405
 
@@ -168,14 +169,15 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             case 9:
                 return tmstruckWeightResultMapper.getImportedDomesticNzJiPiResult(map);// apiId: 104
             case 10:
+            case 20:
                 return tmstruckWeightResultMapper.getImportedDomesticNzJiPi2Result(map);// apiId: 104
             case 11:
                 break;
             case 12:
             case 13:
             case 14:
+            case 19:
             case 100:
-            case 20:
                 return tmstruckWeightResultMapper.getFactorySkinSporadicWeight(map); //apiId=401
         }
         return null;

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

@@ -1238,7 +1238,7 @@
                 AND OO.ORDER_TYPE = #{orderTypee}
             </if>
             <if test="orderTypee == 100">
-                AND OO.ORDER_TYPE in (12, 13 ,14)
+                AND OO.ORDER_TYPE in (12, 13 ,14,19)
             </if>
             <if test="oneDate != null">
                 and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TER.RESULT_ENTRY_GATE_TIME

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

@@ -1157,7 +1157,7 @@
             AND OO.ORDER_TYPE = #{orderTypee}
             </if>
             <if test="orderTypee == 100">
-            AND OO.ORDER_TYPE in (12, 13 ,14)
+            AND OO.ORDER_TYPE in (12, 13 ,14,19)
             </if>
             <if test="userId!=null">
              AND ASO.INSERT_USERNAME=#{userId}

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

@@ -1551,7 +1551,7 @@
       AND OO.ORDER_TYPE = #{orderTypee}
     </if>
     <if test="orderTypee == 100">
-      AND OO.ORDER_TYPE in (12, 13 ,14)
+      AND OO.ORDER_TYPE in (12, 13 ,14,19)
     </if>
     <if test="userId!=null">
       AND  ASO.INSERT_USERNAME=#{userId}

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

@@ -658,21 +658,12 @@
     <select id="selectUnloadMesByOrderNo" parameterType="java.util.Map" resultType="java.util.Map">
         select *
         from (
-                 select OO.ORDER_ID         "orderId",
-                        OO.ORDER_TYPE       "orderTypee",
+                 select
                         TUR.RESULT_ID       "resultId",
-                        TTR.RESULT_TOTAL_ID "resultTotalId",
-                        RC.CAPACITY_NUMBER  "capacityNumber",
-                        TUR.SEGMENT_SQE     "segmentSqe"
-
-                 from OMSTRUCK_ORDER OO
-                          left join TMSTRUCK_TOTAL_RESULT TTR
-                                    on OO.ORDER_ID = TTR.ORDER_ID
-                          left join TMSTRUCK_UNLOAD_RESULT TUR
-                                    on TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
-                          left join RMS_CAPACITY RC
-                                    on RC.CAPACITY_ID = OO.CAPACITY_ID
-                 where OO.ORDER_NUMBER = #{orderNumber}
+                        TUR.SEGMENT_SQE     "segmentSqe",
+                        TUR.RESULT_TOTAL_ID "resultTotalId"
+                 from TMSTRUCK_UNLOAD_RESULT TUR
+                 where TUR.RESULT_TOTAL_ID = #{resultTotalId}
                    <if test="updateLoadResult != null">
                        and TUR.RESULT_END_TIME is null
                    </if>
@@ -993,7 +984,7 @@
             AND OO.ORDER_TYPE = #{orderTypee}
         </if>
         <if test="orderTypee == 100">
-            AND OO.ORDER_TYPE in (12, 13 ,14)
+            AND OO.ORDER_TYPE in (12, 13 ,14,19)
         </if>
          <if test="userId != null">
              and ASO.INSERT_USERNAME=#{userId}

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

@@ -2203,7 +2203,7 @@
             AND OO.ORDER_TYPE = #{orderTypee}
         </if>
         <if test="orderTypee == 100">
-            AND OO.ORDER_TYPE in (12, 13 ,14)
+            AND OO.ORDER_TYPE in (12, 13 ,14,19)
         </if>
             <if test="userId!=null">
                 and ASO.INSERT_USERNAME=#{userId}
@@ -2402,7 +2402,7 @@
             AND OO.ORDER_TYPE = #{orderTypee}
         </if>
         <if test="orderTypee == 100">
-            AND OO.ORDER_TYPE in (12, 13 ,14)
+            AND OO.ORDER_TYPE in (12, 13 ,14,19)
         </if>
         <if test="userId!=null">
             and ASO.INSERT_USERNAME=#{userId}