Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

src/main/java/com/steerinfo/dil/aspect/LogAspect.java

@@ -67,7 +67,11 @@ public class LogAspect {
         }
         if(map==null || map.get("userId")==null ||map.get("userName") ==null){
             log.error("缺乏日志必要参数"+map);
-            return new RESTfulResult("500","缺乏日志必要参数"+map,"缺乏日志必要参数"+map);
+//            Map<String,Object> resultMap = new HashMap<>();
+//            resultMap.put("code","500");
+//            resultMap.put("message","缺乏日志必要参数");
+//            resultMap.put("data","缺乏日志必要参数"+map);
+//            return resultMap;
         }
         //获取切点处的注解及其参数
         LogAround logAround = method.getAnnotation(LogAround.class);

src/main/java/com/steerinfo/dil/config/RequestFilter.java

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.config;
 
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.steerinfo.dil.aspect.LogAspect;
 import lombok.extern.slf4j.Slf4j;
@@ -93,14 +94,17 @@ public class RequestFilter implements Filter {
                params.put("dilCompanyList",dilCompanyListObject);
                params.put("rootCompanyMap",rootCompanyMapObject);
                params.put("accessToken",accessToken);
+               log.info("params:"+params.toJSONString());
                //将新的RequestBody写入新的请求对象保存
                ServletRequest requestWrapper = new RequestWrapper(httpRequest, params.toJSONString());
                chain.doFilter(requestWrapper, response);
            } else {
-
+               log.info("无请求体，使用原生请求处理!");
                chain.doFilter(request, response);
            }
        } catch (Exception e) {
+           log.info("过滤失败，使用原生请求处理！");
+           log.info(e.getMessage());
            e.printStackTrace();
            chain.doFilter(request, response);
        }

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.controller;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.steerinfo.dil.annotaion.LogAround;
 import com.steerinfo.dil.feign.AmsFeign;
+import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -28,7 +29,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("${api.version}/ams")
-public class AMScontroller {
+public class AMScontroller  extends BaseRESTfulController {
     @Autowired
     AmsFeign amsFeign;
 
@@ -735,13 +736,13 @@ public class AMScontroller {
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
-    @PostMapping(value = "/getamsproductionordersyncs")
-    RESTfulResult getamsproductionordersyncs(@RequestBody(required = false) Map<String, Object> map,
+    @PostMapping(value = "/getProductOrderList")
+    Map<String, Object> getProductOrderList(@RequestBody(required = false) Map<String, Object> map,
                                  Integer apiId,
                                  Integer pageNum,
                                  Integer pageSize
     ) {
-        return amsFeign.getamsproductionordersyncs(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+        return amsFeign.getProductOrderList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
 
     }
 

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

@@ -415,6 +415,13 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.syncOperationPoint(map);
     }
 
+
+    @ApiOperation(value = "作业点一览", notes = "树形结构")
+    @PostMapping(value = "/getOperationPointTree")
+    public Map<String, Object> getOperationPointTree(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.getOperationPointTree(map);
+    }
+
     //============人员信息
     @ApiOperation(value = "获取人员信息列表")
     @ApiImplicitParams({
@@ -1497,4 +1504,9 @@ public class RMScontroller extends BaseRESTfulController {
     public Map<String, Object> delOilPrice(@RequestBody(required = false) Map<String, Object> mapValue) {
         return rmsFeign.delOilPrice(mapValue);
     }
+
+    @PostMapping("/updateInnerCode")
+    public Map<String, Object> updateInnerCode(@RequestBody Map<String, Object> mapValue) {
+        return rmsFeign.updateInnerCode(mapValue);
+    }
 }

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

@@ -528,6 +528,10 @@ public class TMSController extends BaseRESTfulController {
                     if(!weightTime.equals(item.get("计量日期").toString())){
                         throw new Exception("同一个Excel只允许一批车辆，请检查计量日期！");
                     }
+                    //更新重量
+                    BigDecimal weight = DataChange.dataToBigDecimal(map.get("weight"));
+                    weight = weight.add(DataChange.dataToBigDecimal(item.get("净重")));
+                    map.put("weight", weight);
                 } else {
                     throw new Exception("同一个Excel文件中只允许有一个通知单号！");
                 }
@@ -535,6 +539,7 @@ public class TMSController extends BaseRESTfulController {
                 //不存在，新增
                 map.put("requirementNumber", requirementNumber);
                 map.put("weightTime",item.get("计量日期").toString());
+                map.put("weight",DataChange.dataToBigDecimal(item.get("净重")));
             }
             //车牌号去重
             capacitySet.add(item.get("车号").toString());
@@ -550,8 +555,14 @@ public class TMSController extends BaseRESTfulController {
         List<Map<String,Object>> orderList = universalMapper.findTrainWeight(map);
         if (orderList.size() <= 0) {
             throw new Exception("未查询到装车信息，请先上传装车作业！");
+        } else if(orderList.size() != universalMapper.countTransOrder(orderList.get(0))){
+            throw new Exception("计量信息与装车信息数量不一致，请重新上传！");
+        } else if(orderList.get(0).get("unloadResultId")!=null){
+            throw new Exception("车皮已卸车，不允许再上传计量！");
         }
         map.put("orderList",orderList);
+        map.put("transPlanId",orderList.get(0).get("transPlanId"));
+        map.put("materialId",orderList.get(0).get("materialId"));
         //新增TMS
         return tmsFeign.purchaseTrainWeight(map);
     }
@@ -620,8 +631,20 @@ public class TMSController extends BaseRESTfulController {
         List<Map<String,Object>> orderList = universalMapper.findTrainUnload(map);
         if (orderList.size() <= 0) {
             throw new Exception("未查询到装车信息，请先上传装车作业！");
+        } else if(orderList.size() != universalMapper.countTransOrder(orderList.get(0))){
+            throw new Exception("卸货信息与装车信息数量不一致，请重新上传！");
+        }
+        //获取原本重量之和
+        BigDecimal weightOld = BigDecimal.ZERO;
+        for(Map<String,Object> item : orderList){
+            weightOld = weightOld.add(DataChange.dataToBigDecimal(item.get("unloadWeightOld")));
         }
+        map.put("weightOld",weightOld);
+        map.put("diff",DataChange.dataToBigDecimal(map.get("weight").toString()).subtract(weightOld));
         map.put("orderList",orderList);
+        map.put("transPlanId",orderList.get(0).get("transPlanId"));
+        map.put("materialId",orderList.get(0).get("materialId"));
+        map.put("unloadPointId",orderList.get(0).get("unloadPointId"));
         //新增TMS
         return tmsFeign.purchaseTrainUnload(map);
     }

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

@@ -173,6 +173,16 @@ public class WMSController extends BaseRESTfulController {
         return wmsFeign.getGridMaterialList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
+
+
+    @ApiOperation(value = "修改库存")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"gridMaterialId"}, foreignKeyTypes = {"入库实绩"})
+    @PostMapping("/updateGridMaterial")
+    public Map<String, Object> updateGridMaterial(@RequestBody(required = false) Map<String, Object> map){
+        return wmsFeign.updateGridMaterial(map);
+    }
+
     @ApiOperation(value = "查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "参数", required = false, dataType = "map"),
@@ -211,6 +221,14 @@ public class WMSController extends BaseRESTfulController {
         return wmsFeign.inbound(map);
     }
 
+    @ApiOperation(value = "修改入库")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"inboundResultId"}, foreignKeyTypes = {"入库实绩"})
+    @PostMapping("/updateInbound")
+    public Map<String, Object> updateInbound(@RequestBody(required = false) Map<String, Object> map){
+        return wmsFeign.updateInbound(map);
+    }
+
     @ApiOperation(value = "查询出库实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "参数", required = false, dataType = "map"),
@@ -233,6 +251,14 @@ public class WMSController extends BaseRESTfulController {
         return wmsFeign.outbound(map);
     }
 
+    @ApiOperation(value = "修改出库")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"outboundResultId"}, foreignKeyTypes = {"出库实绩"})
+    @PostMapping("/updateOutbound")
+    public Map<String, Object> updateOutbound(@RequestBody(required = false) Map<String, Object> map){
+        return wmsFeign.updateOutbound(map);
+    }
+
     @PostMapping("/selectkcmx")
     public RESTfulResult selectkcmx(@RequestBody HashMap map,
                              Integer apiId,

src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -263,8 +263,8 @@ public interface AmsFeign {
                                  @RequestParam Integer pageSize);
 
 
-    @PostMapping(value = "api/v1/ams/amsproductionordersyncs/getamsproductionordersyncs")
-    RESTfulResult getamsproductionordersyncs(@RequestBody Map<String, Object> objectMap,
+    @PostMapping(value = "api/v1/ams/amsorders/getProductOrderList")
+    Map<String, Object> getProductOrderList(@RequestBody Map<String, Object> objectMap,
                                  @RequestParam Integer apiId,
                                  @RequestParam Integer pageNum,
                                  @RequestParam Integer pageSize);

src/main/java/com/steerinfo/dil/feign/RmsFeign.java

@@ -173,6 +173,9 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmsoperationpoint/syncOperationPoint")
     Map<String, Object> syncOperationPoint(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping(value = "api/v1/rms/rmsoperationpoint/getOperationPointTree")
+    Map<String, Object> getOperationPointTree(@RequestBody(required = false) Map<String, Object> map);
+
     //查询作业点ID
     @PostMapping(value = "api/v1/rms/rmsoperationpoint/getOperationPointById/{id}")
     Map<String, Object> getOperationPointById(@PathVariable("id") BigDecimal id);
@@ -776,6 +779,9 @@ public interface RmsFeign {
 
     @PostMapping(value = "api/v1/rms/rmsoilprice/delOilPrice")
     Map<String, Object> delOilPrice(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/rms/rmspersonnel/updateInnerCode")
+    Map<String, Object> updateInnerCode(@RequestBody Map<String, Object> mapValue);
 }
 
 

src/main/java/com/steerinfo/dil/feign/WMSFeign.java

@@ -75,6 +75,9 @@ public interface WMSFeign {
                              @RequestParam Integer pageNum,
                              @RequestParam Integer pageSize);
 
+    @PostMapping("api/v1/wms/wmsgridmaterials/updateGridMaterial")
+    Map<String, Object> updateGridMaterial(@RequestBody(required = false) Map<String, Object> map);
+
 
     @PostMapping("api/v1/wms/wmsgridmaterials/getGridMaterialDailyReport")
     Map<String, Object> getGridMaterialDailyReport(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
@@ -89,6 +92,9 @@ public interface WMSFeign {
     @PostMapping("api/v1/wms/wmsinboundresults/inbound")
     Map<String, Object> inbound(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping("api/v1/wms/wmsinboundresults/updateInbound")
+    Map<String, Object> updateInbound(@RequestBody(required = false) Map<String, Object> map);
+
     @PostMapping("api/v1/wms/wmsoutboundresults/getOutboundList")
     Map<String, Object> getOutboundList(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
                                        @RequestParam Integer pageNum,
@@ -96,4 +102,8 @@ public interface WMSFeign {
 
     @PostMapping("api/v1/wms/wmsoutboundresults/outbound")
     Map<String, Object>outbound(@RequestBody(required = false) Map<String, Object> map);
+
+
+    @PostMapping("api/v1/wms/wmsoutboundresults/updateOutbound")
+    Map<String, Object> updateOutbound(@RequestBody(required = false) Map<String, Object> map);
 }

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

@@ -61,6 +61,9 @@ public interface UniversalMapper {
     //查询采购火运对应运单及卸货实绩
     List<Map<String, Object>>  findTrainUnload(Map<String, Object> map);
 
+    //查询火运计划下的运单数量
+    int countTransOrder(Map<String, Object> map);
+
     List<Map<String, Object>> getBusinessTypeLike(Map<String, Object> map);
 
     List<Map<String, Object>> getFuelTypeByLike(Map<String, Object> map);

src/main/resources/application-prod.yml

@@ -36,7 +36,7 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.90.214:8095}
   RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.90.214:8060}
+    url: ${RMSFEIGN_URL:localhost:8060}
   IntegrationFeign:
     url: ${INTEGRATIONFEIGN_URL:172.16.90.214:8066}
   OTMSFeign:

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

@@ -865,7 +865,10 @@
         <foreach collection="list" item="item"  separator=" UNION " >
             SELECT OTO .TRANS_ORDER_ID "transOrderId",
             OOC .ORDER_CHILD_ID "transOrderChildId",
+            APC .TRANS_PLAN_ID "transPlanId",
+            APC .MATERIAL_ID "materialId",
             TWR .RESULT_ID "resultId",
+            TUR .RESULT_ID "unloadResultId",
             #{item.车号} "capacityId",
             #{item.净重} "netWeight",
             #{item.皮重} "tareWeight",
@@ -874,7 +877,7 @@
             LEFT JOIN OMS_ORDER_CHILD OOC ON OOC .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID
             LEFT JOIN TMS_WEIGHT_RESULT TWR
                 ON TWR .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID AND TWR.NET_WEIGHT_TIME = to_date(#{weightTime}, 'yyyymmdd')
-            LEFT JOIN OMS_ORDER_CHILD OOC ON OOC .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID
+            LEFT JOIN TMS_UNLOAD_RESULT TUR ON TUR .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID
             LEFT JOIN  AMS_PLAN_CHILD APC ON APC.PLAN_CHILD_ID = OOC.PLAN_CHILD_ID
             LEFT JOIN AMS_REQUIREMENT_CHILD ARC ON ARC.REQUIREMENT_CHILD_ID = APC.REQUIREMENT_CHILD_ID
             LEFT JOIN AMS_TRANS_REQUIREMENT ATR ON ATR.TRANS_REQUIREMENT_ID = ARC.TRANS_REQUIREMENT_ID
@@ -890,6 +893,8 @@
             SELECT OTO .TRANS_ORDER_ID "transOrderId",
             OOC .ORDER_CHILD_ID "transOrderChildId",
             TUR .RESULT_ID "resultId",
+            TUR .ACTUAL_TONNAGE "unloadWeightOld",
+            APC .TRANS_PLAN_ID "transPlanId",
             ARC .RECEIVING_POINT_ID "unloadPointId",
             APC .MATERIAL_ID "materialId",
             #{item.车号} "capacityId",
@@ -898,7 +903,6 @@
             LEFT JOIN OMS_ORDER_CHILD OOC ON OOC .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID
             LEFT JOIN TMS_UNLOAD_RESULT TUR
             ON TUR .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID AND TUR.UNLOAD_START_TIME = to_date(#{unloadTime}, 'yyyymmdd')
-            LEFT JOIN OMS_ORDER_CHILD OOC ON OOC .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID
             LEFT JOIN  AMS_PLAN_CHILD APC ON APC.PLAN_CHILD_ID = OOC.PLAN_CHILD_ID
             LEFT JOIN AMS_REQUIREMENT_CHILD ARC ON ARC.REQUIREMENT_CHILD_ID = APC.REQUIREMENT_CHILD_ID
             LEFT JOIN AMS_TRANS_REQUIREMENT ATR ON ATR.TRANS_REQUIREMENT_ID = ARC.TRANS_REQUIREMENT_ID
@@ -1059,4 +1063,16 @@
             </if>
         </where>
     </select>
+    <select id="countTransOrder" resultType="java.lang.Integer">
+        SELECT COUNT(OTO .TRANS_ORDER_ID)
+        FROM OMS_TRANS_ORDER OTO
+        LEFT JOIN OMS_ORDER_CHILD OOC ON OOC .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID
+        LEFT JOIN  AMS_PLAN_CHILD APC ON APC.PLAN_CHILD_ID = OOC.PLAN_CHILD_ID
+        LEFT JOIN AMS_REQUIREMENT_CHILD ARC ON ARC.REQUIREMENT_CHILD_ID = APC.REQUIREMENT_CHILD_ID
+        LEFT JOIN AMS_TRANS_REQUIREMENT ATR ON ATR.TRANS_REQUIREMENT_ID = ARC.TRANS_REQUIREMENT_ID
+        <where>
+            OTO.DELETED != 1
+            AND APC.TRANS_PLAN_ID =#{transPlanId}
+        </where>
+    </select>
 </mapper>