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

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

@@ -799,8 +799,8 @@ public class AMScontroller  extends BaseRESTfulController {
     }
 
     @ApiOperation("新增生产需求编号")
-    @PostMapping("/addSerialNumber")
+    @PostMapping("/getSerialNumber")
     Map<String,Object> addSerialNumber(@RequestBody Map<String,Object> map) {
-        return amsFeign.addSerialNumber(map);
+        return amsFeign.getSerialNumber(map);
     }
 }

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

@@ -59,21 +59,6 @@ public class BackgroundProcessingController extends BaseRESTfulController {
                 resMap.put("code","500");
                 return resMap;
             }
-            //List<Map<String,Object>> currentCompanyList = backgroundProcessingMapper.getCurrentCompanyList(loginName);
-
-            //userInfo.put("currentCompanyList",currentCompanyList);
-            // 根据查询到的公司ID
-            //System.out.println(userInfo);
-            //// 获取机构
-            //List<Map<String,Object>> sysOrgs = (List<Map<String,Object>>) userInfo.get("sysOrgs");
-            //String orgName = sysOrgs.get(0).get("orgName").toString();
-            //// 获取角色
-            //List<Map<String,Object>> sysRoles = (List<Map<String,Object>>) userInfo.get("sysOrgs");
-            //for(Map<String,Object> sysMap : sysRoles) {
-            //    String roleName = sysMap.get("roleName").toString();
-            //    //根据orgName和roleName去查询companyId
-            //    Map<String,Object> map = backgroundProcessingMapper.selectCompanyId(orgName,roleName);
-            //}
             System.out.println(dataMap);
         }
         return resMap;

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

@@ -253,4 +253,22 @@ public class UniversalController extends BaseRESTfulController {
         List<Map<String, Object>> material = universalMapper.getcountCar(map);
         return success(material);
     }
+
+    @ApiOperation("getShipContainer")
+    @PostMapping("/getShipContainer")
+    public RESTfulResult getShipContainer(@RequestBody Map<String,Object> map) {
+        List<Map<String,Object>> containerList = universalMapper.getContainerList();
+        return success(containerList);
+    }
+
+    @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);
+        return success(requireMap);
+    }
 }

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

@@ -290,7 +290,7 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amstransplans/transPlanupload")
     Map<String, Object> transPlanupload(@RequestBody(required = false) Map<String, Object> map);
 
-    @PostMapping(value = "api/v1/ams/amstransrequirements/addSerialNumber")
-    Map<String, Object> addSerialNumber(@RequestBody(required = false) Map<String, Object> map);
+    @PostMapping(value = "api/v1/ams/amstransrequirements/getSerialNumber")
+    Map<String, Object> getSerialNumber(@RequestBody(required = false) Map<String, Object> map);
 
 }

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

@@ -1,6 +1,8 @@
 package com.steerinfo.dil.mapper;
 
+import org.apache.ibatis.annotations.Options;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.mapstruct.Mapper;
 
 import java.math.BigDecimal;
@@ -80,4 +82,13 @@ public interface UniversalMapper {
 
     //获取车型剩余的空闲车辆和已经派车的数量
     List<Map<String, Object>> getcountCar(Map<String, Object> map);
+
+    List<Map<String, Object>> getContainerList();
+
+    String getRequirementNo(Map<String, Object> map);
+
+    @Select("select seq_AMS_TRANS_REQUIREMENT.nextval from dual")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    BigDecimal transRequirementId();
+
 }

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

@@ -1280,4 +1280,15 @@
                 RCA.DELETED !=  1
             ) RCA
     </select>
+    <select id="getContainerList" resultType="java.util.Map">
+        SELECT RSC.CONTAINER_NO "label",
+               RSC.CONTAINER_NO "value",
+               RSC.CONTAINER_NO "text"
+               FROM RMS_SHIPPING_CONTAINER RSC
+        <where>
+            <if test="index != null and index != ''">
+
+            </if>
+        </where>
+    </select>
 </mapper>