2021年12月1日09:08:40修改建议

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

@@ -1197,4 +1197,9 @@ public class AMScontroller{
     public Map<String,Object> getOffsetWarehouse() {
         return amsFeign.getOffsetWarehouse();
     }
+
+    @PostMapping("/finishTruckPlan/{planId}")
+    public Map<String, Object> finishTruckPlan(@PathVariable("planId") Integer planId){
+        return amsFeign.finishTruckPlan(planId);
+    }
 }

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

@@ -573,4 +573,10 @@ public class OMSController {
     public Map<String,Object> apportionInwardOffsetOrder(@RequestBody Map<String,Object> mapvalue) {
         return omsFeign.apportionInwardOffsetOrder(mapvalue);
     }
+
+    @ApiOperation(value = "司机确认订单")
+    @PostMapping("/driverConfirmation")
+    public Map<String,Object> driverConfirmation(@RequestBody(required = false) Map<String,Object> mapvalue) {
+        return omsFeign.driverConfirmation(mapvalue);
+    }
 }

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

@@ -61,15 +61,17 @@ public class UniversalController extends BaseRESTfulController {
                                            Integer pageNum,
                                            Integer pageSize,
                                            Integer apiId,
-                                           String index) {
+                                           String index,
+                                           String startNum) {
 
         if(mapValue == null) {
             mapValue = new HashMap<>();
         }
+        if(startNum != null){
+            mapValue.put("startNum", startNum + "%");
+        }
         if(index != null){
-            mapValue.put("index", index + "%");
-        }else {
-            mapValue.put("index", "aaaaa%");
+            mapValue.put("index", "%" + index + "%");
         }
         List<Map<String, Object>> list = universalMapper.queryMaterialByLike(mapValue);
         PageHelper.startPage(pageNum, pageSize);

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

@@ -1231,4 +1231,7 @@ public interface AmsFeign {
                                              @RequestParam Integer pageSize,
                                              @RequestParam Integer apiId,
                                              @RequestParam Integer dayPlanId);
+
+    @PostMapping("/api/v1/ams/amstruckinwardplan/finishTruckPlan/{planId}")
+    public Map<String, Object> finishTruckPlan(@PathVariable("planId") Integer planId);
 }

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

@@ -321,5 +321,8 @@ public interface OmsFeign {
     //分解异地库计划
     @PostMapping("api/v1/oms/omstruckorders/apportionInwardOffsetOrder")
     Map<String, Object> apportionInwardOffsetOrder(@RequestBody Map<String, Object> mapvalue);
+
+    @PostMapping("api/v1/oms/omstruckorders/driverConfirmation")
+    Map<String,Object> driverConfirmation(@RequestBody(required = false) Map<String,Object> mapvalue);
 }
 

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

@@ -60,18 +60,29 @@
     <select id="queryMaterialByLike" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT *
         FROM (
-        SELECT RM.MATERIAL_ID "materialId",
-        RM.MATERIAL_NAME "materialName",
-        RM.MATERIAL_CODE "materialCode",
-        RM.MATERIAL_SPECIFICATION "materialSpecification",
-        RM.MATERIAL_MODEL "materialModel"
-        FROM RMS_MATERIAL RM
-        WHERE RM.MATERIAL_NAME LIKE #{index}
+                SELECT RM.MATERIAL_ID "materialId",
+                    RM.MATERIAL_NAME "materialName",
+                    RM.MATERIAL_CODE "materialCode",
+                    RM.MATERIAL_SPECIFICATION "materialSpecification",
+                    RM.MATERIAL_MODEL "materialModel"
+                FROM RMS_MATERIAL RM
+                <where>
+                    <if test="startNum != null">
+                        RM.MATERIAL_CODE LIKE #{startNum}
+                    </if>
+                    <if test="startNum == null">
+                        RM.MATERIAL_CODE LIKE '010%' OR RM.MATERIAL_CODE LIKE '0801%'
+                    </if>
+                </where>
         )
         <where>
+            <if test="index != null">
+                "materialName" LIKE #{index}
+            </if>
             <if test="materialName != null">
+                and
                 <foreach collection="materialName" item="item" open="(" separator="or" close=")">
-                    "materialName" like '%${item}%'
+                 "materialName" like '%${item}%'
                 </foreach>
             </if>
             <if test="materialCode != null">