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

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

@@ -35,7 +35,8 @@ public class SessionInterceptor extends HandlerInterceptorAdapter {
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         HandlerMethod hm = (HandlerMethod) handler;
         String requestUrl = "" + request.getRequestURL();
-        if(!requestUrl.contains("/api/v1/bp/bpLogin") && !requestUrl.contains("/api/v1/uc/getAppVersion") && (request.getAttribute("userId")==null || request.getAttribute("userName")==null)){
+        if(!requestUrl.contains("/api/v1/bp/bpLogin") && !requestUrl.contains("/api/v1/uc/") && !requestUrl.contains("/api/v1/systemfiles/") && !requestUrl.contains("/api/v1/rms/insertPersonnel")
+                && (request.getAttribute("userId")==null || request.getAttribute("userName")==null)){
             //无权访问
             response.setCharacterEncoding("UTF-8");
             response.setContentType("application/json; charset=utf-8");

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

@@ -304,6 +304,14 @@ public class AMScontroller  extends BaseRESTfulController {
         return amsFeign.purchaseTrainPlanDelete(map);
     }
 
+
+    @ApiOperation(value = "采购火运计划批量删除接口", notes = "采购火运计划批量删除接口")
+    @PostMapping(value = "/purchaseTrainPlanBatchDel")
+    @LogAround(foreignKeys = {"transPlanId"},foreignKeyTypes = {"采购计划"})
+    public Map<String, Object> purchaseTrainPlanBatchDel(@RequestBody(required = false) Map<String ,Object> map) {
+        return amsFeign.purchaseTrainPlanBatchDel(map);
+    }
+
     @ApiOperation(value="同步销售订单")    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/saleOrderSync")
     @LogAround(foreignKeys = {"orderId"}, foreignKeyTypes = {"销售订单"})

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

@@ -440,12 +440,19 @@ public class TMSController extends BaseRESTfulController {
                 || 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("")
-                    || item.get("毛重")==null || item.get("毛重").equals("")){
-                throw new Exception("单元格数据异常（通知单号/车号/装车日期/发站/到站/净重/皮重/毛重），请检查模板或数据是否正确!");
+                    || item.get("装车日期")==null || item.get("装车日期").equals("")){
+                throw new Exception("单元格数据异常（通知单号/车号/装车日期/发站/到站），请检查模板或数据是否正确!");
+            }
+            BigDecimal tareWeight = DataChange.dataToBigDecimal(item.get("皮重"));
+            BigDecimal grossWeight = DataChange.dataToBigDecimal(item.get("毛重"));
+            BigDecimal netWeight = DataChange.dataToBigDecimal(item.get("净重"));
+            if(tareWeight.compareTo(BigDecimal.ZERO) > 0 && grossWeight.compareTo(BigDecimal.ZERO) > 0){
+                item.put("净重", grossWeight.subtract(tareWeight));
+            }else if(netWeight.compareTo(BigDecimal.ZERO) > 0){
+                item.put("净重", netWeight);
+            }else {
+                throw new Exception("单元格数据异常：净重/皮重/毛重，请检查模板或数据是否正确!");
             }
-            item.put("净重", DataChange.dataToBigDecimal(item.get("毛重")).subtract(DataChange.dataToBigDecimal(item.get("皮重"))));
             //通知单统计
             String requirementNumber = item.get("通知单号").toString();
             if (map.get(requirementNumber) != null) {

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

@@ -278,11 +278,18 @@ public class UniversalController extends BaseRESTfulController {
     @ApiOperation("获取通知单号")
     @PostMapping("/getRequirementNo")
     public RESTfulResult getRequirementNo(@RequestBody Map<String,Object> map) {
-        BigDecimal requirementId = universalMapper.transRequirementId();
-        String requirementNo = DataChange.generateEightDigitsNumber(map.get("businessFlag").toString(),requirementId.intValue());
         Map<String, Object> requireMap = new HashMap<>();
-        requireMap.put("requirementId",requirementId);
-        requireMap.put("requirementNo",requirementNo);
+        BigDecimal requirementId = universalMapper.transRequirementId();
+        if (map.get("businessFlag").toString().equals("XS")) {
+            //获取当天最大的作业记录号
+            String serialNumber = universalMapper.getMaxSerialNumber();
+            requireMap.put("requirementId", requirementId);
+            requireMap.put("requirementNo", serialNumber);
+        } else {
+            String requirementNo = DataChange.generateEightDigitsNumber(map.get("businessFlag").toString(), requirementId.intValue());
+            requireMap.put("requirementId", requirementId);
+            requireMap.put("requirementNo", requirementNo);
+        }
         return success(requireMap);
     }
 

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

@@ -106,6 +106,9 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amstransplans/purchaseTrainPlanDelete")
     Map<String, Object> purchaseTrainPlanDelete(Map<String, Object> map);
 
+    @PostMapping(value = "api/v1/ams/amstransplans/purchaseTrainPlanBatchDel")
+    Map<String, Object> purchaseTrainPlanBatchDel(Map<String, Object> map);
+
     @PostMapping("api/v1/ams/amsorders/saleOrderSync")
     Map<String, Object> saleOrderSync(@RequestBody(required = false) Map<String, Object> map);
 

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

@@ -106,4 +106,6 @@ public interface UniversalMapper {
     Map<String,Object> getDriverInfo(Map<String, Object> map);
 
     List<Map<String, Object>> getRequireByLike(Map<String, Object> map);
+
+    String getMaxSerialNumber();
 }

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

@@ -311,7 +311,9 @@
         OPERATION_POINT_NAME "OPERATION_POINT_NAME",
         OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "label",
         OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "text",
-        OPERATION_POINT_CODE "code"
+        OPERATION_POINT_CODE "code",
+        REMARK "remark",
+        alternate_fields3 "f3"
         from RMS_OPERATION_POINT
         <where>
             DELETED = 0
@@ -332,7 +334,7 @@
             </if>
         </where>
         order by alternate_fields3,LENGTH(OPERATION_POINT_NAME)
-        FETCH NEXT 10 ROWS ONLY
+        FETCH NEXT 50 ROWS ONLY
         )
         <if test="id!=null and id.size>0">
             UNION select
@@ -341,14 +343,16 @@
             OPERATION_POINT_NAME "OPERATION_POINT_NAME",
             OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "label",
             OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "text",
-            OPERATION_POINT_CODE "code"
+            OPERATION_POINT_CODE "code",
+            REMARK "remark",
+            alternate_fields3 "f3"
             from RMS_OPERATION_POINT
             where  OPERATION_POINT_ID in
             <foreach collection="id" item="item"  open="(" close=")" separator="," >
                 #{item}
             </foreach>
         </if>
-      )  order by LENGTH("OPERATION_POINT_NAME") desc
+      )  order by "f3", LENGTH("OPERATION_POINT_NAME") desc
     </select>
 
     <select id="getPersonnelByLike" resultType="java.util.Map">
@@ -1238,6 +1242,9 @@
             #{item.卸车日期} "unloadTime",
             #{item.车号} "capacityId",
             #{item.通知单号} "requireNumber",
+            #{item.皮重} "tareWeight",
+            #{item.毛重} "grossWeight",
+            #{item.净重} "netWeight",
             CASE
                 WHEN TWR .NET_WEIGHT > 0 THEN TWR .NET_WEIGHT
                 ELSE TLR .ACTUAL_TONNAGE
@@ -1826,4 +1833,11 @@
             </foreach>
         </if>
     </select>
+
+    <select id="getMaxSerialNumber" resultType="java.lang.String">
+        select 'XX' || nvl(to_number(substr(max(t.serial_number), 3)) + 1,
+                           to_char(sysdate, 'yyyyMMdd') || '001')
+        from ams_trans_requirement t
+        where substr(t.serial_number, 1, 10) = 'XX' || to_char(sysdate, 'yyyyMMdd')
+    </select>
 </mapper>