修改

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

@@ -119,7 +119,7 @@ public class TmstrainLoadingResultController extends BaseRESTfulController {
             @ApiImplicitParam(name = "tmstrainLoadingResult", value = "修改车皮装车map", required = false, dataType = "TmstrainWagonLoadResult")
     })
     @PostMapping(value = "/upadteTmstrainLoadingResultByResultId")
-    public RESTfulResult upadteTmstrainLoadingResultByResultId(@RequestBody(required = false) TmstrainLoadingResult tmstrainLoadingResult) {
+    public RESTfulResult upadteTmstrainLoadingResultByResultId(@RequestBody(required = false) TmstrainLoadingResult tmstrainLoadingResult) throws Exception {
         int i = tmstrainLoadingResultService.updateTmstrainLoadingResult(tmstrainLoadingResult);
         return success(i);
     }

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

@@ -39,7 +39,7 @@ public class TmstrainMeasureCommissionController extends BaseRESTfulController {
     ColumnDataUtil columnDataUtil;
 
 
-    @ApiOperation(value = "查询已发送的计量委托并展示")
+    @ApiOperation(value = "查询待计量的计量委托并展示")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId(209)", value = "表头", required = false, dataType = "Interger")
     })
@@ -50,8 +50,12 @@ public class TmstrainMeasureCommissionController extends BaseRESTfulController {
             Integer pageNum,
             Integer pageSize,
             Integer resultType,
+            String startTime,
+            String endTime,
             String con) {
         mapValue.put("resultType",resultType);
+        mapValue.put("startTime",startTime);
+        mapValue.put("endTime",endTime);
         mapValue.put("con",con);
         //不分页筛选数据
         PageHelper.startPage(pageNum, pageSize);
@@ -61,6 +65,32 @@ public class TmstrainMeasureCommissionController extends BaseRESTfulController {
         return success(pageList);
     }
 
+    @ApiOperation(value = "查询已计量的计量委托并展示")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(209)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/getWeightResult")
+    public RESTfulResult getWeightResult(
+            @RequestBody(required = false) Map<String, Object> mapValue,
+            Integer apiId,
+            Integer pageNum,
+            Integer pageSize,
+            Integer resultType,
+            String startTime,
+            String endTime,
+            String con) {
+        mapValue.put("resultType",resultType);
+        mapValue.put("startTime",startTime);
+        mapValue.put("endTime",endTime);
+        mapValue.put("con",con);
+        //不分页筛选数据
+        PageHelper.startPage(pageNum, pageSize);
+        //分页数据
+        List<Map<String, Object>> mes = tmstrainMeasureCommissionService.getWeightResult(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, mes);
+        return success(pageList);
+    }
+
     @ApiOperation(value = "批量新增计量委托")
     @PostMapping(value = "/batchSendMeasureCommission")
     public RESTfulResult batchSendMeasureCommission(@RequestBody(required = false) Map<String, Object> map) {

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

@@ -100,7 +100,7 @@ public class TmstrainWagonUnloadResultController extends BaseRESTfulController {
             @ApiImplicitParam(name = "tmstrainWagonUnloadResult", value = "车皮卸车对象", required = false, dataType = "TmstrainWagonUnloadResult")
     })
     @PostMapping(value = "/insertTmstrainWagonUnLoadResult")
-    public RESTfulResult insertTmstrainWagonUnLoadResult(@RequestBody(required = false) TmstrainWagonUnloadResult tmstrainWagonUnloadResult, Integer orderType) {
+    public RESTfulResult insertTmstrainWagonUnLoadResult(@RequestBody(required = false) TmstrainWagonUnloadResult tmstrainWagonUnloadResult, Integer orderType) throws Exception {
         int i = tmstrainWagonUnloadResultService.insertTmstrainWagonUnLoadResult(tmstrainWagonUnloadResult);
         return success(i);
     }

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

@@ -18,6 +18,9 @@ public interface TmstrainMeasureCommissionMapper extends IBaseMapper<TmstrainMea
     //查询车皮计量委托
     Map<String, Object> getTrainMeasureCommission(Map<String, Object> map);
 
-    //查询已发送的计量委托的车皮装车实绩并且到站是新区轨道衡和老区轨道衡的车皮装车实绩（不是补录）
+    //查询未计量
     List<Map<String, Object>> getLoadResultToSendMC(Map<String, Object> map);
+
+    //查询已计量
+    List<Map<String, Object>> getWeightResult(Map<String, Object> map);
 }

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

@@ -42,7 +42,7 @@ public interface ITmstrainLoadingResultService{
     List<Map<String, Object>> getTmstrainLoadingResultByResultId(BigDecimal resultId);
 
     //修改车皮装车作业实绩
-    int updateTmstrainLoadingResult(TmstrainLoadingResult tmstrainLoadingResult);
+    int updateTmstrainLoadingResult(TmstrainLoadingResult tmstrainLoadingResult) throws Exception;
 
     //通过主键删除车皮装车作业实绩
     int deleteTmstrainLoadingResultByResultId(BigDecimal resultId);

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

@@ -24,9 +24,12 @@ public interface ITmstrainMeasureCommissionService{
     //添加火车计量委托
     int addTrainMeasureCommission(Map<String, Object> map);
 
-    //查询没有发送过计量委托的车皮装车实绩并且到站是新区轨道衡和老区轨道衡的车皮装车实绩（不是补录）
+    //查询待计量的装车数据
     List<Map<String, Object>> getLoadResultToSendMC(Map<String, Object> map);
 
+    //查询已计量的计量实绩
+    List<Map<String, Object>> getWeightResult(Map<String, Object> map);
+
     //批量发送计量委托
     int batchSendMeasureCommission(Map<String, Object> map);
 

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

@@ -27,7 +27,7 @@ public interface ITmstrainWagonUnloadResultService{
     int deleteTmstrainWagonUnLoadResultByUnLoadingId(BigDecimal unloadingId);
 
     //新增车皮卸车实绩
-    int insertTmstrainWagonUnLoadResult(TmstrainWagonUnloadResult tmstrainWagonUnloadResult);
+    int insertTmstrainWagonUnLoadResult(TmstrainWagonUnloadResult tmstrainWagonUnloadResult) throws Exception;
 
     //修改车皮装车作业实绩
     int updateTmstrainWagonUnLoadResult(TmstrainWagonUnloadResult tmstrainWagonUnloadResult);

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

@@ -350,7 +350,27 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
      * @return
      */
     @Override
-    public int updateTmstrainLoadingResult(TmstrainLoadingResult tmstrainLoadingResult) {
+    public int updateTmstrainLoadingResult(TmstrainLoadingResult tmstrainLoadingResult) throws Exception{
+        String wagonNo=tmstrainLoadingResult.getResultWagonNo();
+        if(wagonNo!=null && wagonNo.length()!=7){
+            throw new Exception("车皮号异常");
+        }
+        //通过采购订单号获得批次ID
+        BigDecimal purchaseOrderId = tmstrainLoadingResult.getPurchaseOrderRailPlanId();
+        BigDecimal batchId = tmstrainLoadingResultMapper.getBatchIdByPurOrderId(purchaseOrderId);
+        tmstrainLoadingResult.setBatchId(batchId);
+        System.out.println(tmstrainLoadingResult);
+        //新增完成，发送计量委托
+//        if(resultIdList.size()==wagonNoList.size())
+//            Map<String, Object> map = new HashMap<>();
+//            map.put("resultIdList",resultIdList);
+//            int i = tmstrainMeasureCommissionService.batchSendMeasureCommission(map);
+//            if(i==-1){
+//                return i;
+//            }
+//        }else{
+//            return -1;
+//        }
         tmstrainLoadingResult.setUpdateTime(new Date());
         return tmstrainLoadingResultMapper.updateByPrimaryKeySelective(tmstrainLoadingResult);
     }

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

@@ -91,6 +91,36 @@ public class TmstrainMeasureCommissionServiceImpl  implements ITmstrainMeasureCo
         return i;
     }
 
+    /**
+     * 修改计量委托
+     * @param map
+     * @return
+     */
+    public int updateTrainMeasureCommission(Map<String, Object> map){
+        //查询计量委托
+        Map<String, Object> measureCommission = getTrainMeasureCommission(map);
+        measureCommission.put("steelyardNum", "铁专线");
+        //车皮号
+
+//        measureCommission.put("isRelationEAS", true);
+//        measureCommission.put("flowTo", "进厂");
+//        measureCommission.put("isDel", false);
+//        measureCommission.put("isInsert", true);
+//        measureCommission.put("IsAssembly", false);
+//        measureCommission.put("deliveryMethod", "磅重交货");
+//        measureCommission.put("packagesNum", 0);
+//        map.put("materialId", measureCommission.get("materialId"));
+//        map.put("resultTotalId", measureCommission.get("resultTotalId"));
+//        measureCommission.remove("resultTotalId");
+        //发送计量委托
+        int i = sendMesToMeasure(measureCommission);
+        if(i == 1){
+            //添加计量委托实绩
+            addMeasureCommission(map);
+            updateTrainLoadResult(map);
+        }
+        return i;
+    }
 
     /**
      * 更新火车装车实绩
@@ -106,7 +136,7 @@ public class TmstrainMeasureCommissionServiceImpl  implements ITmstrainMeasureCo
 
 
     /**
-     * 查询没有发送过计量委托的车皮装车实绩并且到站是新区轨道衡和老区轨道衡的车皮装车实绩
+     * 查询待计量
      * @param map
      * @return
      */
@@ -115,6 +145,16 @@ public class TmstrainMeasureCommissionServiceImpl  implements ITmstrainMeasureCo
         return tmstrainMeasureCommissionMapper.getLoadResultToSendMC(map);
     }
 
+    /**
+     * 查询已计量
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getWeightResult(Map<String, Object> map) {
+        return tmstrainMeasureCommissionMapper.getWeightResult(map);
+    }
+
     /**
      * 添加火运计量委托
      * resultTotalId 火运总实绩ID

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

@@ -90,7 +90,7 @@ public class TmstrainWagonUnloadResultServiceImpl implements ITmstrainWagonUnloa
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    public int insertTmstrainWagonUnLoadResult(TmstrainWagonUnloadResult tmstrainWagonUnloadResult){
+    public int insertTmstrainWagonUnLoadResult(TmstrainWagonUnloadResult tmstrainWagonUnloadResult) throws Exception {
         int i = 0;
         BigDecimal resultType = tmstrainWagonUnloadResult.getResultType();
         switch (resultType.intValue()){
@@ -108,7 +108,7 @@ public class TmstrainWagonUnloadResultServiceImpl implements ITmstrainWagonUnloa
      * @param tmstrainWagonUnloadResult
      * @return
      */
-    public int addTmstrainWagonLoadResult(TmstrainWagonUnloadResult tmstrainWagonUnloadResult) {
+    public int addTmstrainWagonLoadResult(TmstrainWagonUnloadResult tmstrainWagonUnloadResult) throws Exception {
         //常规字段插入
         tmstrainWagonUnloadResult.setInsertUsername("admin");
         tmstrainWagonUnloadResult.setInsertTime(new Date());
@@ -147,7 +147,7 @@ public class TmstrainWagonUnloadResultServiceImpl implements ITmstrainWagonUnloa
      * @param map
      * @return
      */
-    public int updateLoadingResult(Map<String, Object> map){
+    public int updateLoadingResult(Map<String, Object> map) throws Exception {
         //添加一条卸货实绩 修改装车状态为已卸车 2
         TmstrainLoadingResult tmstrainLoadingResult = new TmstrainLoadingResult();
         tmstrainLoadingResult.setResultId(DataChange.dataToBigDecimal(map.get("resultId")));

src/main/resources/application-prod.yml

@@ -10,7 +10,7 @@ spring:
 openfeign:
   #正式环境
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   WmshBoundFeign:
     url: ${WMSHBOUNDFEIGN_URL:172.16.33.166:8070}
 

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

@@ -801,7 +801,8 @@
     RS.SUPPLIER_NAME "supplierName",
     t_load.INSERT_TIME "insertTime",
     TTR.TRANSPORT_NUM   "transportNum",
-    t_load.SEND_DATE "sendDate"
+    t_load.SEND_DATE "sendDate",
+    (CASE WHEN TWR.RESULT_POUND_NO IS NULL THEN 1 ELSE 0 END) "isEdit"--如果磅单号为null允许修改否则不允许
     from TMSTRAIN_LOADING_RESULT t_load
     left join TMSTRAIN_TOTAL_RESULT TTR
     on TTR.LOADING_ID = t_load.RESULT_ID
@@ -817,6 +818,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_WEIGHT_RESULT TWR
+    on TTR.TOTAL_RESULT_ID=TWR.RESULT_TOTAL_ID
     where t_load.DELETED in (0, 2) and t_load.RESULT_TYPE = #{resultType}
     <if test="con !=null">
       and (

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

@@ -375,50 +375,45 @@
     where TLR.RESULT_ID = #{resultId}
   </select>
 
-<!-- 查询发送过的计量委托的车皮装车实绩并且到站是新区轨道衡和老区轨道衡的车皮装车实绩 -->
+<!-- 查询已计量 -->
   <select id="getLoadResultToSendMC" parameterType="map" resultType="java.util.Map">
     select
            *
     from (
-          select TTR.TOTAL_RESULT_ID                            "resultTotalId",
-            TLR.RESULT_ID                                  "resultId",
-            APO.PURCHASE_ORDER_NO                          "purchaseOrderNo",
-            TLR.RESULT_WAGON_NO                            "resultWagonNo",
-            to_char(TLR.RESULT_LOADING_DATE, 'yyyy-mm-dd') "resultLoadingDate",
-            TLR.RESULT_CLASS                               "resultClass",
-            DB.RESULT_FOREIGN_SHIP_NAME                    "resultForeignShipName",
-            RM.MATERIAL_NAME                               "materialName",
-            RAS.ARRIVAL_NAME                               "sendStationName",
-            RAS2.ARRIVAL_NAME                              "arrivalStationName",
-            TLR.RESULT_BILLABLE_TONNAGE                    "resultBillableTonnage",
-            TLR.RESULT_ISCLEAR                             "resultIsclear",
-            TLR.RESULT_REMARKS                             "resultRemarks",
-            RS.SUPPLIER_NAME                               "supplierName",
-            TLR.INSERT_TIME                                "insertTime",
-            TTR.TRANSPORT_NUM                              "transportNum",
-            (CASE
-            WHEN TWUR.UNLOADING_ID IS NULL THEN
-            '未卸货'
-            ELSE
-            '已卸货'
-            END) as isUnload
-            from TMSTRAIN_LOADING_RESULT TLR
-            left join AMS_PURCHASE_ORDER APO
-            on TLR.PURCHASE_ORDER_RAIL_PLAN_ID = APO.PURCHASE_ORDER_ID
-            left join RMS_SUPPLIER RS
-            on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
-            left join DIL_BATCH DB
-            on TLR.BATCH_ID = DB.BATCH_ID
-            left join RMS_MATERIAL RM
-            on DB.MATERIAL_ID = RM.MATERIAL_ID
-            left join RMSTRAIN_ARRIVAL_SEND RAS
-            on RAS.ARRIVAL_ID = TLR.SEND_STATION_ID
-            left join RMSTRAIN_ARRIVAL_SEND RAS2
-            on RAS2.ARRIVAL_ID = TLR.ARRIVAL_STATION_ID
-            left join TMSTRAIN_TOTAL_RESULT TTR
-            on TTR.LOADING_ID = TLR.RESULT_ID
-            left join TMSTRAIN_WAGON_UNLOAD_RESULT TWUR
-            on (TLR.PURCHASE_ORDER_RAIL_PLAN_ID=TWUR.PURCHASE_ORDER_RAIL_PLAN_ID and  TLR.RESULT_WAGON_NO=TWUR.RESULT_WAGON_NO)
+        select TTR.TOTAL_RESULT_ID                            "resultTotalId",
+        TLR.RESULT_ID                                  "resultId",
+        APO.PURCHASE_ORDER_NO                          "purchaseOrderNo",
+        TLR.RESULT_WAGON_NO                            "resultWagonNo",
+        to_char(TLR.RESULT_LOADING_DATE, 'yyyy-mm-dd') "resultLoadingDate",
+        TLR.RESULT_CLASS                               "resultClass",--国产矿没有该项
+        DB.RESULT_FOREIGN_SHIP_NAME                    "resultForeignShipName",--国产矿没有该项
+        RM.MATERIAL_NAME                               "materialName",
+        RAS.ARRIVAL_NAME                               "sendStationName",
+        RAS2.ARRIVAL_NAME                              "arrivalStationName",
+        TLR.RESULT_BILLABLE_TONNAGE                    "resultBillableTonnage",
+        TLR.RESULT_ISCLEAR                             "resultIsclear",--国产矿没有该项
+        RS.SUPPLIER_NAME                               "supplierName",
+        TLR.INSERT_TIME                                "insertTime",
+        TTR.TRANSPORT_NUM                              "transportNum",
+        (CASE WHEN TWUR.UNLOADING_ID IS NULL THEN '未卸货' ELSE '已卸货' END) as isUnload,
+        TLR.RESULT_REMARKS                             "resultRemarks"
+        from TMSTRAIN_LOADING_RESULT TLR
+        left join AMS_PURCHASE_ORDER APO
+        on TLR.PURCHASE_ORDER_RAIL_PLAN_ID = APO.PURCHASE_ORDER_ID
+        left join RMS_SUPPLIER RS
+        on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+        left join DIL_BATCH DB
+        on TLR.BATCH_ID = DB.BATCH_ID
+        left join RMS_MATERIAL RM
+        on TLR.MATERIAL_ID = RM.MATERIAL_ID
+        left join RMSTRAIN_ARRIVAL_SEND RAS
+        on RAS.ARRIVAL_ID = TLR.SEND_STATION_ID
+        left join RMSTRAIN_ARRIVAL_SEND RAS2
+        on RAS2.ARRIVAL_ID = TLR.ARRIVAL_STATION_ID
+        left join TMSTRAIN_TOTAL_RESULT TTR
+        on TTR.LOADING_ID = TLR.RESULT_ID
+        left join TMSTRAIN_WAGON_UNLOAD_RESULT TWUR
+        on (TLR.PURCHASE_ORDER_RAIL_PLAN_ID=TWUR.PURCHASE_ORDER_RAIL_PLAN_ID and  TLR.RESULT_WAGON_NO=TWUR.RESULT_WAGON_NO)
            where TLR.DELETED = 0
              and TLR.RESULT_TYPE = #{resultType}
              and TLR.SEND_REQUEST = 2
@@ -435,6 +430,12 @@
                  or RS.SUPPLIER_NAME like concat('%',concat(#{con},'%'))
                )
              </if>
+             <if test="startTime!=null">
+             and TLR.RESULT_LOADING_DATE >= #{startTime}
+             </if>
+             <if test="endTime!=null">
+             and #{endTime} >= TLR.RESULT_LOADING_DATE
+             </if>
          )
     <include refid="orderBy"></include>
     <if test="orderField == null  ">
@@ -442,7 +443,12 @@
     </if>
   </select>
 
-  <sql id="orderBy">
+<!--  查询已计量-->
+  <select id="getWeightResult" parameterType="map" resultType="java.util.Map">
+
+  </select>
+
+    <sql id="orderBy">
     <if test="orderField != null and orderField != ''">
       order by  "${orderField}"
       <if test="orderType != null and orderType != ''">