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

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

@@ -0,0 +1,28 @@
+package com.steerinfo.dil.controller;
+
+
+import com.steerinfo.dil.feign.DzFeign;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import org.omg.CORBA.OBJ_ADAPTER;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@RequestMapping("${api.version}/dz")
+@RestController
+public class DzController extends BaseRESTfulController {
+
+    @Autowired
+    DzFeign dzFeign;
+
+    @PostMapping("/getDzData")
+    public Map<String,Object> getDzData(@RequestBody Map<String, Object> map) {
+        return dzFeign.getDzData(map);
+    }
+
+
+}

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

@@ -191,4 +191,48 @@ public class EMSController extends BaseRESTfulController {
     ) {
         return emsFeign.getemssalarydetailsMonthyear(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
+
+    @ApiOperation(value = "展示票据管理")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getemsticketmanagementslist")
+    Map<String, Object> getemsticketmanagementslist(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize
+    ) {
+        return emsFeign.getemsticketmanagementslist(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+
+    @ApiOperation(value = "新增票据管理")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"settlementId"}, foreignKeyTypes = {"新增详单明细"})
+    @PostMapping("/insertemsticketmanagements")
+    public Map<String, Object> insertemsticketmanagements(@RequestBody(required = false) Map<String, Object> map) {
+
+        return emsFeign.insertemsticketmanagements(map);
+    }
+
+    @ApiOperation(value = "票据管理逻辑删除")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"settlementId"}, foreignKeyTypes = {"新增详单明细"})
+    @PostMapping("/deletedemsticketmanagements")
+    public Map<String, Object> deletedemsticketmanagements(@RequestBody(required = false) Map<String, Object> map) {
+
+        return emsFeign.deletedemsticketmanagements(map);
+    }
+
+    @ApiOperation(value = "票据管理逻辑修改")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"settlementId"}, foreignKeyTypes = {"新增详单明细"})
+    @PostMapping("/updateemsticketmanagements")
+    public Map<String, Object> updateemsticketmanagements(@RequestBody(required = false) Map<String, Object> map) {
+
+        return emsFeign.updateemsticketmanagements(map);
+    }
 }

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

@@ -583,8 +583,9 @@ 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("")){
-                throw new Exception("单元格数据异常（通知单号/车号/计量日期/净重/皮重/毛重），请检查模板或数据是否正确!");
+                    || item.get("毛重")==null || item.get("毛重").equals("")
+                    ||  item.get("磅单号")==null || item.get("磅单号").equals("")){
+                throw new Exception("单元格数据异常（通知单号/车号/计量日期/净重/皮重/毛重/磅单号），请检查模板或数据是否正确!");
             }
             item.put("净重", DataChange.dataToBigDecimal(item.get("毛重")).subtract(DataChange.dataToBigDecimal(item.get("皮重"))));
             //校验数据
@@ -899,6 +900,26 @@ public class TMSController extends BaseRESTfulController {
         return tmsFeign.insertTmsTransitOrder(map);
     }
 
+    @ApiOperation("导入通行登记单")
+    @PostMapping("/importTrasitOrder")
+    public Map<String, Object> importTrasitOrder(@RequestBody MultipartFile file,
+                                       String userId,
+                                       String userName) throws Exception {
+        Map<String, Object> map = new HashMap<>();
+        //获取Excel中包含的对象数组
+        List<Map<String, Object>> list = ExcelToolUtils.getExcelList(file, 0);
+        map.put("list", list);
+        for (Map<String, Object> item : list) {
+            //校验行
+            if (item.get("车牌号") == null || item.get("通行卡类型") == null || item.get("开始时间") == null || item.get("结束时间") == null) {
+                throw new Exception("单元格数据异常，请检查模板或数据是否正确!");
+            }
+        }
+        map.put("userId", userId);
+        map.put("userName", userName);
+        return tmsFeign.importTrasitOrder(map);
+    }
+
     @ApiOperation(value = "查询请车批车")
     @PostMapping("/getPleaseApproveList")
     public Map<String, Object> getPleaseApproveList(@RequestBody(required = false) Map<String, Object> map,

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

@@ -381,10 +381,8 @@ public class UniversalController extends BaseRESTfulController {
         String url  =  "http://172.16.90.202:80"+map.get("requestUrl").toString() + "&pageNum=1&pageSize=10000";
         JSONObject json = HttpUtil.sendPost(url,jsonObject);
         Map<String, Object> data = (Map<String, Object>) json.get("data");
-        String listStr = data.get("list").toString();
-        String columnDataStr=data.get("columnData").toString();
-        List<Map<String,Object>> listMap = JSON.parseObject(listStr,new TypeReference<List<Map<String,Object>>>(){});
-        List<Map<String,Object>> columnData = JSON.parseObject(columnDataStr,new TypeReference<List<Map<String,Object>>>(){});
+        List<Map<String,Object>> listMap = (List<Map<String, Object>>) data.get("list");
+        List<Map<String,Object>> columnData = (List<Map<String, Object>>) data.get("columnData");
         LinkedHashMap<String, String> columnMaps = Maps.newLinkedHashMap();
         for (int i = 0; i <columnData.size() ; i++) {
             columnMaps.put(columnData.get(i).get("prop").toString(),columnData.get(i).get("label").toString());
@@ -403,5 +401,10 @@ public class UniversalController extends BaseRESTfulController {
         response.put("filePath",path);
         return success(response);
     }
-
+    @ApiModelProperty(value = "边输边查公司单位审批流程使用")
+    @PostMapping("/getCompanyMesByLike2")
+    public RESTfulResult getCompanyMesByLike2(@RequestBody(required = false) Map<String,Object> map) {
+        List<Map<String, Object>> list = universalMapper.getCompanyMesByLike2(map);
+        return success(list);
+    }
 }

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

@@ -0,0 +1,48 @@
+package com.steerinfo.dil.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+import java.util.Map;
+
+@FeignClient(name = "ANTAI-DZ-API", url = "${openfeign.DzFeign.url}")
+public interface DzFeign {
+    @PostMapping("/api/v1/dz/test/getUnloadDetails")
+    Map<String, Object> getUnloadDetails(@RequestBody(required = false) Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/getUnUploadOrder")
+    Map<String, Object> getUnUploadOrder();
+
+    @PostMapping("/api/v1/dz/test/getCapacityDetails")
+    Map<String, Object> getCapacityDetails(@RequestBody(required = false) Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/getTransOrderDz")
+    List<Map<String, Object>> getTransOrderDz();
+
+    @PostMapping("/api/v1/dz/test/getTransResult")
+    Map<String,Object> getTransResult(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/getTransResultList")
+    List<Map<String, Object>> getTransResultList(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/getSignList")
+    List<Map<String, Object>> getSignList(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/getInnerCode")
+    Map<String,Object> getInnerCode(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/getProductionResultList")
+    List<Map<String, Object>> getProductionResultList(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/restartWeightResult")
+    int restartWeightResult(@RequestBody List<String> ysddList);
+
+    @PostMapping("/api/v1/dz/test/getErrorRequirement")
+    Map<String,Object> getErrorRequirement( @RequestBody Map<String,Object> map);
+
+
+    @PostMapping("/api/v1/dz/test/getDzData")
+    Map<String, Object> getDzData(Map<String, Object> map);
+}

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

@@ -70,6 +70,23 @@ public interface EmsFeign {
                                              @RequestParam Integer pageNum,
                                              @RequestParam Integer pageSize
     );
+
+
+    @PostMapping("api/v1/ems/emsticketmanagements/getemsticketmanagementslist")
+    Map<String, Object> getemsticketmanagementslist(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                     @RequestParam Integer apiId,
+                                                     @RequestParam Integer pageNum,
+                                                     @RequestParam Integer pageSize
+    );
+
+    @PostMapping("api/v1/ems/emsticketmanagements/insertemsticketmanagements")
+    Map<String, Object> insertemsticketmanagements(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/ems/emsticketmanagements/deletedemsticketmanagements")
+    Map<String, Object> deletedemsticketmanagements(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/ems/emsticketmanagements/updateemsticketmanagements")
+    Map<String, Object> updateemsticketmanagements(@RequestBody(required = false) Map<String, Object> map);
 }
 
 

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

@@ -312,6 +312,8 @@ public interface TmsFeign {
     @PostMapping(value = "api/v1/tms/tmstransitorders/insertTmsTransitOrder")
     Map<String, Object> insertTmsTransitOrder(Map<String, Object> map);
 
+    @PostMapping(value = "api/v1/tms/tmstransitorders/importTrasitOrder")
+    Map<String, Object> importTrasitOrder(Map<String, Object> map);
 
     @PostMapping(value = "api/v1/tms/tmspleaseapproves/getPleaseApproveList")
     Map<String, Object> getPleaseApproveList(@RequestBody Map<String, Object> objectMap,

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

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

src/main/resources/application-prod.yml

@@ -45,6 +45,9 @@ openfeign:
   REPORTFeign:
     url: ${REPORTFEIGN_URL:172.16.90.202:8000}
 #    url: ${REPORTFEIGN_URL:localhost:8055}
+  DzFeign:
+    url: ${DZFEIGN_URL:172.16.90.202:8000}
+#    url: ${DZFEIGN_URL:localhost:8056}
 
 
 #远程调用

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

@@ -1257,11 +1257,18 @@
             SELECT OTO .TRANS_ORDER_ID "transOrderId",
             OOC .ORDER_CHILD_ID "transOrderChildId",
             APC .TRANS_PLAN_ID "transPlanId",
+            ATR .TRANS_REQUIREMENT_ID  "tdls",
+            ARC .REQUIREMENT_CHILD_ID  "tdfl",
+            OTO .ALTERNATE_FIELDS18 "sendStation",
+            OTO .ALTERNATE_FIELDS19 "endStation",
+            OTO .ALTERNATE_FIELDS20     "trainSeq",
             APC .MATERIAL_ID "materialId",
+            to_char(TLR.LOAD_START_TIME, 'yyyymmdd') "loadTime",
             TWR .RESULT_ID "resultId",
             TUR .RESULT_ID "unloadResultId",
             #{item.通知单号} "requireNumber",
             #{item.计量日期} "weightTime",
+            #{item.磅单号} "poundNo",
             #{item.车号} "capacityId",
             #{item.净重} "netWeight",
             #{item.皮重} "tareWeight",
@@ -1290,6 +1297,12 @@
             OOC .ORDER_CHILD_ID "transOrderChildId",
             TUR .RESULT_ID "resultId",
             TUR .ACTUAL_TONNAGE "unloadWeightOld",
+            OTO .ALTERNATE_FIELDS18 "sendStation",
+            OTO .ALTERNATE_FIELDS19 "endStation",
+            OTO .ALTERNATE_FIELDS20     "trainSeq",
+            to_char(TLR.LOAD_START_TIME, 'yyyymmdd') "loadTime",
+            ATR .TRANS_REQUIREMENT_ID  "tdls",
+            ARC .REQUIREMENT_CHILD_ID  "tdfl",
             ATR .SERIAL_NUMBER  "requirementSerialNumber",
             APC .TRANS_PLAN_ID "transPlanId",
             ARC .RECEIVING_POINT_ID "unloadPointId",
@@ -1895,4 +1908,141 @@
         from ams_trans_requirement t
         where substr(t.serial_number, 1, 10) = 'XX' || to_char(sysdate, 'yyyyMMdd')
     </select>
+
+
+<!--审批流程使用 -->
+    <select id="getCompanyMesByLike2" resultType="java.util.Map">
+        select * from (
+        select * from(
+        select
+        RC.SSO_ID "ssoId",
+        RC.SSO_CODE "ssoCode",
+        RC.COMPANY_ID "id",
+        RC.COMPANY_ID "businessCompanyId",
+        RC.COMPANY_ID   "key",
+        RC.COMPANY_ID "value",
+        RC.PARENT_COMPANY_ID "parentCompanyId",
+        <if test="companyType==null">
+            RC.COMPANY_TYPE || '-' ||
+        </if>
+        RC.COMPANY_NAME "label",
+        RC.COMPANY_NAME "text",
+        RC.COMPANY_NAME "companyName",
+        RC.CREDENTIAL_DESC  "seqNo",
+        T2 ."rootCompanyId",
+        T2 ."rootCompanyName",
+        'label' "prop"
+        from RMS_COMPANY RC
+        LEFT JOIN (
+        SELECT "companyId",MAX("level") "rootIndex" FROM
+        (
+        SELECT
+        RC.COMPANY_ID "rootCompanyId",
+        RC.COMPANY_NAME "rootCompanyName",
+        LEVEL "level",
+        CONNECT_BY_ROOT ( COMPANY_ID ) "companyId"
+        FROM
+        RMS_COMPANY RC
+        CONNECT BY PRIOR RC.PARENT_COMPANY_ID = RC.COMPANY_ID
+        )
+        GROUP BY "companyId"
+        ) T1 ON  T1 ."companyId" = RC .COMPANY_ID
+        LEFT JOIN
+        (
+        SELECT
+        RC.COMPANY_ID "rootCompanyId",
+        RC.COMPANY_NAME "rootCompanyName",
+        LEVEL "level",
+        CONNECT_BY_ROOT ( COMPANY_ID ) "companyId"
+        FROM
+        RMS_COMPANY RC
+        CONNECT BY PRIOR RC.PARENT_COMPANY_ID = RC.COMPANY_ID
+        ) T2 ON  T2 ."companyId" = T1 ."companyId" AND T2 ."level" = T1 ."rootIndex"
+        <where>
+            DELETED = 0
+            <if test="companyType!=null and companyType!=''">
+                AND REGEXP_LIKE(RC.COMPANY_TYPE, #{companyType})
+            </if>
+            <if test="companyId!=null and companyId!=''">
+                AND RC.COMPANY_ID = #{companyId}
+            </if>
+            <if test="businessCompanyId!=null and businessCompanyId!=''">
+                AND RC.COMPANY_ID = #{businessCompanyId}
+            </if>
+            <if test="supplierCompanyId!=null and supplierCompanyId!=''">
+                AND RC.COMPANY_ID = #{supplierCompanyId}
+            </if>
+            <if test="receiveCompanyId!=null and receiveCompanyId!=''">
+                AND RC.COMPANY_ID = #{receiveCompanyId}
+            </if>
+            <if test="carrierId!=null and carrierId!=''">
+                AND RC.COMPANY_ID = #{carrierId}
+            </if>
+            <if test="index!=null and index!=''">
+                AND REGEXP_LIKE(RC.COMPANY_NAME, #{index})
+            </if>
+            <if test="isListed !=null and isListed!=''">
+                AND RC.is_Listed IS NOT NULL
+            </if>
+
+        </where>
+        <if test="noRow == null">
+            order by rc.register_aptitudes,LENGTH(company_name)
+        </if>
+        )
+        )
+        <if test="id!=null and id.size>0">
+            UNION
+            select * from
+            (select
+            RC.SSO_ID "ssoId",
+            RC.SSO_CODE "ssoCode",
+            RC.COMPANY_ID "id",
+            RC.COMPANY_ID "businessCompanyId",
+            RC.COMPANY_ID   "key",
+            RC.COMPANY_ID "value",
+            RC.PARENT_COMPANY_ID "parentCompanyId",
+            <if test="companyType==null">
+                RC.COMPANY_TYPE || '-' ||
+            </if>
+            RC.COMPANY_NAME "label",
+            RC.COMPANY_NAME "text",
+            RC.COMPANY_NAME "companyName",
+            RC.CREDENTIAL_DESC  "seqNo",
+            T2 ."rootCompanyId",
+            T2 ."rootCompanyName",
+            'label' "prop"
+            from RMS_COMPANY RC
+            LEFT JOIN (
+            SELECT "companyId",MAX("level") "rootIndex" FROM
+            (
+            SELECT
+            RC.COMPANY_ID "rootCompanyId",
+            RC.COMPANY_NAME "rootCompanyName",
+            LEVEL "level",
+            CONNECT_BY_ROOT ( COMPANY_ID ) "companyId"
+            FROM
+            RMS_COMPANY RC
+            CONNECT BY PRIOR RC.PARENT_COMPANY_ID = RC.COMPANY_ID
+            )
+            GROUP BY "companyId"
+            ) T1 ON  T1 ."companyId" = RC .COMPANY_ID
+            LEFT JOIN
+            (
+            SELECT
+            RC.COMPANY_ID "rootCompanyId",
+            RC.COMPANY_NAME "rootCompanyName",
+            LEVEL "level",
+            CONNECT_BY_ROOT ( COMPANY_ID ) "companyId"
+            FROM
+            RMS_COMPANY RC
+            CONNECT BY PRIOR RC.PARENT_COMPANY_ID = RC.COMPANY_ID
+            ) T2 ON  T2 ."companyId" = T1 ."companyId" AND T2 ."level" = T1 ."rootIndex"
+            where RC.COMPANY_ID in
+            <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                #{item}
+            </foreach>
+            order by to_number(RC.CREDENTIAL_DESC),LENGTH(company_name))
+        </if>
+    </select>
 </mapper>