'上传总工程'

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

@@ -1997,4 +1997,15 @@ public class AMScontroller{
     public Map<String, Object> adverseCloseSaleOrder(@RequestParam Integer saleOrderId) {
         return amsFeign.adverseCloseSaleOrder(saleOrderId);
     }
+
+    @ApiOperation(value = "承运起止范围与装货点")
+    @PostMapping("/getRangePoint")
+    public Map<String, Object> getRangePoint(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer apiId,
+                                                String con
+    ) {
+        return amsFeign.getRangePoint(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+    }
 }

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

@@ -61,4 +61,10 @@ public class BackgroundProcessingController extends BaseRESTfulController {
     public RESTfulResult deleteErrorResult(String orderNumber){
         return success(backgroundProcessingService.deleteErrorResult(orderNumber));
     }
+
+    @ApiOperation(value = "手动允许放行-OK字段")
+    @PostMapping("/allowEnfactory")
+    public RESTfulResult allowEnfactory(String orderNumber){
+        return success(backgroundProcessingMapper.allowEnfactory(orderNumber));
+    }
 }

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

@@ -180,6 +180,12 @@ public class TMSController extends BaseRESTfulController {
         return tmsshipFeign.getShipLocation(locationId);
     }
 
+    @PostMapping("/getWareHouseOutresult/{resultId}")
+    @ApiOperation(value = "查询港口出库")
+    Map<String, Object> getWareHouseOutresult(@PathVariable("resultId") BigDecimal resultId) {
+        return tmsTrainFeign.getWareHouseOutresult(resultId);
+    }
+
     @PostMapping("selectShipLocation/{locationId}")
     @ApiOperation(value = "通过id查询位置作业")
     Map<String, Object> selectShipLocation(@PathVariable("locationId") BigDecimal locationId) {
@@ -817,6 +823,16 @@ public class TMSController extends BaseRESTfulController {
     }
 
 
+    @ApiOperation(value = "修改港口出库")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tmstrainLoadingResult", value = "车皮装车对象", required = false, dataType = "TmstrainLoadingResult")
+    })
+    @PostMapping(value = "/updateWarehouseResult")
+    public Map<String, Object> updateWarehouseResult(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsTrainFeign.updateWarehouseResult(map);
+    }
+
+
     @ApiOperation(value = "新增车皮装车作业实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "tmstrainLoadingResult", value = "车皮装车对象", required = false, dataType = "TmstrainLoadingResult")

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

@@ -945,4 +945,25 @@ public class UniversalController extends BaseRESTfulController {
         System.out.println("订单关闭数为：" + result);
         return success(result);
     }
+
+    @ApiOperation(value = "内转计重承运合同物资")
+    @PostMapping("/getInwardWeightMaterial")
+    public RESTfulResult getInwardWeightMaterial(@RequestBody(required = false) Map<String,Object> mapValue,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer apiId,
+                                               String index) {
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index", index);
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.getInwardWeightMaterial(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
+        return success(data);
+    }
+
 }

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

@@ -1738,4 +1738,12 @@ public interface AmsFeign {
 
     @PostMapping(value = "/api/v1/ams/amssaleorders/adverseCloseSaleOrder")
     Map<String, Object> adverseCloseSaleOrder(@RequestParam Integer saleOrderId);
+
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getRangePoint")
+    Map<String, Object> getRangePoint(@RequestBody(required = false) Map<String, Object> map,
+                                      @RequestParam Integer pageNum,
+                                      @RequestParam Integer pageSize,
+                                      @RequestParam Integer apiId,
+                                      @RequestParam String con);
+
 }

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

@@ -285,5 +285,12 @@ public interface TmsTrainFeign {
 
 
     @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/addWarehouseOutResult")
-    Map<String, Object> addWarehouseOutResult(@RequestBody(required = false)Map<String,Object> map);
+    Map<String, Object> addWarehouseOutResult(@RequestBody(required = false) Map<String,Object> map);
+
+    @PostMapping(value =  "api/v1/trainTms/tmstrainloadingresults/getWareHouseOutresult/{resultId}")
+    Map<String, Object> getWareHouseOutresult(@PathVariable("resultId")BigDecimal resultId);
+
+
+    @PostMapping(value =  "api/v1/trainTms/tmstrainloadingresults/updateWarehouseResult")
+    Map<String, Object> updateWarehouseResult(@RequestBody(required = false) Map<String, Object> map);
 }

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

@@ -800,4 +800,7 @@ public interface TmsshipFeign {
 
     @PostMapping(value =  "api/v1/shipTms/amsshipdeliverynotices/uploadCargoPic" ,consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     String uploadCargoPic(@RequestPart("file") MultipartFile multipartFile);
+
+
+
 }

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

@@ -53,4 +53,6 @@ public interface BackgroundProcessingMapper {
 
     int deleteOutFactoryUnnecessaryResult(@Param("list") List<Integer> list);
 
+    int allowEnfactory(String orderNumber);
+
 }

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

@@ -226,4 +226,7 @@ public interface UniversalMapper {
     int closePassedOrder();
 
     List<Map<String,Object>> findPassedOrder();
+
+    List<Map<String, Object>> getInwardWeightMaterial(Map<String, Object> mapValue);
+
 }

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

@@ -13,6 +13,14 @@
         set APO.PURCHASING_ORGANIZATION_ID = #{orgId}
         where APO.PURCHASE_ORDER_NO = #{purchaseOrderNo}
     </update>
+    <update id="allowEnfactory">
+        UPDATE TMSTRUCK_ENFACTORY_RESULT TER
+        SET TER.INSERT_UPDATE_REMARK = 'OK'
+        WHERE TER.RESULT_ID = (SELECT TER.RESULT_ID FROM OMSTRUCK_ORDER OO
+            LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
+            LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+            WHERE OO.ORDER_NUMBER = #{orderNumber})
+    </update>
 
     <select id="getOrderType" resultType="java.lang.Integer" parameterType="java.lang.Integer">
         select OO.ORDER_TYPE from OMSTRUCK_ORDER OO

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

@@ -1075,6 +1075,36 @@
         AND   OO.ORDER_STATUS = 5
         AND   OO.ORDER_TYPE = 1
     </select>
+    <select id="getInwardWeightMaterial" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT * FROM (SELECT
+            RMT.MATERIAL_TYPE_ID "materialTypeId",
+            rm.MATERIAL_ID "materialId",
+            rm.MATERIAL_NAME "materialName",
+            rmt.MATERIAL_TYPE_NAME "materialTypeName"
+        FROM
+            RMS_MATERIAL RM
+                LEFT JOIN RMS_MATERIAL_TYPE RMT ON RMT.MATERIAL_TYPE_ID = RM.MATERIAL_TYPE_ID
+        WHERE
+        RM.DELETED = 0
+        AND RMT.MATERIAL_ISINWARD = 1
+        <if test="index != null">
+            AND instr(RM.MATERIAL_NAME, #{index}) > 0
+        </if>
+           )
+        <where>
+            <if test="materialName != null">
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialTypeName != null">
+                and
+                <foreach collection="materialTypeName" item="item" open="(" separator="or" close=")">
+                    "materialTypeName" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+    </select>
 
     <select id="getPlaceAndAddress" parameterType="java.lang.String" resultType="java.util.Map" >
         SELECT RRP.PLACE_ID                 "placeId",