Merge branch 'master' into dev

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

@@ -55,6 +55,9 @@ public interface TmstruckMeasureCommissionMapper extends IBaseMapper<TmstruckMea
     //采购计量委托
     Map<String, Object> purchaseMeasure(Map<String, Object> map);
 
+    //发送销售委托（达钢）
+    Map<String,Object> selectXsMeasuresion(Map<String,Object> map);
+
     //采购计量委托（达兴）
     Map<String, Object> purchaseDXMeasure(Map<String, Object> map);
 

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

@@ -123,11 +123,11 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         Integer shipperId = tmstruckMeasureCommissionMapper.getShipperIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
         if(shipperId == 1){
             //发送委托给达州钢铁
-//            i += sendMeasureCommissionMes(map);
+            i += sendMeasureCommissionMes(map);
         }
         if(shipperId == 2) {
             //发送委托给达兴能源
-//            i += sendDXMeasureCommissionMes(map);
+            i += sendDXMeasureCommissionMes(map);
         }
         return i;
     }
@@ -230,6 +230,17 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 1:
                 break;
             case 2:
+                measureCommission=tmstruckMeasureCommissionMapper.selectXsMeasuresion(map);
+                if(measureCommission == null){
+                    return 0;
+                }
+                measureCommission.put("isRelationEAS",false);
+                measureCommission.put("flowTo","出厂");
+                measureCommission.put("isDel", false);
+                measureCommission.put("isInsert", true);
+                measureCommission.put("IsAssembly", false);
+                measureCommission.put("deliveryMethod", "磅重交货");
+                measureCommission.put("packagesNum", 0);
                 break;
             case 3:
                 break;
@@ -324,10 +335,10 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         if(measureCommission != null)
             map.put("materialId", measureCommission.get("materialId"));
         addMeasureCommission(map); // 添加计量委托
-        System.out.println(measureCommission);
+//        System.out.println(measureCommission);
         /*访问接口发送数据*/
-        return 1;
-//        return sendMesToMeasure(measureCommission);
+//        return 1;
+        return sendMesToMeasure(measureCommission);
 
     }
 

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

@@ -194,7 +194,7 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
                 i += utilsService.closeOrderNormally(map);
             case 12:
                 //判断是否还有物资，如果还有物资就执行发送计量委托
-                materialIdIsNorWeight(map);
+//                materialIdIsNorWeight(map);
                 break;
         }
         //卸货成功后推送消息给websocket

src/main/resources/bootstrap.yml

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

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

@@ -155,6 +155,7 @@
     </select>
 
 <!--  查询销售统计报表  -->
+    <!--  查询销售统计报表  -->
     <select id="getAllSaleReport" parameterType="java.util.Map" resultType="java.util.Map">
         select
                *
@@ -180,10 +181,15 @@
                         TLR.INSERT_UPDATE_REMARK             "materialRemark",
                         ASO.SALE_NUMBER                      "saleNumber",
                         TLR.CASE_NUMBER                      "caseNumber",
+                        RC2.CARRIER_NAME                     "carrierName",
                         CONCAT(CONCAT(RM.MATERIAL_SPECIFICATION, '('), CONCAT(RM.MATERIAL_MODEL, ')')) "materialCode"
                  from OMSTRUCK_ORDER OO
                           left join AMS_SALE_ORDER_MATERIAL ASOM
                                on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+                          left join AMS_DISPATCH_SALE_ORDER ADSO
+                               on ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                          left join RMS_CARRIER RC2
+                               on RC2.CARRIER_ID = ADSO.CARRIER_ID
                           left join AMS_SALE_ORDER ASO
                                on ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
                           left join RMS_CONSIGNEE RCON
@@ -216,13 +222,9 @@
                                on OOM.ORDER_ID = OO.ORDER_ID
                           join RMS_MATERIAL RM
                                on RM.MATERIAL_ID = OOM.MATERIAL_ID
-                          <if test="carrierSsoId != null">
-                              join RMS_CARRIER RCA
-                                on RCA.CARRIER_ID = RC.CARRIER_ID
-                          </if>
                  where OO.ORDER_TYPE in (1, 2)
                           <if test="carrierSsoId != null">
-                              and RCA.CARRIER_SSO_ID = #{carrierSsoId}
+                              and RC2.CARRIER_SSO_ID = #{carrierSsoId}
                           </if>
                           <if test="oneDate != null">
                               and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TWR.RESULT_GROSS_WEIGHT_TIME
@@ -238,6 +240,11 @@
                     "orderNumber" like '%${item}%'
                 </foreach>
             </if>
+            <if test="carrierName != null">
+                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
+                    "carrierName" like '%${item}%'
+                </foreach>
+            </if>
             <if test="enGatepostName != null">
                 <foreach collection="enGatepostName" item="item" open="(" separator="or" close=")">
                     "enGatepostName" like '%${item}%'

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

@@ -1235,6 +1235,7 @@
         where rownum = 1
     </select>
 
+
     <update id="updateOmsTruckMaterial" parameterType="map">
         update OMSTRUCK_ORDER_MATERIAL OOM
             <set>
@@ -1249,4 +1250,42 @@
         where OOM.ORDER_ID = #{orderId} and OOM.MATERIAL_ID = #{materialId}
     </update>
 
+
+
+   <!--发送委托给达钢-->
+    <select id="selectXsMeasuresion" resultType="java.util.Map" parameterType="java.math.BigDecimal">
+     select OO.ORDER_NUMBER "transportNum",
+            RM.MATERIAL_ID "materialId",
+            RM.MATERIAL_NAME "materiaName",
+            concat( RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL ) "goodsType",
+            RS.SHIPPER_NAME "sendUnit",
+            RC.CONSIGNEE_COMPANY_NAME "ReceivUnit",
+            RC2.CAPACITY_NUMBER "carNum",
+            RTC.TRUCK_CALCULATE_NUMBER "steelyardNum",
+            TWR.INSERT_UPDATE_REMARK "demo"
+
+     from OMSTRUCK_ORDER oo
+     left join  OMSTRUCK_ORDER_MATERIAL OOM
+     ON OO.ORDER_ID=OOM.ORDER_ID
+     LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+     ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
+     LEFT JOIN  RMS_MATERIAL RM
+     ON RM.MATERIAL_ID=OOM.MATERIAL_ID
+     LEFT JOIN  AMS_SALE_ORDER ASO
+     ON ASO.SALE_ORDER_ID=ASOM.SALE_ORDER_ID
+     LEFT JOIN RMS_CONSIGNEE  RC
+     ON RC.CONSIGNEE_ID=ASO.RECEIVE_ID
+     LEFT JOIN  RMS_SHIPPER RS
+     ON RS.SHIPPER_ID=ASO.SHIPPER_ID
+     LEFT JOIN RMS_CAPACITY RC2
+     ON RC2.CAPACITY_ID=OO.CAPACITY_ID
+     LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+     ON TTR.ORDER_ID=oo.ORDER_ID
+     LEFT JOIN TMSTRUCK_WEIGHT_RESULT  TWR
+     ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+     LEFT JOIN RMS_TRUCK_CALCULATE RTC
+     ON RTC.TRUCK_CALCULATE_ID=TWR.RESULT_TARE_PLACE_ID
+     WHERE OO.ORDER_ID=#{orderId}
+    </select>
+
 </mapper>