neizhuan

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

@@ -132,6 +132,26 @@ public class AmsRailOffsetDayplanController extends BaseRESTfulController {
         return success(data);
     }
 
+    @PostMapping("/getRailOffsetDayplanId")
+    public RESTfulResult getRailOffsetDayplanId(@RequestBody(required = false) Map<String,Object> mapValue,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              Integer apiId,
+                                              Integer dayPlanId
+    ) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+
+        mapValue.put("dayPlanId",new BigDecimal(dayPlanId));
+        List<Map<String, Object>> list = amsRailOffsetDayplanService.getRailOffsetDayplanId(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = amsRailOffsetDayplanService.getRailOffsetDayplanId(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
     /**
      * 到站下拉
      * @return

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

@@ -201,6 +201,15 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
         return success(data);
     }
 
+
+    //异地库下拉框
+    @GetMapping("/getOffsetWarehouse")
+    public RESTfulResult getOffsetWarehouse(){
+        List<Map<String,Object>> mapList =  amstruckInwardRequirementService.getOffsetWareHouse();
+        return success(mapList);
+    }
+
+
     @ApiModelProperty(value = "仓库模代框")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),

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

@@ -27,4 +27,8 @@ public interface AmsRailOffsetDayplanMapper extends IBaseMapper<AmsRailOffsetDay
 
     // 到站下拉框
     List<Map<String, Object>> getdayPlanToTheStationId();
+
+
+    //根据ID查询日计划
+    List<Map<String, Object>> getRailOffsetDayplanId(Map<String, Object> mapValue);
 }

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

@@ -3,6 +3,9 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.AmstruckRequirementMaterial;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import java.math.*;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
@@ -11,4 +14,7 @@ public interface AmstruckRequirementMaterialMapper extends IBaseMapper<AmstruckR
 
     @Select("select seq__REQUIREMENT_MATERIAL.nextval from dual")
     BigDecimal selectRequirementMaterialId();
+
+
+    List<Map<String, Object>> getOffsetWarehouse();
 }

src/main/java/com/steerinfo/dil/service/IAmsRailOffsetDayplanService.java

@@ -49,4 +49,6 @@ public interface IAmsRailOffsetDayplanService extends IBaseService<AmsRailOffset
 
     // 到站下拉框
     List<Map<String, Object>> getdayPlanToTheStationId();
+
+    List<Map<String, Object>> getRailOffsetDayplanId(Map<String, Object> mapValue);
 }

src/main/java/com/steerinfo/dil/service/IAmstruckInwardRequirementService.java

@@ -43,4 +43,7 @@ public interface IAmstruckInwardRequirementService extends IBaseService<Amstruck
     List<Map<String, Object>> getShipperUser();
 
     List<Map<String, Object>> getWareHouse(Map<String, Object> mapValue);
+
+    //异地库下拉框
+    List<Map<String, Object>> getOffsetWareHouse();
 }

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

@@ -11,9 +11,11 @@ import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cglib.core.Local;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -80,8 +82,16 @@ public class AmsRailOffsetDayplanServiceImpl extends BaseServiceImpl<AmsRailOffs
         String dayPlanWagonNumber = (String) mapValue.get("dayPlanWagonNumber");
         String dayPlanConsigneeName = (String) mapValue.get("dayPlanConsigneeName");
         String dayPlanConsigneeTel = (String) mapValue.get("dayPlanConsigneeTel");
-        Integer carrierId = (Integer) mapValue.get("carrierId");
+        Integer unitId = (Integer) mapValue.get("unitId");
 //        Integer dayPlanSendStationId = (Integer) mapValue.get("dayPlanSendStationId");
+//        DataChange dataChange=new DataChange();
+        LocalDate now = LocalDate.now();
+        //获取计划数量
+        String count=dayPlanId+"";
+        //用当前时间和需求数量组成流水号
+        String number="JH"+ now.getYear()+now.getMonthValue()+"-"+count;
+        amsRailOffsetDayplan.setDayplanNo(number);
+        //设置计划状态为未下发
         amsRailOffsetDayplan.setDayplanId(dayPlanId);
         amsRailOffsetDayplan.setDayplanDate(dayPlanDate);
         amsRailOffsetDayplan.setShipperId(new BigDecimal(shipperId));
@@ -91,20 +101,19 @@ public class AmsRailOffsetDayplanServiceImpl extends BaseServiceImpl<AmsRailOffs
         amsRailOffsetDayplan.setDayplanWagonNumber(new BigDecimal(dayPlanWagonNumber));
         amsRailOffsetDayplan.setDayplanConsigneeName(dayPlanConsigneeName);
         amsRailOffsetDayplan.setDayplanConsigneeTel(dayPlanConsigneeTel);
-        amsRailOffsetDayplan.setCarrierId(new BigDecimal(carrierId));
+        amsRailOffsetDayplan.setReceivingUnitId(new BigDecimal(unitId));
 //        amsRailOffsetDayplan.setDayplanSendStationId(new BigDecimal(dayPlanSendStationId));
         amsRailOffsetDayplan.setDayplanReceiveStatus(new BigDecimal(0));
         amsRailOffsetDayplan.setDeleted(new BigDecimal(0));
         //遍历物资列表添加所有发运计划物资中间表
-        List<Map<String, Object>> mapList = (List<Map<String, Object>>) mapValue.get("mapList");
+        List<Map<String, Object>> mapList = (List<Map<String, Object>>) mapValue.get("selectionList");
         for (Map<String, Object> map : mapList) {
             AmsRailOffsetMaterial amsRailOffsetMaterial = new AmsRailOffsetMaterial();
             amsRailOffsetMaterial.setOffsetMaterialId(amsRailOffsetMaterialMapper.selectMaxId());
             // 设置发运计划ID
             amsRailOffsetMaterial.setDayplanId(dayPlanId);
             amsRailOffsetMaterial.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
-            amsRailOffsetMaterial.setOffsetMaterialWeight(DataChange.dataToBigDecimal(map.get("offsetMaterialWeight")));
-            amsRailOffsetMaterial.setOffsetMaterialNumber(DataChange.dataToBigDecimal(map.get("offsetMaterialNumber")));
+            amsRailOffsetMaterial.setOffsetMaterialNumber(DataChange.dataToBigDecimal(map.get("orderPlanWeight")));
             amsRailOffsetMaterial.setInsertTime(new Date());
             amsRailOffsetMaterial.setInsertUsername("admin");
             amsRailOffsetMaterialMapper.insertSelective(amsRailOffsetMaterial);
@@ -142,9 +151,10 @@ public class AmsRailOffsetDayplanServiceImpl extends BaseServiceImpl<AmsRailOffs
     public int issueRailOffsetDayplan(List<Map<String, Object>> mapList) {
         int result = 0;
         for (Map<String,Object> map : mapList) {
-            BigDecimal dayPlanId = (BigDecimal)map.get("dayPlanId");
-            AmsRailOffsetDayplan amsRailOffsetDayplan = amsRailOffsetDayplanMapper.selectByPrimaryKey(dayPlanId);
+            Integer dayPlanId = (Integer) map.get("dayPlanId");
+            AmsRailOffsetDayplan amsRailOffsetDayplan = amsRailOffsetDayplanMapper.selectByPrimaryKey(new BigDecimal(dayPlanId));
             amsRailOffsetDayplan.setDayplanReceiveStatus(new BigDecimal(1));
+            amsRailOffsetDayplan.setCarrierId(new BigDecimal(9));
             result += amsRailOffsetDayplanMapper.updateByPrimaryKeySelective(amsRailOffsetDayplan);
         }
         return result;
@@ -181,4 +191,10 @@ public class AmsRailOffsetDayplanServiceImpl extends BaseServiceImpl<AmsRailOffs
     public List<Map<String, Object>> getdayPlanToTheStationId() {
         return amsRailOffsetDayplanMapper.getdayPlanToTheStationId();
     }
+
+    @Override
+    public List<Map<String, Object>> getRailOffsetDayplanId(Map<String, Object> mapValue) {
+        return amsRailOffsetDayplanMapper.getRailOffsetDayplanId(mapValue);
+
+    }
 }

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

@@ -236,4 +236,10 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
     public List<Map<String, Object>> getWareHouse(Map<String, Object> mapValue) {
         return amstruckInwardRequirementMapper.getWareHouse(mapValue);
     }
+
+    @Override
+    public List<Map<String, Object>> getOffsetWareHouse() {
+
+        return amstruckRequirementMaterialMapper.getOffsetWarehouse();
+    }
 }

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

@@ -174,7 +174,7 @@
             </if>
         </where>
     </sql>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+    <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
         delete
         from AMS_RAIL_OFFSET_DAYPLAN
         where DAYPLAN_ID = #{dayplanId,jdbcType=DECIMAL}
@@ -473,7 +473,7 @@
         </set>
         where DAYPLAN_ID = #{dayplanId,jdbcType=DECIMAL}
     </update>
-    <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
         <include refid="select"/>
         where DAYPLAN_ID = #{dayplanId,jdbcType=DECIMAL}
     </select>
@@ -753,13 +753,18 @@
     <!--   通过发运计划主键查询关联所有物资信息 -->
     <select id="getMaterialMesByDayPlanId" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT *
-        FROM (SELECT RM.MATERIAL_NAME AS "materailName",
+        FROM (SELECT
+        rm.material_id as "materialId",
+        rm.material_code as "materialCode",
+        rm.material_specification as "materialSpecification",
+        rm.material_model as "materialMode",
+        RM.MATERIAL_NAME AS "materailName",
         AROM.OFFSET_MATERIAL_NUMBER AS "materialNumber",
         AROM.OFFSET_MATERIAL_WEIGHT AS "materialWeight"
         FROM AMS_RAIL_OFFSET_MATERIAL AROM
         LEFT JOIN RMS_MATERIAL RM
         ON AROM.MATERIAL_ID = RM.MATERIAL_ID
-        WHERE DAY_PLAN_ID = #{dayplanId})
+        WHERE arom.dayplan_id = #{dayplanId})
         <where>
             <if test="materailName != null">
                 and
@@ -786,7 +791,110 @@
     <select id="getdayPlanToTheStationId" resultType="java.util.Map">
         SELECT RAS.ARRIVAL_ID   AS "id",
                RAS.ARRIVAL_ID   AS "value",
-               RAS.ARRIVAL_NAME AS "arrivalName"
+               RAS.ARRIVAL_NAME AS "label"
         FROM RMSTRAIN_ARRIVAL_SEND RAS
     </select>
+    <select id="getRailOffsetDayplanId" resultType="java.util.Map">
+        SELECT *
+        FROM (SELECT AROD.DAYPLAN_ID AS "dayPlanId",
+        AROD.DAYPLAN_NO AS "dayplanNo",
+        AROD.DAYPLAN_DATE AS "dayplanDate",
+        RS.SHIPPER_NAME AS "shipperName",
+        AROD.DAYPLAN_DELIVERY_DATE AS "dayplanDeliveryDate",
+        RAS.TRANSFER_UNIT AS "transferUnit",
+        AROD.DAYPLAN_OWN_CARS_AMOUT AS "dayplanOwnCarsAmout",
+        AROD.DAYPLAN_WAGON_NUMBER AS "dayplanWagonNumber",
+        RAS.ARRIVAL_NAME AS "arrivalName",
+        RAS.DAYPLAN_DEDICATED_LINE AS "dayplanDedicatedLine",
+        RW.WAREHOUSE_NAME AS "wareHouseName",
+        AROD.DAYPLAN_CONSIGNEE_NAME AS "dayplanConsigneeName",
+        AROD.DAYPLAN_CONSIGNEE_TEL AS "dayplanConsigneeTel",
+        AROD.INSERT_TIME AS "insertTime"
+        FROM AMS_RAIL_OFFSET_DAYPLAN AROD
+        LEFT JOIN RMS_SHIPPER RS
+        ON AROD.SHIPPER_ID = RS.SHIPPER_ID
+        LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS
+        ON AROD.DAYPLAN_TO_THE_STATION_ID = RAS.ARRIVAL_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = AROD.RECEIVING_UNIT_ID
+        WHERE AROD.DELETED = 0
+        and
+        arod.dayplan_id=#{dayPlanId}
+        )
+        <where>
+            <if test="dayplanNo != null">
+                and
+                <foreach collection="dayplanNo" item="item" open="(" separator="or" close=")">
+                    "dayplanNo" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="dayplanDate != null">
+                and
+                <foreach collection="dayplanDate" item="item" open="(" separator="or" close=")">
+                    "dayplanDate" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="shipperName != null">
+                and
+                <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
+                    "shipperName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="dayplanDeliveryDate != null">
+                and
+                <foreach collection="dayplanDeliveryDate" item="item" open="(" separator="or" close=")">
+                    "dayplanDeliveryDate" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="transferUnit != null">
+                and
+                <foreach collection="transferUnit" item="item" open="(" separator="or" close=")">
+                    "transferUnit" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="dayplanOwnCarsAmout != null">
+                and
+                <foreach collection="dayplanOwnCarsAmout" item="item" open="(" separator="or" close=")">
+                    "dayplanOwnCarsAmout" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="dayplanWagonNumber != null">
+                and
+                <foreach collection="dayplanWagonNumber" item="item" open="(" separator="or" close=")">
+                    "dayplanWagonNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="arrivalName != null">
+                and
+                <foreach collection="arrivalName" item="item" open="(" separator="or" close=")">
+                    "arrivalName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="dayplanDedicatedLine != null">
+                and
+                <foreach collection="dayplanDedicatedLine" item="item" open="(" separator="or" close=")">
+                    "dayplanDedicatedLine" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="wareHouseName != null">
+                and
+                <foreach collection="wareHouseName" item="item" open="(" separator="or" close=")">
+                    "wareHouseName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="dayplanConsigneeName != null">
+                and
+                <foreach collection="dayplanConsigneeName" item="item" open="(" separator="or" close=")">
+                    "dayplanConsigneeName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="dayplanConsigneeTel != null">
+                and
+                <foreach collection="dayplanConsigneeTel" item="item" open="(" separator="or" close=")">
+                    "dayplanConsigneeTel" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+    </select>
 </mapper>

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

@@ -595,8 +595,7 @@
         AIR.REQUIREMENT_WORK_ENVIRONMENT AS "requirementWorkEnvironment",
         AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
         AIP.PLAN_ID AS "planId",
-        AIP.INSERT_TIME AS "insertTime",
-        AIP.CARRIER_ID AS "carrierId"
+        AIP.INSERT_TIME AS "insertTime"
         FROM AMSTRUCK_INWARD_PLAN AIP
         LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
         ON ARP.PLAN_ID = AIP.PLAN_ID

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

@@ -265,6 +265,14 @@
     <include refid="select" />
     <include refid="whereLike" />
   </select>
+  <select id="getOffsetWarehouse" resultType="java.util.Map">
+        SELECT rw.warehouse_id   AS "id",
+       rw.warehouse_id   AS "value",
+       rw.warehouse_name AS "label"
+  FROM rms_warehouse rw
+ where rw.warehouse_type_id = 2
+
+  </select>
   <insert id="batchInsert" parameterType="java.util.List">
     insert into AMSTRUCK_REQUIREMENT_MATERIAL 
       (REQUIREMENT_MATERIAL_ID,