修改出库

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

@@ -248,20 +248,31 @@ public class TmstrainLoadingResultController extends BaseRESTfulController {
     }
 
 
-//    //内转物流新增装车
-//    @ApiOperation(value = "进口矿港存库出库")
-//    @PostMapping(value = "/updateWarehouseResult")
-//    public RESTfulResult updateWarehouseResult(@RequestBody(required = false) Map<String, Object> map) {
-//        int result = tmstrainLoadingResultService.updateWarehouseResult(map);
-//        if (result==-1){
-//            return failed("港存库实时库存不够");
-//        } else if (result==-2) {
-//            return failed("不存在港存库实时库存");
-//        }
-//        return success();
-//    }
+    //内转物流修改出库
+    @ApiOperation(value = "进口矿港存库修改出库")
+    @PostMapping(value = "/updateWarehouseResult")
+    public RESTfulResult updateWarehouseResult(@RequestBody(required = false) Map<String, Object> map) {
+        int result = tmstrainLoadingResultService.updateWarehouseResult(map);
+        return success(result);
+    }
 
 
+    /**
+     * 通过主键查询车皮装车作业信息
+     *
+     * @param resultId
+     * @return
+     */
+    @ApiOperation(value = "进口矿港存库通过id查询车皮装车数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "车皮装车主键", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping(value = "/getWareHouseOutresult/{resultId}")
+    public RESTfulResult getWareHouseOutresult(@PathVariable("resultId") BigDecimal resultId) {
+        List<Map<String, Object>> loadingResultByResultId = tmstrainLoadingResultService.getWareHouseOutresult(resultId);
+        return success(loadingResultByResultId);
+    }
+
 
 
 

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

@@ -3,9 +3,20 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.TmstrainLoadingTemp;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import java.math.*;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface TmstrainLoadingTempMapper extends IBaseMapper<TmstrainLoadingTemp, BigDecimal> {
      BigDecimal selectMaxId();
+
+     List<Map<String, Object>> getWareHouseOutresult(BigDecimal resultId);
+
+     //根据新的采购订单查询批次
+     BigDecimal getBatchIdbyPurchaseNo(String purchaseNo);
+
+     //修改物资总吨位
+     int updateTonnage(BigDecimal outResultId,int wagonWeightNew);
 }

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 @ApiModel(value="null")
 public class TmstrainLoadingTemp implements IBasePO<BigDecimal> {
@@ -80,6 +81,18 @@ public class TmstrainLoadingTemp implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="出库单id",required=false)
     private BigDecimal outbountId;
 
+    /**
+     * 修改人(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -188,6 +201,22 @@ public class TmstrainLoadingTemp implements IBasePO<BigDecimal> {
         this.outbountId = outbountId;
     }
 
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -206,6 +235,8 @@ public class TmstrainLoadingTemp implements IBasePO<BigDecimal> {
         sb.append(", mineral=").append(mineral);
         sb.append(", purchaseOrderNo=").append(purchaseOrderNo);
         sb.append(", outbountId=").append(outbountId);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/dil/service/ITmstrainLoadingResultService.java

@@ -67,5 +67,8 @@ public interface ITmstrainLoadingResultService{
 
     int addWarehouseOutResult(Map<String, Object> map);
 
-//    int updateWarehouseResult(Map<String, Object> map);
+     //修改港口出库
+    int updateWarehouseResult(Map<String, Object> map);
+
+    List<Map<String, Object>> getWareHouseOutresult(BigDecimal resultId);
 }

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

@@ -737,4 +737,126 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
         }
         return resultId;
     }
+
+
+    //出库修改
+    @Override
+    public int updateWarehouseResult(Map<String, Object> map) {
+        String userId =(String) map.get("userId");
+        BigDecimal outResultId =DataChange.dataToBigDecimal(map.get("OutResultId"));
+        String purchaseOrderNoOld=null;
+        String wagonNoOld=null;
+        BigDecimal batchIdOld=null;
+        int TotalTonnage=0;
+        BigDecimal data=null;
+        BigDecimal tonnage=null;
+        int wagonWeightNew=0;
+        //修改出库
+        //获取主键id
+        TmstrainLoadingTemp tmstrainLoadingTemp=new TmstrainLoadingTemp();
+        BigDecimal loadingTempId = DataChange.dataToBigDecimal(map.get("loadingTempId"));
+        String purchaseOrderNoNew =(String) map.get("purchaseOrderNo");
+        Boolean isAsmmbly =(Boolean) map.get("isAssembly");
+        //通过主键id查询数据库的采购订单号
+        List<Map<String, Object>> mapList = tmstrainLoadingTempMapper.getWareHouseOutresult(loadingTempId);
+        for (Map<String,Object> map1:mapList){
+             purchaseOrderNoOld =(String) map1.get("purchaseOrderNo");
+             wagonNoOld = (String) map1.get("wagonNo");
+             batchIdOld =DataChange.dataToBigDecimal(map1.get("batchId"));
+             tonnage = DataChange.dataToBigDecimal(map1.get("resultTonnage"));
+        }
+        String wagonNoNew = (String)map.get("wagonNo");
+        //判断原来的车皮标重以及现在的车皮标重
+        //判断如果采购订单号不修改
+        if (purchaseOrderNoNew!=null&&purchaseOrderNoNew.equals(purchaseOrderNoOld)){
+            //判断车皮号是否修改
+            //如果车皮号修改且为拼装
+            //如果不是拼装就计算标重,是拼装就取标重
+            if (!isAsmmbly){
+                wagonWeightNew = calculateWagonWeight(wagonNoNew);
+            }else {
+                wagonWeightNew = DataChange.dataToBigDecimal(map.get("wagonWeightNew")).intValue();
+            }
+            if ((wagonNoNew!=null&&!wagonNoNew.equals(wagonNoOld))||isAsmmbly){
+                //获取原来的车皮标重
+                BigDecimal wagonWeightOld =DataChange.dataToBigDecimal(map.get("wagonWeight"));
+                //如果车皮标重
+                //如果新的车皮标重大于原来的车皮标重，就进行多余部分的港存库出库。
+                if (wagonWeightNew > wagonWeightOld.intValue()){
+                    TotalTonnage=wagonWeightNew-wagonWeightOld.intValue();
+                    map.put("resultTonnage",TotalTonnage);
+                    map.put("batchId",batchIdOld);
+                    Map<String, Object> stringObjectMap = wmshBoundFeign.addResult(map);
+                    BigDecimal code = DataChange.dataToBigDecimal(stringObjectMap.get("code"));
+                    if (code.equals(200)){
+                         data =DataChange.dataToBigDecimal(stringObjectMap.get("data"));
+                    }
+                    tmstrainLoadingTempMapper.updateTonnage(outResultId,tonnage.intValue()+TotalTonnage);
+
+                }else {
+                    //如果新的车皮标重小于原来的车皮标重，就进行多余部分的港存库入库。
+                    TotalTonnage=wagonWeightOld.intValue()-wagonWeightNew;
+                    map.put("resultMaterialNumber",TotalTonnage);
+                    map.put("batchId",batchIdOld);
+                    wmshBoundFeign.addWarehousingResult(map);
+                    tmstrainLoadingTempMapper.updateTonnage(outResultId,tonnage.intValue()-TotalTonnage);
+                }
+            }
+        }else {
+            //如果不是拼装就计算标重,是拼装就取标重
+            if (!isAsmmbly){
+                wagonWeightNew = calculateWagonWeight(wagonNoNew);
+            }else {
+                wagonWeightNew = DataChange.dataToBigDecimal(map.get("wagonWeightNew")).intValue();
+
+            }
+            //如果车皮号修改且为拼装
+            if ((wagonNoNew!=null&&!wagonNoNew.equals(wagonNoOld))||isAsmmbly){
+                //获取原来的车皮标重
+                BigDecimal wagonWeightOld =DataChange.dataToBigDecimal(map.get("wagonWeight"));
+                //根据新的采购订单No查找批次
+                BigDecimal batchIdNew = tmstrainLoadingTempMapper.getBatchIdbyPurchaseNo(purchaseOrderNoNew);
+                //如果新的车皮标重大于原来的车皮标重，就进行多余部分的港存库出库。
+                if (wagonWeightNew > wagonWeightOld.intValue()){
+                    TotalTonnage=wagonWeightNew-wagonWeightOld.intValue();
+                    map.put("resultTonnage",TotalTonnage);
+                    map.put("batchId",batchIdNew);
+                    Map<String, Object> stringObjectMap = wmshBoundFeign.addResult(map);
+                    BigDecimal code = DataChange.dataToBigDecimal(stringObjectMap.get("code"));
+                    if (code.equals(200)){
+                        data =DataChange.dataToBigDecimal(stringObjectMap.get("data"));
+                    }
+                    tmstrainLoadingTempMapper.updateTonnage(outResultId,tonnage.intValue()+TotalTonnage);
+
+                }else {
+                    //如果新的车皮标重小于原来的车皮标重，就进行多余部分的港存库入库。
+                    TotalTonnage=wagonWeightOld.intValue()-wagonWeightNew;
+                    map.put("resultMaterialNumber",TotalTonnage);
+                    map.put("batchId",batchIdNew);
+                    wmshBoundFeign.addWarehousingResult(map);
+                    tmstrainLoadingTempMapper.updateTonnage(outResultId,tonnage.intValue()-TotalTonnage);
+                }
+            }
+        }
+        tmstrainLoadingTemp.setResultId(loadingTempId);
+        tmstrainLoadingTemp.setResultWagonNo(wagonNoNew);
+        if (data!=null){
+            tmstrainLoadingTemp.setOutbountId(data);
+        }
+        if (purchaseOrderNoNew!=null){
+            tmstrainLoadingTemp.setPurchaseOrderNo(purchaseOrderNoNew);
+        }
+        tmstrainLoadingTemp.setResultBillableTonnage(new  BigDecimal(wagonWeightNew));
+        tmstrainLoadingTemp.setUpdateUsername(userId);
+        tmstrainLoadingTemp.setUpdateTime(new Date());
+        int i = tmstrainLoadingTempMapper.updateByPrimaryKeySelective(tmstrainLoadingTemp);
+//        //修改物资总吨位
+//        i += tmstrainLoadingTempMapper.updateTonnage(outResultId, wagonWeightNew);
+        return i;
+    }
+
+    @Override
+    public List<Map<String, Object>> getWareHouseOutresult(BigDecimal resultId) {
+        return tmstrainLoadingTempMapper.getWareHouseOutresult(resultId);
+    }
 }

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

@@ -14,16 +14,18 @@
     <result column="MINERAL" jdbcType="VARCHAR" property="mineral" />
     <result column="PURCHASE_ORDER_NO" jdbcType="VARCHAR" property="purchaseOrderNo" />
     <result column="OUTBOUNT_ID" jdbcType="DECIMAL" property="outbountId" />
+    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="columns">
     RESULT_ID, RESULT_WAGON_NO, RESULT_BILLABLE_TONNAGE, MATERIAL_NAME, SEND_STATION,
     ARRIVAL_STATION, SUPPLIER_NAME, SEND_DATE, MAKE_DATE, MINERAL, PURCHASE_ORDER_NO,
-    OUTBOUNT_ID
+    OUTBOUNT_ID, UPDATE_USERNAME, UPDATE_TIME
   </sql>
   <sql id="columns_alias">
     t.RESULT_ID, t.RESULT_WAGON_NO, t.RESULT_BILLABLE_TONNAGE, t.MATERIAL_NAME, t.SEND_STATION,
     t.ARRIVAL_STATION, t.SUPPLIER_NAME, t.SEND_DATE, t.MAKE_DATE, t.MINERAL, t.PURCHASE_ORDER_NO,
-    t.OUTBOUNT_ID
+    t.OUTBOUNT_ID, t.UPDATE_USERNAME, t.UPDATE_TIME
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM TMSTRAIN_LOADING_TEMP
@@ -69,6 +71,12 @@
       <if test="outbountId != null">
         and OUTBOUNT_ID = #{outbountId}
       </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -109,6 +117,12 @@
       <if test="outbountId != null">
         and OUTBOUNT_ID = #{outbountId}
       </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
@@ -151,18 +165,24 @@
     <if test="outbountId != null">
       or OUTBOUNT_ID = #{outbountId}
     </if>
+    <if test="updateUsername != null and updateUsername != ''">
+      or UPDATE_USERNAME = #{updateUsername}
+    </if>
+    <if test="updateTime != null">
+      or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.TmstrainLoadingTemp">
     insert into TMSTRAIN_LOADING_TEMP (RESULT_ID, RESULT_WAGON_NO, RESULT_BILLABLE_TONNAGE,
                                        MATERIAL_NAME, SEND_STATION, ARRIVAL_STATION,
                                        SUPPLIER_NAME, SEND_DATE, MAKE_DATE,
-                                       MINERAL, PURCHASE_ORDER_NO, OUTBOUNT_ID
-    )
+                                       MINERAL, PURCHASE_ORDER_NO, OUTBOUNT_ID,
+                                       UPDATE_USERNAME, UPDATE_TIME)
     values (#{resultId,jdbcType=DECIMAL}, #{resultWagonNo,jdbcType=VARCHAR}, #{resultBillableTonnage,jdbcType=DECIMAL},
             #{materialName,jdbcType=VARCHAR}, #{sendStation,jdbcType=VARCHAR}, #{arrivalStation,jdbcType=VARCHAR},
             #{supplierName,jdbcType=VARCHAR}, #{sendDate,jdbcType=VARCHAR}, #{makeDate,jdbcType=VARCHAR},
-            #{mineral,jdbcType=VARCHAR}, #{purchaseOrderNo,jdbcType=VARCHAR}, #{outbountId,jdbcType=DECIMAL}
-           )
+            #{mineral,jdbcType=VARCHAR}, #{purchaseOrderNo,jdbcType=VARCHAR}, #{outbountId,jdbcType=DECIMAL},
+            #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmstrainLoadingTemp">
     insert into TMSTRAIN_LOADING_TEMP
@@ -203,6 +223,12 @@
       <if test="outbountId != null">
         OUTBOUNT_ID,
       </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="resultId != null">
@@ -241,6 +267,12 @@
       <if test="outbountId != null">
         #{outbountId,jdbcType=DECIMAL},
       </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmstrainLoadingTemp">
@@ -255,7 +287,9 @@
         MAKE_DATE = #{makeDate,jdbcType=VARCHAR},
         MINERAL = #{mineral,jdbcType=VARCHAR},
         PURCHASE_ORDER_NO = #{purchaseOrderNo,jdbcType=VARCHAR},
-        OUTBOUNT_ID = #{outbountId,jdbcType=DECIMAL}
+        OUTBOUNT_ID = #{outbountId,jdbcType=DECIMAL},
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP}
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmstrainLoadingTemp">
@@ -294,6 +328,12 @@
       <if test="outbountId != null">
         OUTBOUNT_ID = #{outbountId,jdbcType=DECIMAL},
       </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </update>
@@ -315,16 +355,16 @@
     RESULT_WAGON_NO, RESULT_BILLABLE_TONNAGE,
     MATERIAL_NAME, SEND_STATION, ARRIVAL_STATION,
     SUPPLIER_NAME, SEND_DATE, MAKE_DATE,
-    MINERAL, PURCHASE_ORDER_NO, OUTBOUNT_ID
-    )
+    MINERAL, PURCHASE_ORDER_NO, OUTBOUNT_ID,
+    UPDATE_USERNAME, UPDATE_TIME)
     ( <foreach collection="list" item="item" separator="union all">
     select
     #{item.resultId,jdbcType=DECIMAL},
     #{item.resultWagonNo,jdbcType=VARCHAR}, #{item.resultBillableTonnage,jdbcType=DECIMAL},
     #{item.materialName,jdbcType=VARCHAR}, #{item.sendStation,jdbcType=VARCHAR}, #{item.arrivalStation,jdbcType=VARCHAR},
     #{item.supplierName,jdbcType=VARCHAR}, #{item.sendDate,jdbcType=VARCHAR}, #{item.makeDate,jdbcType=VARCHAR},
-    #{item.mineral,jdbcType=VARCHAR}, #{item.purchaseOrderNo,jdbcType=VARCHAR}, #{item.outbountId,jdbcType=DECIMAL}
-    from dual
+    #{item.mineral,jdbcType=VARCHAR}, #{item.purchaseOrderNo,jdbcType=VARCHAR}, #{item.outbountId,jdbcType=DECIMAL},
+    #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP} from dual
   </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -378,11 +418,20 @@
     <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.outbountId,jdbcType=DECIMAL}
     </foreach>
+    ,UPDATE_USERNAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,UPDATE_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+    </foreach>
     where RESULT_ID in
     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
       #{item.resultId,jdbcType=DECIMAL}
     </foreach>
   </update>
+
   <delete id="batchDelete" parameterType="java.util.List">
     delete from TMSTRAIN_LOADING_TEMP
     where RESULT_ID in
@@ -392,9 +441,40 @@
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   <!--  获取主键id-->
   <select id="selectMaxId" resultType="java.math.BigDecimal">
     select seq_tmstrain_loading_temp.nextval from dual
   </select>
 
+  <update id="updateTonnage" parameterType="java.util.Map">
+  update WMSH_OUTBOUND_RESULT WOR
+  set WOR.RESULT_TONNAGE =#{wagonWeightNew}
+  WHERE WOR.RESULT_ID = #{outResultId}
+  </update>
+
+  <!--  获取装车作业-->
+  <select id="getWareHouseOutresult" resultType="java.util.Map" parameterType="java.math.BigDecimal">
+    select TLT.RESULT_ID "resultId",
+           TLT.RESULT_WAGON_NO "wagonNo",
+           TLT.PURCHASE_ORDER_NO "purchaseOrderNo",
+           TLT.RESULT_BILLABLE_TONNAGE "tonnage",
+           WOR.HARBOR_ID "portId",
+           WOR.BATCH_ID "batchId",
+           WOR.RESULT_ID "OutResultId",
+           WOR.RESULT_TONNAGE "resultTonnage"
+    FROM TMSTRAIN_LOADING_TEMP TLT
+           left join WMSH_OUTBOUND_RESULT WOR
+                     ON WOR.RESULT_ID = TLT.OUTBOUNT_ID
+    WHERE  TLT.RESULT_ID=#{resultId}
+  </select>
+
+
+  <select id="getBatchIdbyPurchaseNo" resultType="java.math.BigDecimal" parameterType="java.lang.String">
+    select apo.BATCH_ID "batchId"
+    from AMS_PURCHASE_ORDER APO
+    WHERE  APO.PURCHASE_ORDER_NO =#{purchaseNo}
+  </select>
+
 </mapper>