修改采购内转

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

@@ -70,6 +70,9 @@ public interface TmstruckMeasureCommissionMapper extends IBaseMapper<TmstruckMea
     //零星计量委托(老厂区)
     Map<String,Object> sproadicMeasure(Map<String,Object> map);
 
+    //内转计量委托(老厂区)
+    Map<String,Object> purchaseXqCgNzMeasure(Map<String,Object> map);
+
     //内转
     Integer getReceiveIdByRequirementOrderId(Object orderId);
 

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

@@ -112,6 +112,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 9:
                 return tmstruckEnfactoryResultMapper.getImportedDomesticNzLoadResult(map); //apiId:99
             case 10:
+            case 20:
                 return tmstruckEnfactoryResultMapper.getCGNZEnFactory(map); //apiId:99
             case 11:
                 return tmstruckEnfactoryResultMapper.getInFactoryMaterialEnFactoryResult(map); //apiId:357
@@ -119,7 +120,6 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 13:
             case 15:
             case 16:
-            case 20:
                 return tmstruckEnfactoryResultMapper.getSporadicSuppliesEnFactoryResult(map);// apiId:416
         }
         return null;

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

@@ -137,13 +137,13 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             case 9:
                 return tmstruckLeaveFactoryResultMapper.getImportedDomesticNzEnFactoryResult(map); //apiId:110
             case 10:
+            case 20:
                 return tmstruckEnfactoryResultMapper.getCgNzOutFactory(map);
             case 11:
                 return tmstruckLeaveFactoryResultMapper.getInFactoryOutFactoryResult(map); //apiId:361
             case 12:
             case 13:
             case 15:
-            case 20:
             case 16:
                  return tmstruckLeaveFactoryResultMapper.getSporadicLeaveFactory(map);//apiId:421
         }
@@ -229,8 +229,8 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
 //                }
                 break;
             case 10:
+            case 20:
                 //生成新的采购内转运输订单
-
                 //判断出厂路段顺序号是否为最后一个 采购订单关闭订单
                 i += utilsService.closeOrderNormally(map);
                 //根据运输订单ID查询路段顺序号
@@ -256,12 +256,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 //关闭当前订单
                 i += utilsService.closeOrderNormally(map);
                 break;
-            case 20:
-                if(DataChange.dataToBigDecimal(map.get("orderSegmentSqe")).intValue() == 9){ //要结束订单前的出厂
-                    //生成新的零星订单
-                    omsFeign.pushMessageToDriver(map);
-                }
-                i += utilsService.closeOrderNormally(map);
+
 
         }
         utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "出厂");

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

@@ -101,13 +101,13 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
                 return tmstruckLoadResultMapper.getCGJKLoadResult(map); // apiId = 91
             case 9:
             case 10:
+            case 20:
                 return tmstruckLoadResultMapper.getImportedDomesticNzLoadResult(map); //apiId = 353
             case 11:
                 return tmstruckLoadResultMapper.getInFactoryLoadResult(map); //apiId = 359
             case 12:
             case 13:
             case 15:
-            case 20:
             case 16:
                  return tmstruckLoadResultMapper.getSporadicSuppliesLoadResult(map); //apiId = 430
         }

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

@@ -251,7 +251,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 break;
             case 12:
             case 13:
-            case 20://内转零星进厂（老厂区）
+                 //内转零星进厂（老厂区）
                 //零星计量委托(老厂区)
                 measureCommission = tmstruckMeasureCommissionMapper.sproadicMeasure(map);
                 measureCommission.put("isRelationEAS",false);
@@ -272,6 +272,16 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("isInsert", true);
                 measureCommission.put("deliveryMethod", "磅重交货");
                 measureCommission.put("packagesNum", 0);
+                break;
+            case 20://采购内转委托总厂区
+                measureCommission=tmstruckMeasureCommissionMapper.purchaseXqCgNzMeasure(map);
+                measureCommission.put("isRelationEAS",false);
+                measureCommission.put("flowTo","进厂");
+                measureCommission.put("isDel",false);
+                measureCommission.put("isInsert",true);
+                measureCommission.put("deliveryMethod", "磅重交货");
+                measureCommission.put("packagesNum", 0);
+
         }
         /*访问接口发送数据*/
         return sendMesToMeasure(measureCommission);
@@ -318,6 +328,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 9:
                 break;
             case 10:
+            case 20:
                 //新区采购内转
                 measureCommission = tmstruckMeasureCommissionMapper.purchaseXqCgNzDXMeasure(map);
                 if(measureCommission == null)
@@ -344,7 +355,6 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 13:
             case 15:
             case 16:
-            case 20:
                 measureCommission = tmstruckMeasureCommissionMapper.sporadicDXMeasure(map);
                 if(measureCommission == null)
                     return 0;

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

@@ -112,13 +112,13 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             case 9:
                 return tmstruckUnloadResultMapper.getImportedDomesticNzUnloadResult(map); //apiId:355
             case 10:
+            case 20:
                 return tmstruckUnloadResultMapper.getImportedDomesticNzUnload2Result(map); //apiId:356
             case 11:
                 return tmstruckUnloadResultMapper.getInFactoryUnloadResult(map); //apiId:360
             case 12:
             case 13:
             case 15:
-            case 20:
             case 16:
                 return  tmstruckUnloadResultMapper.getSporadicSuppliesUnloadResult(map);//apiId:389
         }

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

@@ -129,13 +129,13 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             case 9:
                 return tmstruckWeightResultMapper.getImportedDomesticNzJiMaoResult(map); // apiID:354
             case 10:
+            case 20:
                 return tmstruckWeightResultMapper.getImportedDomesticNzJiMao2Result(map); // apiID:354
             case 11:
                 return tmstruckWeightResultMapper.getInFactoryJiLiangResult(map);       //apiId: 358
             case 12:
             case 13:
             case 15:
-            case 20:
             case 16:
                 return tmstruckWeightResultMapper.getSporadicSuppliesJiMiaoResult(map); //apiId:405
 

src/main/resources/application-dev.yml

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

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

@@ -735,7 +735,7 @@
             TMSTRUCK_TOTAL_RESULT TTR
         LEFT JOIN OMSTRUCK_ORDER OO ON OO.ORDER_ID = TTR.ORDER_ID
         WHERE
-            OO.ORDER_TYPE = 10
+            OO.ORDER_TYPE in (10,20)
         order by TTR.RESULT_TOTAL_ID desc
     </select>
     <select id="getInwardReportResult" resultType="java.util.LinkedHashMap">
@@ -840,7 +840,7 @@
         on tlfr2.result_total_id = ttr.result_total_id
       left join rms_gatepost rg4
         on tlfr2.gatepost_id = rg4.gatepost_id
-     where oo.order_type = 10
+     where oo.order_type in (10,20)
        and ter1.segmen_sqe = 1
        and twr1.tare_segment_sqe = 2
        and tlr.segment_sqe = 3

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

@@ -1284,7 +1284,7 @@
         left join RMS_GATEPOST RG
         on RG.GATEPOST_ID = TER.GATEPOST_ID
         where TER.RESULT_ENTRY_GATE_TIME is not null
-        and OO.ORDER_TYPE = 10
+        and OO.ORDER_TYPE in (10,20)
         <if test="userId">
             and air.INSERT_USERNAME=#{userId}
         </if>
@@ -1380,7 +1380,7 @@
   left join RMS_GATEPOST RG
     on RG.GATEPOST_ID = TLFR.GATEPOST_ID
  where RESULT_OUT_GATE_TIME is not null
-   and OO.ORDER_TYPE = 10
+   and OO.ORDER_TYPE in (10,20)
    <if test="userId !=null">
       and AIR.INSERT_USERNAME = #{userId}
    </if>

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

@@ -1350,7 +1350,7 @@
     ON RC.CAPACITY_ID = OO.CAPACITY_ID
     LEFT JOIN RMS_WAREHOUSE RW
     ON RW.WAREHOUSE_ID = TLR.LOADING_ID
-    WHERE OO.ORDER_TYPE =10
+    WHERE OO.ORDER_TYPE in (10,20)
     AND TLR.RESULT_LOAD_START_TIME IS NOT NULL
     <if test="userId !=null">
       and AIR.INSERT_USERNAME = #{userId}

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

@@ -1100,4 +1100,46 @@
                            on ASO.SPORADIC_ORDER_ID = OO.ORDER_PLAN_ID
         where OO.ORDER_ID = #{orderId}
     </select>
+<!--  老厂区采购内转计量委托 -->
+    <select id="purchaseXqCgNzMeasure" resultType="java.util.Map" parameterType="java.math.BigDecimal">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    OO.ORDER_NUMBER "transportNum",
+                    RC.CAPACITY_NUMBER "carNum",
+                    APO.PURCHASE_ORDER_NO "purchaseOrder",
+                    RS.SUPPLIER_NAME "sendUnit",
+                    RCE.CONSIGNEE_COMPANY_NAME "ReceivUnit",
+                    RW.WAREHOUSE_NAME "unloadPlace",
+                    TWR.INSERT_UPDATE_REMARK "demo",
+                    RM.MATERIAL_ID "materialId",
+                    RM.MATERIAL_NAME "materiaName",
+                    concat( RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL ) "goodsType",
+                    RTC.TRUCK_CALCULATE_NUMBER "steelyardNum"
+                FROM
+                    OMSTRUCK_ORDER OO
+                        LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                        LEFT JOIN AMSTRUCK_INWARD_PLAN AIP ON AIP.PLAN_ID = OO.ORDER_PLAN_ID
+                        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP ON ARP.PLAN_ID = AIP.PLAN_ID
+                        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+                        LEFT JOIN AMS_PURCHASE_ORDER APO ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
+                        LEFT JOIN RMS_SUPPLIER RS ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+                        LEFT JOIN RMS_CONSIGNEE RCE ON RCE.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
+                        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
+                        LEFT JOIN TMSTRUCK_UNLOAD_RESULT TUR ON TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                        LEFT JOIN RMS_WAREHOUSE RW ON RW.WAREHOUSE_ID = AIR.REQUIREMENT_UNLOAD_UNIT_ID
+                        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM ON OOM.ORDER_ID = OO.ORDER_ID
+                        LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+                        LEFT JOIN RMS_TRUCK_CALCULATE RTC ON RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
+                WHERE
+                    OO.ORDER_ID = #{orderId}
+                ORDER BY
+                    TWR.TARE_SEGMENT_SQE DESC
+            )
+        WHERE
+            ROWNUM = 1
+    </select>
 </mapper>

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

@@ -819,7 +819,7 @@
         LEFT JOIN RMS_WAREHOUSE RW
         ON RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
         WHERE TUR.RESULT_END_TIME IS NOT NULL
-        AND OO.ORDER_TYPE = 10
+        AND OO.ORDER_TYPE in (10,20)
         <if test="userId !=null">
             AND AIR.INSERT_USERNAME = #{userId}
         </if>

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

@@ -1895,7 +1895,7 @@
         left join RMS_MATERIAL RM
         on RM.MATERIAL_ID = OOM.MATERIAL_ID
         where RESULT_TARE_WEIGHT_TIME is not null
-        and OO.ORDER_TYPE = 10
+        and OO.ORDER_TYPE in (10,20)
         <if test="userId!=null">
             AND  air.INSERT_USERNAME =#{userId}
         </if>
@@ -2003,7 +2003,7 @@
         left join rms_shipper rsr
         on rsr.shipper_id = APO.RECEIVE_UNIT_ID
         where RESULT_GROSS_WEIGHT_TIME is not null
-        and OO.ORDER_TYPE = 10
+        and OO.ORDER_TYPE in (10,20)
         <if test="userId !=null">
             AND AIR.INSERT_USERNAME = #{userId}
         </if>