修改火运建议

pom.xml

@@ -111,7 +111,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                         <table>TMSTRAIN_WEIGHT_RESULT</table>
+                         <table>TMSTRAIN_LOADING_RESULT</table>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -18,7 +18,7 @@ public interface TmstrainWagonUnloadResultMapper extends IBaseMapper<TmstrainWag
     @Select("select seq_tmstrian_wagon_unload.nextval from dual")
     BigDecimal selectMaxId();
     //获得采购订单id
-    BigDecimal getPurchaseOrderId(String resultWagonNo);
+    BigDecimal getUnloadId(Map<String, Object> map);
     //查询火运实绩
     List<Map<String, Object>> getTmstrainResult(Map<String,Object>map);
     //获得卸车地点名称

src/main/java/com/steerinfo/dil/model/TmstrainLoadingResult.java

@@ -155,6 +155,16 @@ public class TmstrainLoadingResult implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="卸货点ID",required=false)
     private BigDecimal unloadingPointId;
 
+    /**
+     * 发货单位ID(SEND_UNIT_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="发货单位ID",required=false)
+    private BigDecimal sendUnitId;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "车皮号列表")
+    private List<String> wagonNoList;
+
     public List<String> getWagonNoList() {
         return wagonNoList;
     }
@@ -163,9 +173,6 @@ public class TmstrainLoadingResult implements IBasePO<BigDecimal> {
         this.wagonNoList = wagonNoList;
     }
 
-    @TableField(exist = false)
-    private List<String> wagonNoList;
-
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -370,6 +377,14 @@ public class TmstrainLoadingResult implements IBasePO<BigDecimal> {
         this.unloadingPointId = unloadingPointId;
     }
 
+    public BigDecimal getSendUnitId() {
+        return sendUnitId;
+    }
+
+    public void setSendUnitId(BigDecimal sendUnitId) {
+        this.sendUnitId = sendUnitId;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -400,6 +415,7 @@ public class TmstrainLoadingResult implements IBasePO<BigDecimal> {
         sb.append(", resultType=").append(resultType);
         sb.append(", trainCalculateId=").append(trainCalculateId);
         sb.append(", unloadingPointId=").append(unloadingPointId);
+        sb.append(", sendUnitId=").append(sendUnitId);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -174,7 +174,6 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
             tmstrainLoadingResult.setBatchId(batchId);
         }
         tmstrainLoadingResult.setPurchaseOrderRailPlanId(purchaseOrderId); //采购订单Id
-        tmstrainLoadingResult.setUnloadingPointId(DataChange.dataToBigDecimal(map.get("unloadPointId"))); //卸货点ID
         Object insertUpdateRemark = map.get("insertUpdateRemark");
         if(insertUpdateRemark != null) {
             String remark = (String) insertUpdateRemark;

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

@@ -118,10 +118,11 @@ public class TmstrainWagonUnloadResultServiceImpl implements ITmstrainWagonUnloa
         for (Map<String, Object> map : wagonNoMapList) {
             String resultWagonNo = (String) map.get("resultWagonNo");
             //通过装车车皮号得到并插入采购订单id
-            BigDecimal purchaseOrderId = tmstrainWagonUnloadResultMapper.getPurchaseOrderId(resultWagonNo);
-            tmstrainWagonUnloadResult.setPurchaseOrderRailPlanId(purchaseOrderId);
+            tmstrainWagonUnloadResult.setPurchaseOrderRailPlanId(DataChange.dataToBigDecimal(map.get("purchaseOrderId")));
             //生成主键id
             tmstrainWagonUnloadResult.setUnloadingId(tmstrainWagonUnloadResultMapper.selectMaxId());
+            //查询装车实绩中的卸货点
+            tmstrainWagonUnloadResult.setUnloadingPointId(DataChange.dataToBigDecimal(map.get("unloadingPointId")));
             tmstrainWagonUnloadResult.setResultWagonNo(resultWagonNo);
             count += tmstrainWagonUnloadResultMapper.insertSelective(tmstrainWagonUnloadResult);
             count += updateLoadingResult(map); //修改装车实绩为已卸货

src/main/resources/bootstrap.yml

@@ -24,9 +24,9 @@ eureka:
 #feign设置
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   WmshBoundFeign:
-    url: ${WMSHBOUNDFEIGN_URL:172.16.33.161:8070}
+    url: ${WMSHBOUNDFEIGN_URL:172.16.33.166:8070}
 
 genxml:
   pth: com/a

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

@@ -26,20 +26,22 @@
     <result column="RESULT_TYPE" jdbcType="DECIMAL" property="resultType" />
     <result column="TRAIN_CALCULATE_ID" jdbcType="DECIMAL" property="trainCalculateId" />
     <result column="UNLOADING_POINT_ID" jdbcType="DECIMAL" property="unloadingPointId" />
+    <result column="SEND_UNIT_ID" jdbcType="DECIMAL" property="sendUnitId" />
   </resultMap>
   <sql id="columns">
     RESULT_ID, PURCHASE_ORDER_RAIL_PLAN_ID, RESULT_WAGON_NO, RESULT_BILLABLE_TONNAGE, 
     RESULT_ISCLEAR, CAPACITY_ID, MATERIAL_ID, RESULT_MATERIAL_NUMBER, RESULT_MATERIAL_THEORYWEIGHT, 
     BATCH_ID, RESULT_CLASS, RESULT_LOADING_DATE, RESULT_REMARKS, INSERT_USERNAME, INSERT_TIME, 
     UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, SEND_STATION_ID, ARRIVAL_STATION_ID, 
-    RESULT_TYPE, TRAIN_CALCULATE_ID, UNLOADING_POINT_ID
+    RESULT_TYPE, TRAIN_CALCULATE_ID, UNLOADING_POINT_ID, SEND_UNIT_ID
   </sql>
   <sql id="columns_alias">
     t.RESULT_ID, t.PURCHASE_ORDER_RAIL_PLAN_ID, t.RESULT_WAGON_NO, t.RESULT_BILLABLE_TONNAGE, 
     t.RESULT_ISCLEAR, t.CAPACITY_ID, t.MATERIAL_ID, t.RESULT_MATERIAL_NUMBER, t.RESULT_MATERIAL_THEORYWEIGHT, 
     t.BATCH_ID, t.RESULT_CLASS, t.RESULT_LOADING_DATE, t.RESULT_REMARKS, t.INSERT_USERNAME, 
     t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, 
-    t.SEND_STATION_ID, t.ARRIVAL_STATION_ID, t.RESULT_TYPE, t.TRAIN_CALCULATE_ID, t.UNLOADING_POINT_ID
+    t.SEND_STATION_ID, t.ARRIVAL_STATION_ID, t.RESULT_TYPE, t.TRAIN_CALCULATE_ID, t.UNLOADING_POINT_ID, 
+    t.SEND_UNIT_ID
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM TMSTRAIN_LOADING_RESULT
@@ -121,6 +123,9 @@
       <if test="unloadingPointId != null">
         and UNLOADING_POINT_ID = #{unloadingPointId}
       </if>
+      <if test="sendUnitId != null">
+        and SEND_UNIT_ID = #{sendUnitId}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -197,6 +202,9 @@
       <if test="unloadingPointId != null">
         and UNLOADING_POINT_ID = #{unloadingPointId}
       </if>
+      <if test="sendUnitId != null">
+        and SEND_UNIT_ID = #{sendUnitId}
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
@@ -275,6 +283,9 @@
     <if test="unloadingPointId != null">
       or UNLOADING_POINT_ID = #{unloadingPointId}
     </if>
+    <if test="sendUnitId != null">
+      or SEND_UNIT_ID = #{sendUnitId}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.TmstrainLoadingResult">
     insert into TMSTRAIN_LOADING_RESULT (RESULT_ID, PURCHASE_ORDER_RAIL_PLAN_ID,
@@ -285,7 +296,7 @@
                                          INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
                                          INSERT_UPDATE_REMARK, DELETED, SEND_STATION_ID,
                                          ARRIVAL_STATION_ID, RESULT_TYPE, TRAIN_CALCULATE_ID,
-                                         UNLOADING_POINT_ID)
+                                         UNLOADING_POINT_ID, SEND_UNIT_ID)
     values (#{resultId,jdbcType=DECIMAL}, #{purchaseOrderRailPlanId,jdbcType=DECIMAL},
             #{resultWagonNo,jdbcType=VARCHAR}, #{resultBillableTonnage,jdbcType=DECIMAL}, #{resultIsclear,jdbcType=VARCHAR},
             #{capacityId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL}, #{resultMaterialNumber,jdbcType=DECIMAL},
@@ -294,7 +305,7 @@
             #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
             #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{sendStationId,jdbcType=DECIMAL},
             #{arrivalStationId,jdbcType=DECIMAL}, #{resultType,jdbcType=DECIMAL}, #{trainCalculateId,jdbcType=DECIMAL},
-            #{unloadingPointId,jdbcType=DECIMAL})
+            #{unloadingPointId,jdbcType=DECIMAL}, #{sendUnitId,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmstrainLoadingResult">
     insert into TMSTRAIN_LOADING_RESULT
@@ -371,6 +382,9 @@
       <if test="unloadingPointId != null">
         UNLOADING_POINT_ID,
       </if>
+      <if test="sendUnitId != null">
+        SEND_UNIT_ID,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="resultId != null">
@@ -445,6 +459,9 @@
       <if test="unloadingPointId != null">
         #{unloadingPointId,jdbcType=DECIMAL},
       </if>
+      <if test="sendUnitId != null">
+        #{sendUnitId,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmstrainLoadingResult">
@@ -471,7 +488,8 @@
         ARRIVAL_STATION_ID = #{arrivalStationId,jdbcType=DECIMAL},
         RESULT_TYPE = #{resultType,jdbcType=DECIMAL},
         TRAIN_CALCULATE_ID = #{trainCalculateId,jdbcType=DECIMAL},
-        UNLOADING_POINT_ID = #{unloadingPointId,jdbcType=DECIMAL}
+        UNLOADING_POINT_ID = #{unloadingPointId,jdbcType=DECIMAL},
+        SEND_UNIT_ID = #{sendUnitId,jdbcType=DECIMAL}
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmstrainLoadingResult">
@@ -546,6 +564,9 @@
       <if test="unloadingPointId != null">
         UNLOADING_POINT_ID = #{unloadingPointId,jdbcType=DECIMAL},
       </if>
+      <if test="sendUnitId != null">
+        SEND_UNIT_ID = #{sendUnitId,jdbcType=DECIMAL},
+      </if>
     </set>
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </update>
@@ -574,7 +595,7 @@
     UPDATE_TIME, INSERT_UPDATE_REMARK,
     DELETED, SEND_STATION_ID, ARRIVAL_STATION_ID,
     RESULT_TYPE, TRAIN_CALCULATE_ID,
-    UNLOADING_POINT_ID)
+    UNLOADING_POINT_ID, SEND_UNIT_ID)
     ( <foreach collection="list" item="item" separator="union all">
     select
     #{item.resultId,jdbcType=DECIMAL},
@@ -588,7 +609,7 @@
     #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
     #{item.deleted,jdbcType=DECIMAL}, #{item.sendStationId,jdbcType=DECIMAL}, #{item.arrivalStationId,jdbcType=DECIMAL},
     #{item.resultType,jdbcType=DECIMAL}, #{item.trainCalculateId,jdbcType=DECIMAL},
-    #{item.unloadingPointId,jdbcType=DECIMAL} from dual
+    #{item.unloadingPointId,jdbcType=DECIMAL}, #{item.sendUnitId,jdbcType=DECIMAL} from dual
   </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -690,6 +711,10 @@
     <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.unloadingPointId,jdbcType=DECIMAL}
     </foreach>
+    ,SEND_UNIT_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.sendUnitId,jdbcType=DECIMAL}
+    </foreach>
     where RESULT_ID in
     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
       #{item.resultId,jdbcType=DECIMAL}
@@ -725,11 +750,11 @@
     left join AMS_PURCHASE_ORDER a_order
     on t_load.PURCHASE_ORDER_RAIL_PLAN_ID=a_order.PURCHASE_ORDER_ID
     left join RMS_SUPPLIER RS
-        on RS.SUPPLIER_ID = a_order.SUPPLIER_UNIT_ID
+        on RS.SUPPLIER_ID = t_load.SEND_UNIT_ID
     left join DIL_BATCH d_batch
         on t_load.BATCH_ID=d_batch.BATCH_ID
     left join RMS_MATERIAL r_material
-    on d_batch.MATERIAL_ID=r_material.MATERIAL_ID
+    on t_load.MATERIAL_ID = r_material.MATERIAL_ID
     left join RMSTRAIN_ARRIVAL_SEND r_s_arrival
     on r_s_arrival.ARRIVAL_ID=t_load.SEND_STATION_ID
     left join RMSTRAIN_ARRIVAL_SEND r_a_arrival
@@ -873,9 +898,12 @@
     from (
            select TLR.RESULT_WAGON_NO     "resultWagonNo",
                   TLR.RESULT_ID           "resultId",
-                  TLR.RESULT_LOADING_DATE "resultLoadingDate",
+                  TLR.UNLOADING_POINT_ID    "unloadingPointId",
+                  RW.WAREHOUSE_NAME         "warehouseName",
+                  to_char(TLR.RESULT_LOADING_DATE ,'yyyy-mm-dd') "resultLoadingDate",
                   APO.PURCHASE_ORDER_NO   "purchaseOrderNo",
-                  RM.MATERIAL_NAME        "materialName"
+                  RM.MATERIAL_NAME        "materialName",
+                  APO.PURCHASE_ORDER_ID     "purchaseOrderId"
            from TMSTRAIN_LOADING_RESULT TLR
                   left join AMS_PURCHASE_ORDER APO
                             on APO.PURCHASE_ORDER_ID = TLR.PURCHASE_ORDER_RAIL_PLAN_ID
@@ -883,8 +911,11 @@
                             on DB.BATCH_ID = APO.BATCH_ID
                   left join RMS_MATERIAL RM
                             on DB.MATERIAL_ID = RM.MATERIAL_ID
+                  left join RMS_WAREHOUSE   RW
+                            on RW.WAREHOUSE_ID = TLR.UNLOADING_POINT_ID
            where TLR.DELETED not in (2, 1)
              and TLR.RESULT_TYPE = #{resultType}
+             and TLR.PURCHASE_ORDER_RAIL_PLAN_ID is not null
          )
     <where>
       <if test="resultWagonNo != null">
@@ -1184,11 +1215,11 @@
     left join AMS_PURCHASE_ORDER a_order
     on t_load.PURCHASE_ORDER_RAIL_PLAN_ID=a_order.PURCHASE_ORDER_ID
     left join RMS_SUPPLIER RS
-    on RS.SUPPLIER_ID = a_order.SUPPLIER_UNIT_ID
+    on RS.SUPPLIER_ID = t_load.SEND_UNIT_ID
     left join DIL_BATCH d_batch
     on t_load.BATCH_ID=d_batch.BATCH_ID
     left join RMS_MATERIAL r_material
-    on d_batch.MATERIAL_ID=r_material.MATERIAL_ID
+    on t_load.MATERIAL_ID = r_material.MATERIAL_ID
     left join RMSTRAIN_ARRIVAL_SEND r_s_arrival
     on r_s_arrival.ARRIVAL_ID=t_load.SEND_STATION_ID
     left join RMSTRAIN_ARRIVAL_SEND r_a_arrival

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

@@ -506,15 +506,15 @@
     select t_unload.UNLOADING_ID "unloadingId",
     a_order.PURCHASE_ORDER_NO "purchaseOrderNo",
     t_unload.RESULT_WAGON_NO "resultWagonNo",
-    t_load.RESULT_LOADING_DATE "resultLoadingDate",
-    t_unload.RESULT_ARRIVAL_DATE "resultArrivalDate",
-    t_unload.RESULT_UNLOAD_TIME "resultUnloadTime",
+    to_char(t_load.RESULT_LOADING_DATE, 'yyyy-mm-dd') "resultLoadingDate",
+    to_char(t_unload.RESULT_ARRIVAL_DATE, 'yyyy-mm-dd') "resultArrivalDate",
+    to_char(t_unload.RESULT_UNLOAD_TIME, 'yyyy-mm-dd') "resultUnloadTime",
     t_load.RESULT_CLASS "resultClass",
     d_batch.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
     r_material.MATERIAL_NAME "materialName",
     r_s_arrival.ARRIVAL_NAME "sendStationName",
     r_a_arrival.ARRIVAL_NAME "arrivalStationName",
-    t_unload_point.UNLOAD_POINT_NAME "unloadPointName",
+    RW.WAREHOUSE_NAME "unloadPointName",
     t_unload.RESULT_BIG_TICKET_WEIGHT "resultBigTicketWeight",
     t_unload.RESULT_RAIL_HORIZONTAL_WEIGHT "resultRailHorizontalWeight",
     t_unload.RESULT_REMARK "resultRemark"
@@ -531,8 +531,8 @@
     on r_s_arrival.ARRIVAL_ID=t_load.SEND_STATION_ID
     left join RMSTRAIN_ARRIVAL_SEND r_a_arrival
     on r_a_arrival.ARRIVAL_ID=t_load.ARRIVAL_STATION_ID
-    left join TMSTRAIN_UNLOAD_POINT t_unload_point
-    on t_unload_point.UNLOAD_POINT_ID=t_unload.UNLOADING_POINT_ID
+    left join RMS_WAREHOUSE RW
+    on RW.WAREHOUSE_ID = t_unload.UNLOADING_POINT_ID
     where  t_unload.DELETED = 0 and t_load.DELETED = 2 and t_unload.RESULT_TYPE = #{resultType}
     )
     <where>
@@ -636,12 +636,6 @@
     </if>
   </sql>
 
-<!-- 获取采购订单号 -->
-  <select id="getPurchaseOrderId" parameterType="String" resultType="java.math.BigDecimal">
-    select PURCHASE_ORDER_RAIL_PLAN_ID
-    from TMSTRAIN_LOADING_RESULT
-    where RESULT_WAGON_NO = #{resultWagonNo} and DELETED = 1
-  </select>
 
   <select id="getTmstrainResult" resultType="java.util.LinkedHashMap">
     select * from(
@@ -1012,4 +1006,13 @@
                      on rw.warehouse_id = twur.unloading_id
     where twur.RESULT_TYPE = 1 and twur.UNLOADING_POINT_ID = 13
   </select>
+
+<!--查询装车实绩中的卸货点  -->
+  <select id="getUnloadId" parameterType="java.util.Map" resultType="java.math.BigDecimal">
+    select TLR.UNLOADING_POINT_ID
+    from TMSTRAIN_LOADING_RESULT TLR
+    where TLR.RESULT_ID = #{resultId}
+  </select>
+
+
 </mapper>