修改

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

@@ -1036,4 +1036,31 @@ public class AMScontroller  extends BaseRESTfulController {
     public Map<String, Object> forcedModification(@RequestBody Map<String, Object> params) throws Exception {
         return amsFeign.forcedModification(params);
     }
+
+    @ApiOperation("新增绑定关系")
+    @PostMapping("/addAmsFixedBindRequirement")
+    public Map<String, Object> addAmsFixedBindRequirement(@RequestBody Map<String, Object> params) throws Exception {
+        return amsFeign.addAmsFixedBindRequirement(params);
+    }
+
+    @ApiOperation("请求撤回需求")
+    @PostMapping("/withdrawRequirement")
+    public Map<String, Object> withdrawRequirement(@RequestBody Map<String, Object> params) throws Exception {
+        return amsFeign.withdrawRequirement(params);
+    }
+
+    @ApiOperation(value = "展示生产需求详情-绑定")
+    @PostMapping(value = "/getProductionRequirementListBind")
+    Map<String, Object> getProductionRequirementListBind(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                       Integer apiId,
+                                                       Integer pageNum,
+                                                       Integer pageSize) {
+        return amsFeign.getProductionRequirementListBind(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation("修改绑定需求")
+    @PostMapping("/updateBindRequirement")
+    public Map<String, Object> updateBindRequirement(@RequestBody Map<String, Object> params) throws Exception {
+        return amsFeign.updateBindRequirement(params);
+    }
 }

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

@@ -215,6 +215,20 @@ public class TMSController extends BaseRESTfulController {
         return tmsFeign.updCountResult(map);
     }
 
+    @ApiOperation(value="审批计时")
+    @PostMapping(value = "/approveTimeResult")
+    @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"计次"})
+    public Map<String, Object> approveTimeResult(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsFeign.approveTimeResult(map);
+    }
+
+    @ApiOperation(value="计时复报")
+    @PostMapping(value = "/resendTimeResult")
+    @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"计次"})
+    public Map<String, Object> resendTimeResult(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsFeign.resendTimeResult(map);
+    }
+
     @ApiOperation(value = "查询计时")
     @PostMapping("/tmstimingresultsList")
     public Map<String, Object> tmstimingresultsList(@RequestBody(required = false) Map<String, Object> map,
@@ -708,12 +722,38 @@ public class TMSController extends BaseRESTfulController {
             //校验行
             if(item.get("通知单号")==null || item.get("通知单号").equals("")
                     || item.get("车号")==null || item.get("车号").equals("")
-                    || item.get("卸车日期")==null || item.get("卸车日期").equals("")
-                    || item.get("皮重")==null || item.get("皮重").equals("")
-                    || item.get("毛重")==null || item.get("毛重").equals("")){
-                throw new Exception("单元格数据异常（通知单号/车号/卸车日期/净重），请检查模板或数据是否正确!");
+                    || item.get("卸车日期")==null || item.get("卸车日期").equals("")){
+                throw new Exception("单元格数据异常（通知单号/车号/卸车日期），请检查模板或数据是否正确!");
+            }
+            if(item.get("净重") == null || item.get("净重").equals("")){
+                //净重为空
+                if(item.get("毛重") != null && !item.get("毛重").equals("")
+                        && item.get("皮重") != null && !item.get("皮重").equals("")){
+                    item.put("净重", DataChange.dataToBigDecimal(item.get("毛重")).subtract(DataChange.dataToBigDecimal(item.get("皮重"))));
+                }else{
+                    throw new Exception("单元格数据异常（净重），请检查模板或数据是否正确!");
+                }
+            }
+
+            if(item.get("毛重") == null || item.get("毛重").equals("")){
+                //毛重为空
+                if(item.get("净重") != null && !item.get("净重").equals("")
+                        && item.get("皮重") != null && !item.get("皮重").equals("")){
+                    item.put("毛重", DataChange.dataToBigDecimal(item.get("净重")).add(DataChange.dataToBigDecimal(item.get("皮重"))));
+                }else{
+                    throw new Exception("单元格数据异常（毛重），请检查模板或数据是否正确!");
+                }
+            }
+
+            if(item.get("皮重") == null || item.get("皮重").equals("")){
+                //毛重为空
+                if(item.get("净重") != null && !item.get("净重").equals("")
+                        && item.get("毛重") != null && !item.get("毛重").equals("")){
+                    item.put("皮重", DataChange.dataToBigDecimal(item.get("毛重")).subtract(DataChange.dataToBigDecimal(item.get("净重"))));
+                }else{
+                    throw new Exception("单元格数据异常（皮重），请检查模板或数据是否正确!");
+                }
             }
-            item.put("净重", DataChange.dataToBigDecimal(item.get("毛重")).subtract(DataChange.dataToBigDecimal(item.get("皮重"))));
             //校验数据
 //            if(unloadTime == null){
 //                unloadTime = item.get("卸车日期").toString();

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

@@ -317,6 +317,14 @@ public class UniversalController extends BaseRESTfulController {
         return success(requireMap);
     }
 
+
+    @ApiOperation("通知单边输边查")
+    @PostMapping("/getRequirementByLike")
+    public RESTfulResult getRequirementByLike(@RequestBody Map<String,Object> map) {
+        List<Map<String, Object>> list = universalMapper.getRequirementByLike(map);
+        return success(list);
+    }
+
     @ApiOperation("查询APP版本更新")
     @PostMapping("/getAppVersion")
     public RESTfulResult getAppVersion() {

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

@@ -375,4 +375,19 @@ public interface AmsFeign {
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/forcedModification")
     Map<String, Object> forcedModification(Map<String, Object> params);
+
+    @PostMapping(value = "api/v1/ams/amsfixedbindrequirements/addAmsFixedBindRequirement")
+    Map<String, Object> addAmsFixedBindRequirement(@RequestBody Map<String, Object> params);
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/withdrawRequirement")
+    Map<String, Object> withdrawRequirement(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/getProductionRequirementListBind")
+    Map<String, Object> getProductionRequirementListBind(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                       @RequestParam  Integer apiId,
+                                                       @RequestParam  Integer pageNum,
+                                                       @RequestParam  Integer pageSize);
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/updateBindRequirement")
+    Map<String, Object> updateBindRequirement(@RequestBody Map<String, Object> map);
 }

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

@@ -85,6 +85,12 @@ public interface TmsFeign {
     @PostMapping("api/v1/tms/tmstimingresults/updCountResult")
     Map<String, Object> updCountResult(Map<String, Object> map);
 
+    @PostMapping("api/v1/tms/tmstimingresults/approveTimeResult")
+    Map<String, Object> approveTimeResult(Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmstimingresults/resendTimeResult")
+    Map<String, Object> resendTimeResult(Map<String, Object> map);
+
     @PostMapping("api/v1/tms/tmstimingresults/tmstimingresultsUpdate")
     Map<String, Object> tmstimingresultsUpdate(Map<String, Object> map);
 

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

@@ -115,4 +115,5 @@ public interface UniversalMapper {
 
     List<Map<String, Object>> getQueueGridList(Map<String, Object> map);
 
+    List<Map<String, Object>> getRequirementByLike(Map<String, Object> map);
 }

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

@@ -1318,6 +1318,8 @@
             APC .TRANS_PLAN_ID "transPlanId",
             ARC .RECEIVING_POINT_ID "unloadPointId",
             APC .MATERIAL_ID "materialId",
+            RM .MATERIAL_NAME "materialName",
+            RM .MATERIAL_CODE "materialCode",
             #{item.卸车日期} "unloadTime",
             #{item.车号} "capacityId",
             #{item.通知单号} "requireNumber",
@@ -1337,6 +1339,7 @@
             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
+            LEFT JOIN RMS_MATERIAL RM ON RM .MATERIAL_ID = ARC .MATERIAL_ID
             <where>
                 OTO.DELETED != 1
                 AND 30 >= TO_NUMBER (to_date(#{item.卸车日期}, 'yyyymmdd') - TLR.LOAD_START_TIME)
@@ -1879,10 +1882,12 @@
         SELECT * FROM (
         SELECT DISTINCT
         ATR .SERIAL_NUMBER "supplementary",
+        ATR .SERIAL_NUMBER "supplementaryId",
         ATR .TRANS_REQUIREMENT_ID "id",
         ATR .TRANS_REQUIREMENT_ID "value",
         ATR .SERIAL_NUMBER "label",
-        ATR .SERIAL_NUMBER "text"
+        ATR .SERIAL_NUMBER "text",
+        'supplementaryId' "prop"
         FROM
         AMS_TRANS_REQUIREMENT ATR
         LEFT JOIN AMS_REQUIREMENT_CHILD ARC
@@ -1915,10 +1920,12 @@
             UNION
             SELECT DISTINCT
             ATR .SERIAL_NUMBER "supplementary",
+            ATR .SERIAL_NUMBER "supplementaryId",
             ATR .TRANS_REQUIREMENT_ID "id",
             ATR .TRANS_REQUIREMENT_ID "value",
             ATR .SERIAL_NUMBER "label",
-            ATR .SERIAL_NUMBER "text"
+            ATR .SERIAL_NUMBER "text",
+            'supplementaryId' "prop"
             FROM
             AMS_TRANS_REQUIREMENT ATR
             WHERE ATR .TRANS_REQUIREMENT_ID in
@@ -2078,4 +2085,39 @@
         FROM TMS_QUEUE_GRID
         where DELETED = 0
     </select>
+    <select id="getRequirementByLike" resultType="java.util.Map">
+        SELECT * FROM (
+            SELECT
+            TRANS_REQUIREMENT_ID "id",
+            TRANS_REQUIREMENT_ID "value",
+            SERIAL_NUMBER "label",
+            SERIAL_NUMBER "text"
+            FROM
+            AMS_TRANS_REQUIREMENT
+            <where>
+                DELETED NOT IN (2,5)
+                <if test="index!=null and index!=''">
+                    AND REGEXP_LIKE(SERIAL_NUMBER, #{index})
+                </if>
+                <if test="businessScene!=null and businessScene!=''">
+                    AND REGEXP_LIKE(BUSINESS_SCENE, #{businessScene})
+                </if>
+            </where>
+            FETCH NEXT 10 ROWS ONLY
+        )
+        <if test="id!=null and id.size>0">
+            UNION
+            SELECT
+            TRANS_REQUIREMENT_ID "id",
+            TRANS_REQUIREMENT_ID "value",
+            SERIAL_NUMBER "label",
+            SERIAL_NUMBER "text"
+            FROM
+            AMS_TRANS_REQUIREMENT
+            WHERE TRANS_REQUIREMENT_ID IN
+            <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                #{item}
+            </foreach>
+        </if>
+    </select>
 </mapper>