'销售与结算'

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

@@ -1078,6 +1078,13 @@ public class AMScontroller{
         return amsFeign.selectRequirement(requirementId);
     }
 
+    /*
+    查询需求物资详情
+     */
+    @PostMapping("/getRequirementMaterial/{requirementId}")
+    public Map<String,Object> getRequirementMaterial(@PathVariable("requirementId") Integer requirementId) {
+        return amsFeign.getRequirementMaterial(requirementId);
+    }
     /**
      * 展示用车需求
      * @param mapValue
@@ -1098,11 +1105,11 @@ public class AMScontroller{
                                           Integer pageSize,
                                           Integer apiId,
                                           Integer requirementStatus,
-                                          String con) {
+                                          String orgCode) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,con);
+        return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,orgCode);
     }
 
     @PostMapping("/getPurRequirementList")

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

@@ -749,4 +749,17 @@ public class OMSController {
     public Map<String, Object> batchCloseOrder(@RequestBody List<Map<String,Object>> mapList) {
         return omsFeign.batchCloseOrder(mapList);
     }
+
+    @ApiOperation(value = "根据订单ID查询订单子表物资信息")
+    @PostMapping("/getOrderMaterial/{orderId}")
+    public Map<String,Object> getOrderMaterial(@PathVariable("orderId")Integer orderId){
+        return omsFeign.getOrderMaterial(orderId);
+    }
+
+
+    @ApiOperation(value = "查看所有实绩点")
+    @PostMapping("/getAllResultLineMes")
+    public Map<String, Object> getAllResultLineMes(Integer orderId){
+        return omsFeign.getAllResultLineMes(orderId);
+    }
 }

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

@@ -58,6 +58,12 @@ public class RMScontroller {
         return rmsFeign.getAllLineDesk(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, lineType, con);
     }
 
+    @ApiOperation(value="查询线路中的门岗汽车衡", notes="分页查询")
+    @PostMapping("/getGateCalculateMes")
+    public Map<String, Object> getGateCalculateMes(@RequestParam Integer lineId){
+        return rmsFeign.getGateCalculateMes(lineId);
+    }
+
     @ApiOperation(value = "根据主键查询出数据以供修改")
     @PostMapping("/getLinkToUpdate")
     public Map<String, Object> getLinkToUpdate(@RequestParam Integer lineId) {

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

@@ -214,6 +214,13 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
+    @ApiModelProperty(value = "边输边查用车单位")
+    @PostMapping("/getRequireUnitName")
+    public RESTfulResult getRequireUnitName(@RequestParam("index") String index) {
+        List<Map<String,Object>>list = universalMapper.getRequireUnitName(index == null ? "" : "%" + index + "%");
+        return success(list);
+    }
+
     @ApiModelProperty(value = "边输边查收货单位")
     @PostMapping("/getConsigneeByLike")
     public RESTfulResult getConsigneeByLike(@RequestParam("index") String index) {

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

@@ -1173,8 +1173,8 @@ public interface AmsFeign {
                                    @RequestParam Integer pageNum,
                                    @RequestParam Integer pageSize,
                                    @RequestParam Integer apiId,
-                                                @RequestParam Integer requirementStatus,
-                                                @RequestParam String con);
+                                   @RequestParam Integer requirementStatus,
+                                   @RequestParam String orgCode);
 
     @ApiOperation(value="查询app端公开抢单")
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/getDispatchSaleOrderList")
@@ -1506,6 +1506,9 @@ public interface AmsFeign {
     @PostMapping(value = "/api/v1/ams/amssaleordermaterials/getPriceMap")
     Map<String, Object> getPriceMap(@RequestBody Map<String, Object> map);
 
+    @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/getRequirementMaterial/{requirementId}")
+    Map<String,Object> getRequirementMaterial(@PathVariable("requirementId") Integer requirementId);
+
     @PostMapping(value = "/api/v1/ams/amssaleordermaterials/getBenPrice")
     Map<String, Object> getBenPrice(@RequestBody Map<String, Object> map);
 }

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

@@ -440,5 +440,13 @@ public interface OmsFeign {
     @ApiOperation(value = "批量关闭运输订单")
     @PostMapping("api/v1/oms/omstruckorderseparates/batchCloseOrder")
     Map<String, Object> batchCloseOrder(@RequestBody List<Map<String, Object>> mapList);
+    @ApiOperation(value = "根据订单ID查询订单子表物资信息")
+    @PostMapping("api/v1/oms/omstruckorderseparates/getOrderMaterial/{orderId}")
+    Map<String, Object> getOrderMaterial(@PathVariable Integer orderId);
+
+
+    @PostMapping("api/v1/oms/omstruckorderseparates/getAllResultLineMes")
+    Map<String, Object> getAllResultLineMes(@RequestParam("orderId") Integer orderId);
+
 }
 

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

@@ -48,6 +48,10 @@ public interface RmsFeign {
                                         @RequestParam("lineType")Integer lineType,
                                         @RequestParam("con")String con);
 
+    @ApiOperation(value="查询线路中的门岗汽车衡", notes="分页查询")
+    @PostMapping("/api/v1/rms/rmslines/getGateCalculateMes")
+    Map<String, Object> getGateCalculateMes(@RequestParam("lineId")Integer lineId);
+
     @ApiOperation(value = "根据主键查询出数据以供修改")
     @PostMapping("/api/v1/rms/rmslines/getLinkToUpdate")
     Map<String, Object> getLinkToUpdate(@RequestParam Integer lineId);

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

@@ -97,6 +97,7 @@ public interface UniversalMapper {
     //查询所有的焦炭子类
     List<Map<String, Object>> getAllMaterialCoke();
 
+
     //边输边查发货单位
     List<Map<String, Object>> getCapacityByLike(String index);
 
@@ -112,4 +113,7 @@ public interface UniversalMapper {
     BigDecimal isInCapacity(Map<String, Object> mapValue);
 
     List<Map<String, Object>> getOilFormula(Map<String, Object> mapValue);
+
+    //边输边查用车单位
+    List<Map<String, Object>> getRequireUnitName(String index);
 }

src/main/resources/application-dev.yml

@@ -10,19 +10,19 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8015}
+    url: ${AMSFEIGN_URL:172.16.33.162:8015}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmstrainFeign:
     url: ${BMSTRAINFEIGN_URL:172.16.33.162:8005}
   BmstruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:localhost:8009}
+    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
   QmsTruckFeign:
     url: ${QMSTRUCKFEIGN_URL:172.16.33.162:8017}
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign:
@@ -30,9 +30,9 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OMSFeign:
-    url: ${OMSFEIGN_URL:localhost:8016}
+    url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
-    url: ${RMSFEIGN_URL:localhost:8014}
+    url: ${RMSFEIGN_URL:172.16.33.162:8014}
 
 server:
   port: 8019

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

@@ -72,7 +72,7 @@
                         ON RM.MATERIAL_ID = DB.MATERIAL_ID
                 <where>
                     <if test="index != null">
-                        instr(RM.MATERIAL_NAME, #{index}) > 0
+                        (instr(RM.MATERIAL_NAME, #{index}) > 0 or instr(RM.MATERIAL_SPECIFICATION,#{index}) >0 or instr(RM.MATERIAL_MODEL,#{index}) >0)
                     </if>
                 </where>
                  group by RM.MATERIAL_ID,RM.MATERIAL_NAME,RM.MATERIAL_CODE,RM.MATERIAL_SPECIFICATION,RM.MATERIAL_MODEL
@@ -293,11 +293,10 @@
                                     on apo.BATCH_ID = DB.BATCH_ID
                           join RMS_SUPPLIER RS
                                     on RS.SUPPLIER_ID = apo.SUPPLIER_UNIT_ID
-                 <where>
+                    where APO.DELETED = 0
                     <if test="materialId != null">
-                        DB.MATERIAL_ID = #{materialId}
+                      and  DB.MATERIAL_ID = #{materialId}
                     </if>
-                 </where>
              )
         <where>
             <if test="index != null">
@@ -349,7 +348,7 @@
         FROM RMS_MATERIAL RM
         <where>
             <if test="index != null">
-                instr(RM.MATERIAL_NAM, #{index}) > 0
+                (instr(RM.MATERIAL_NAME, #{index}) > 0 or instr(RM.MATERIAL_SPECIFICATION,#{index}) >0 or instr(RM.MATERIAL_MODEL,#{index}) >0)
             </if>
         </where>
         )
@@ -475,9 +474,6 @@
         where instr(RC.CONSIGNEE_COMPANY_NAME, #{index}) > 0 and rownum &lt; 10
         order by "value"
     </select>
-
-
-
     <select id="getCarrierListByLike" parameterType="java.util.Map" resultType="java.util.Map" >
         select
         *
@@ -615,6 +611,18 @@
                RMC.MATERIAL_COKE_NAME "label"
         FROM RMS_MATERIAL_COKE RMC
     </select>
+    <select id="getRequireUnitName" resultType="java.util.Map">
+        SELECT
+	    RS.SHIPPER_ID "shipperId",
+	    RS.SHIPPER_NAME "shipperName"
+        FROM
+	    RMS_SHIPPER RS
+        <where>
+            <if test="index != null">
+                RS.SHIPPER_NAME like #{index}
+            </if>
+        </where>
+    </select>
 
     <!--  边输边查车牌号  -->
     <select id="getCapacityByLike" parameterType="string" resultType="java.util.Map">