Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API into dev

pom.xml

@@ -111,7 +111,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>RMS_MATERIAL</param><!--销售计划-->
+                        <param>AMSTRUCK_INWARD_REQUIREMENT</param><!--销售计划-->
 <!--                        <param>AMS_SALE_PLAN_MATERIAL</param>&lt;!&ndash;销售计划物资中间表&ndash;&gt;-->
 <!--                        <param>AMSTRUCK_RAIL_DAYPLAN</param>&lt;!&ndash;销售计划物资中间表&ndash;&gt;-->
 <!--                        <param>AMS_CONTRACT_TRANSPORT_PRICE</param>&lt;!&ndash;销售订单&ndash;&gt;-->

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

@@ -165,35 +165,35 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
     public RESTfulResult getPurchaseIdByBatch(@RequestBody(required = false) Map<String,Object> mapValue,
                                                  Integer pageNum,
                                                  Integer pageSize,
-                                                 Integer apiId,
-                                                 String con) {
-        if (con != null) {
-            if (!con.equals("undefined")) {
-                String index="get_purchase_batch";//设置要查询的索引名称
-                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
-            }
-        }
+                                                 Integer apiId) {
+//        if (con != null) {
+//            if (!con.equals("undefined")) {
+//                String index="get_purchase_batch";//设置要查询的索引名称
+//                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
+//            }
+//        }
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        List<Map<String, Object>> truckRequirementList = null;
-        if (mapValue.size() == 0) {
-            //将查询结果存入索引中
-            truckRequirementList =  amstruckInwardRequirementService.getPurchaseIdByBatch(mapValue);
-            Map<String, Object> map1 = new HashMap<>();
-            //添加索引
-            map1.put("index","get_purchase_batch");
-            //添加id
-            map1.put("indexId","purchaseOrderId");
-            truckRequirementList.add(map1);
-            //新建索引
-            esFeign.insertIndex(truckRequirementList);
-            //删除
-            truckRequirementList.remove(truckRequirementList.size()-1);
-        }
-        if (truckRequirementList == null) {
-            truckRequirementList = amstruckInwardRequirementService.getPurchaseIdByBatch(mapValue);
-        }
+//        List<Map<String, Object>> truckRequirementList = null;
+//        if (mapValue.size() == 0) {
+//            //将查询结果存入索引中
+//            truckRequirementList =  amstruckInwardRequirementService.getPurchaseIdByBatch(mapValue);
+//            Map<String, Object> map1 = new HashMap<>();
+//            //添加索引
+//            map1.put("index","get_purchase_batch");
+//            //添加id
+//            map1.put("indexId","purchaseOrderId");
+//            truckRequirementList.add(map1);
+//            //新建索引
+//            esFeign.insertIndex(truckRequirementList);
+//            //删除
+//            truckRequirementList.remove(truckRequirementList.size()-1);
+//        }
+//        if (truckRequirementList == null) {
+//            truckRequirementList = amstruckInwardRequirementService.getPurchaseIdByBatch(mapValue);
+//        }
+        List<Map<String, Object>> truckRequirementList = amstruckInwardRequirementService.getPurchaseIdByBatch(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amstruckInwardRequirementService.getPurchaseIdByBatch(mapValue);

src/main/java/com/steerinfo/dil/model/AmstruckInwardRequirement.java

@@ -51,9 +51,9 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
     private BigDecimal requirementShipperId;
 
     /**
-     * 费用类别（日常内转费，推进办费用，大修费用，新增建设项目，外委吊车，外委转机，环保绿化项目）(REQUIREMENT_WORK_TYPE,DECIMAL,38)
+     * 费用类别（0：日常内转费，1：推进办费用，2：大修费用，3：新增建设项目，4：外委吊车，5：外委转机，6：环保绿化项目）(REQUIREMENT_WORK_TYPE,DECIMAL,38)
      */
-    @ApiModelProperty(value="费用类别（日常内转费，推进办费用，大修费用，新增建设项目，外委吊车，外委转机，环保绿化项目）",required=false)
+    @ApiModelProperty(value="费用类别（0：日常内转费，1：推进办费用，2：大修费用，3：新增建设项目，4：外委吊车，5：外委转机，6：环保绿化项目）",required=false)
     private BigDecimal requirementWorkType;
 
     /**
@@ -87,9 +87,9 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
     private String requirementOverlimit;
 
     /**
-     * 用车单位ID(REQUIREMNT_UNIT_ID,DECIMAL,38)
+     * 用车地点ID(REQUIREMNT_UNIT_ID,DECIMAL,38)
      */
-    @ApiModelProperty(value="用车单位ID",required=false)
+    @ApiModelProperty(value="用车地点ID",required=false)
     private BigDecimal requiremntUnitId;
 
     /**
@@ -134,6 +134,12 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="0:未删除，1：已删除",required=false)
     private BigDecimal deleted;
 
+    /**
+     * 卸货点(REQUIREMENT_UNLOAD_UNIT_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="卸货点",required=false)
+    private BigDecimal requirementUnloadUnitId;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -314,6 +320,14 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
         this.deleted = deleted;
     }
 
+    public BigDecimal getRequirementUnloadUnitId() {
+        return requirementUnloadUnitId;
+    }
+
+    public void setRequirementUnloadUnitId(BigDecimal requirementUnloadUnitId) {
+        this.requirementUnloadUnitId = requirementUnloadUnitId;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -341,6 +355,7 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
         sb.append(", updateTime=").append(updateTime);
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
         sb.append(", deleted=").append(deleted);
+        sb.append(", requirementUnloadUnitId=").append(requirementUnloadUnitId);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/dil/service/impl/AmstruckInwardRequirementServiceImpl.java

@@ -58,6 +58,7 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         String requirementWorkEnvironment = (String) mapValue.get("requirementWorkEnvironment");
         String requirementEstimatedDuration = (String) mapValue.get("requirementEstimatedDuration");
         Integer requiremntUnitId = (Integer) mapValue.get("requiremntUnitId");
+        Integer requirementUnloadUnitId = (Integer) mapValue.get("requirementUnloadUnitId");
         String requirementOverlimit = (String) mapValue.get("requirementOverlimit");
         String materialWeight = (String) mapValue.get("materialWeight");
         String materialCount = (String) mapValue.get("materialNumber");
@@ -79,6 +80,7 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         amstruckInwardRequirement.setRequiremntUnitId(new BigDecimal(requiremntUnitId));
         amstruckInwardRequirement.setRequirementOverlimit(requirementOverlimit);
         amstruckInwardRequirement.setRequirementShipperId(new BigDecimal(requirementShipperId));
+        amstruckInwardRequirement.setRequirementUnloadUnitId(new BigDecimal(requirementUnloadUnitId));
         // 设置常规字段
         amstruckInwardRequirement.setInsertTime(new Date());
         amstruckInwardRequirement.setInsertUsername("admin");
@@ -118,6 +120,27 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         else {
             mapList = amstruckInwardRequirementMapper.getTruckRequirementList(mapValue);
         }
+        for (Map<String,Object> map : mapList) {
+            BigDecimal workType = (BigDecimal) map.get("requirementWorkType");
+            map.remove("requirementWorkType");
+            String requirementWorkType;
+            switch (workType.intValue()) {
+                case 0 : requirementWorkType = "日常内转费";
+                    break;
+                case 1 : requirementWorkType = "推进办费用";
+                    break;
+                case 2 : requirementWorkType = "大修费用";
+                    break;
+                case 3 : requirementWorkType = "新增建设项目";
+                    break;
+                case 4 : requirementWorkType = "外委吊车";
+                    break;
+                case 5 : requirementWorkType = "外委转机";
+                    break;
+                default: requirementWorkType = "环保绿化项目";
+            }
+            map.put("workType",requirementWorkType);
+        }
         return mapList;
     }
 

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

@@ -579,7 +579,6 @@
         DB.RESULT_FOREIGN_SHIP_NAME AS "resultForeignShipName",
         AIP.PLAN_NUMBER AS "planNumber",
         RCA.CARRIER_NAME AS "carrierName",
-        RCA.CARRIER_ID AS "carrierId",
         AIP.PLAN_TRUCK_NUMBER AS "planTruckNumber",
         AIR.REQUIREMENT_NUMBER AS "requirementNumber",
         AIP.PLAN_ISSUE_TIME AS "planIssueTime",

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

@@ -23,20 +23,22 @@
         <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime"/>
         <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark"/>
         <result column="DELETED" jdbcType="DECIMAL" property="deleted"/>
+        <result column="REQUIREMENT_UNLOAD_UNIT_ID" jdbcType="DECIMAL" property="requirementUnloadUnitId"/>
     </resultMap>
     <sql id="columns">
         REQUIREMENT_ID, PURCHASE_ORDER_ID, REQUIREMENT_NUMBER, REQUIREMENT_TYPE, CAPACITY_TYPE_ID,
     REQUIREMENT_TRUCK_TIME, REQUIREMENT_SHIPPER_ID, REQUIREMENT_WORK_TYPE, REQUIREMENT_WORK_CONTENT,
     LINE_ID, REQUIREMENT_WORK_ENVIRONMENT, REQUIREMENT_ESTIMATED_DURATION, REQUIREMENT_OVERLIMIT,
     REQUIREMNT_UNIT_ID, REQUIREMENT_STATUS, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
-    UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED
+    UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, REQUIREMENT_UNLOAD_UNIT_ID
     </sql>
     <sql id="columns_alias">
         t.REQUIREMENT_ID, t.PURCHASE_ORDER_ID, t.REQUIREMENT_NUMBER, t.REQUIREMENT_TYPE,
     t.CAPACITY_TYPE_ID, t.REQUIREMENT_TRUCK_TIME, t.REQUIREMENT_SHIPPER_ID, t.REQUIREMENT_WORK_TYPE,
     t.REQUIREMENT_WORK_CONTENT, t.LINE_ID, t.REQUIREMENT_WORK_ENVIRONMENT, t.REQUIREMENT_ESTIMATED_DURATION,
     t.REQUIREMENT_OVERLIMIT, t.REQUIREMNT_UNIT_ID, t.REQUIREMENT_STATUS, t.INSERT_USERNAME,
-    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED
+    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED,
+    t.REQUIREMENT_UNLOAD_UNIT_ID
     </sql>
     <sql id="select">
         SELECT
@@ -113,6 +115,9 @@
             <if test="deleted != null">
                 and DELETED = #{deleted}
             </if>
+            <if test="requirementUnloadUnitId != null">
+                and REQUIREMENT_UNLOAD_UNIT_ID = #{requirementUnloadUnitId}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -180,6 +185,9 @@
             <if test="deleted != null">
                 and DELETED = #{deleted}
             </if>
+            <if test="requirementUnloadUnitId != null">
+                and REQUIREMENT_UNLOAD_UNIT_ID = #{requirementUnloadUnitId}
+            </if>
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
@@ -250,6 +258,9 @@
         <if test="deleted != null">
             or DELETED = #{deleted}
         </if>
+        <if test="requirementUnloadUnitId != null">
+            or REQUIREMENT_UNLOAD_UNIT_ID = #{requirementUnloadUnitId}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
         insert into AMSTRUCK_INWARD_REQUIREMENT (REQUIREMENT_ID, PURCHASE_ORDER_ID, REQUIREMENT_NUMBER,
@@ -259,7 +270,7 @@
                                                  REQUIREMENT_ESTIMATED_DURATION, REQUIREMENT_OVERLIMIT,
                                                  REQUIREMNT_UNIT_ID, REQUIREMENT_STATUS, INSERT_USERNAME,
                                                  INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
-                                                 INSERT_UPDATE_REMARK, DELETED)
+                                                 INSERT_UPDATE_REMARK, DELETED, REQUIREMENT_UNLOAD_UNIT_ID)
         values (#{requirementId,jdbcType=DECIMAL}, #{purchaseOrderId,jdbcType=DECIMAL},
                 #{requirementNumber,jdbcType=VARCHAR},
                 #{requirementType,jdbcType=VARCHAR}, #{capacityTypeId,jdbcType=DECIMAL},
@@ -271,7 +282,8 @@
                 #{requiremntUnitId,jdbcType=DECIMAL}, #{requirementStatus,jdbcType=DECIMAL},
                 #{insertUsername,jdbcType=VARCHAR},
                 #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
-                #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL})
+                #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL},
+                #{requirementUnloadUnitId,jdbcType=DECIMAL})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
         insert into AMSTRUCK_INWARD_REQUIREMENT
@@ -339,6 +351,9 @@
             <if test="deleted != null">
                 DELETED,
             </if>
+            <if test="requirementUnloadUnitId != null">
+                REQUIREMENT_UNLOAD_UNIT_ID,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="requirementId != null">
@@ -404,6 +419,9 @@
             <if test="deleted != null">
                 #{deleted,jdbcType=DECIMAL},
             </if>
+            <if test="requirementUnloadUnitId != null">
+                #{requirementUnloadUnitId,jdbcType=DECIMAL},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
@@ -427,7 +445,8 @@
             UPDATE_USERNAME                = #{updateUsername,jdbcType=VARCHAR},
             UPDATE_TIME                    = #{updateTime,jdbcType=TIMESTAMP},
             INSERT_UPDATE_REMARK           = #{insertUpdateRemark,jdbcType=VARCHAR},
-            DELETED                        = #{deleted,jdbcType=DECIMAL}
+            DELETED                        = #{deleted,jdbcType=DECIMAL},
+            REQUIREMENT_UNLOAD_UNIT_ID     = #{requirementUnloadUnitId,jdbcType=DECIMAL}
         where REQUIREMENT_ID = #{requirementId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
@@ -493,6 +512,9 @@
             <if test="deleted != null">
                 DELETED = #{deleted,jdbcType=DECIMAL},
             </if>
+            <if test="requirementUnloadUnitId != null">
+                REQUIREMENT_UNLOAD_UNIT_ID = #{requirementUnloadUnitId,jdbcType=DECIMAL},
+            </if>
         </set>
         where REQUIREMENT_ID = #{requirementId,jdbcType=DECIMAL}
     </update>
@@ -520,7 +542,8 @@
         REQUIREMNT_UNIT_ID, REQUIREMENT_STATUS,
         INSERT_USERNAME, INSERT_TIME,
         UPDATE_USERNAME, UPDATE_TIME,
-        INSERT_UPDATE_REMARK, DELETED)
+        INSERT_UPDATE_REMARK, DELETED,
+        REQUIREMENT_UNLOAD_UNIT_ID)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.requirementId,jdbcType=DECIMAL},
@@ -533,7 +556,8 @@
         #{item.requiremntUnitId,jdbcType=DECIMAL}, #{item.requirementStatus,jdbcType=DECIMAL},
         #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
         #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
-        #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL} from dual
+        #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL},
+        #{item.requirementUnloadUnitId,jdbcType=DECIMAL} from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
@@ -623,6 +647,10 @@
         <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
             when #{item.requirementId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
         </foreach>
+        ,REQUIREMENT_UNLOAD_UNIT_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case REQUIREMENT_ID" close="end">
+            when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementUnloadUnitId,jdbcType=DECIMAL}
+        </foreach>
         where REQUIREMENT_ID in
         <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
             #{item.requirementId,jdbcType=DECIMAL}
@@ -637,6 +665,7 @@
     </delete>
     <!-- 友情提示！！！-->
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+
     <!-- 展示用车需求 -->
     <select id="getTruckRequirementList" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT * FROM
@@ -969,6 +998,7 @@
                DB.RESULT_FOREIGN_SHIP_NAME        AS "resultForeignShipName",
                RW.WAREHOUSE_NAME                  AS "wareHouseName",
                AIR.REQUIREMNT_UNIT_ID             AS "requiremntUnitId",
+               AIR.REQUIREMENT_UNLOAD_UNIT_ID     AS "requirementUnloadUnitId",
                AIR.REQUIREMENT_TYPE               AS "requirementType",
                AIR.CAPACITY_TYPE_ID               AS "capacityTypeId",
                AIR.REQUIREMENT_TRUCK_TIME         AS "requirementTruckTime",