修改销售发送委托

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

@@ -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;

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>