Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-RMS-API

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

@@ -2,6 +2,7 @@ package com.steerinfo.dil.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.steerinfo.dil.feign.ESFeign;
+import com.steerinfo.dil.mapper.RmsMaterialTypeMapper;
 import com.steerinfo.dil.service.impl.RmsMaterialTypeServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
@@ -33,6 +34,8 @@ public class RmsMaterialTypeController extends BaseRESTfulController {
     @Autowired
     RmsMaterialTypeServiceImpl rmsMaterialTypeService;
     @Autowired
+    RmsMaterialTypeMapper rmsMaterialTypeMapper;
+    @Autowired
     ColumnDataUtil columnDataUtil;
 
     @Autowired
@@ -87,6 +90,31 @@ public class RmsMaterialTypeController extends BaseRESTfulController {
         return success(data);
     }
 
+    //删除内转物资信息
+    @PostMapping(value = "/deleteMaterialForInward")
+    public RESTfulResult deleteMaterialForInward(@RequestBody(required = false) Map<String,Object> mapValue){
+        Object materialTypeId = mapValue.get("materialTypeId");
+        if (materialTypeId!=null){
+            rmsMaterialTypeMapper.deleteMaterialForInward(mapValue);
+            return success("删除成功");
+        }else {
+            return failed("删除失败");
+        }
+    }
+
+
+    //改变内转物资信息
+    @PostMapping(value = "/updateMaterialForInward")
+    public RESTfulResult updateMaterialForInward(@RequestBody(required = false) Map<String,Object> mapValue){
+        Object materialTypeId = mapValue.get("materialTypeId");
+        if (materialTypeId!=null){
+            rmsMaterialTypeMapper.updateMaterialForInward(mapValue);
+            return success("修改成功");
+        }else {
+            return failed("修改失败");
+        }
+    }
+
     /**
      * 新增货物品名
      * @param mapValue

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

@@ -8,6 +8,7 @@ import com.steerinfo.dil.service.IRmsOilPriceService;
 import com.steerinfo.dil.service.impl.RmsCarDriverServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
@@ -103,7 +104,14 @@ public class RmsOilPriceController extends BaseRESTfulController {
     @PostMapping(value = "/updateOilPrice")
     public RESTfulResult updateOilPrice(@RequestBody(required = false) Map<String, Object> map){
         Integer priceId = (Integer) map.get("priceId");
-        int result = rmsOilPriceService.updateOilPrice(priceId);
+        String type = (String) map.get("transportationType");
+        BigDecimal transportationType=BigDecimal.ZERO;
+        if (type.equals("销售")){
+            transportationType=BigDecimal.valueOf(1);
+        }else if (type.equals("内转")){
+            transportationType=BigDecimal.valueOf(2);
+        }
+        int result = rmsOilPriceService.updateOilPrice(priceId,transportationType);
         return success(result);
     }
 

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

@@ -22,4 +22,8 @@ public interface RmsMaterialTypeMapper extends IBaseMapper<RmsMaterialType, BigD
     @Select("select seq__RMS_MATERIAL_TYPE.nextval from dual")
     BigDecimal getMaterialTypeId();
 
+    int updateMaterialForInward(Map<String,Object>  map);
+
+    int deleteMaterialForInward(Map<String,Object> map);
+
 }

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

@@ -21,8 +21,10 @@ public interface RmsOilPriceMapper extends IBaseMapper<RmsOilPrice, BigDecimal>
     //根据Id寻找油价
     Map<String, Object> getOilPriceById(BigDecimal id);
 
+    Map<String, Object> getOilPriceByIdNew(BigDecimal id,BigDecimal transportationType);
+
     //通过油品ID获取上一次油品价格
-    Map<String, Object> getLastOilPrice(BigDecimal oilNameId);
+    Map<String, Object> getLastOilPrice(BigDecimal oilNameId,BigDecimal transportationType);
 
     //关闭油价
     int closeLastOilPrice(Map<String, Object> map);

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

@@ -81,6 +81,20 @@ public class RmsOilPrice implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="浮动比例",required=false)
     private BigDecimal floatingScale;
 
+    /**
+     * 运输类型
+     */
+    @ApiModelProperty(value = "运输类型",required = false)
+    private BigDecimal transportationType;
+
+    public BigDecimal getTransportationType() {
+        return transportationType;
+    }
+
+    public void setTransportationType(BigDecimal transportationType) {
+        this.transportationType = transportationType;
+    }
+
     private static final long serialVersionUID = 1L;
 
     @Override

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

@@ -27,7 +27,7 @@ public interface IRmsOilPriceService{
 
     int insertOilPrice(Map<String,Object> map);
 
-    int updateOilPrice(Integer id);
+    int updateOilPrice(Integer id,BigDecimal transportationType);
 
     int deleteOilPrice(BigDecimal id);
 

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

@@ -63,10 +63,10 @@ public class RmsOilPriceServiceImpl implements IRmsOilPriceService {
      **/
     @Transactional
     @Override
-    public int updateOilPrice(Integer id) {
+    public int updateOilPrice(Integer id,BigDecimal transportationType) {
         RmsOilPrice rmsOilPrice = new RmsOilPrice();
         //查询该启用油价的信息
-        Map<String, Object> mesMap = rmsOilPriceMapper.getOilPriceById(new BigDecimal(id));
+        Map<String, Object> mesMap = rmsOilPriceMapper.getOilPriceByIdNew(new BigDecimal(id),transportationType);
         if(DataChange.dataToBigDecimal(mesMap.get("priceStatus")).intValue() == 0){
             return 0;
         }else{
@@ -124,6 +124,8 @@ public class RmsOilPriceServiceImpl implements IRmsOilPriceService {
     @Transactional
     @Override
     public int insertOilPrice(Map<String,Object> map) {
+        //运输类型
+        BigDecimal transportationType = DataChange.dataToBigDecimal(map.get("transportationType"));
         RmsOilPrice rmsOilPrice = new RmsOilPrice();
         rmsOilPrice.setPriceId(rmsOilPriceMapper.selectOilPriceId());
         //获取油品ID、油价日期、油价
@@ -133,7 +135,7 @@ public class RmsOilPriceServiceImpl implements IRmsOilPriceService {
         BigDecimal priceValue = DataChange.dataToBigDecimal(map.get("priceValue"));
         rmsOilPrice.setPriceValue(priceValue);
         //根据油品ID获取上一次油价价格计算油价浮动
-        Map<String, Object> mesMap = rmsOilPriceMapper.getLastOilPrice(oilTypeId);
+        Map<String, Object> mesMap = rmsOilPriceMapper.getLastOilPrice(oilTypeId,transportationType);
         BigDecimal n = null; //浮动比例
         if(mesMap != null){
             BigDecimal lastPrice = DataChange.dataToBigDecimal(mesMap.get("priceValue"));
@@ -155,6 +157,7 @@ public class RmsOilPriceServiceImpl implements IRmsOilPriceService {
             if(priceStatus && n.compareTo(BigDecimal.ZERO)==-1){
                 if(mesMap != null){
                     map.put("oilTypeId", oilTypeId);
+                    map.put("type",transportationType);
                     rmsOilPriceMapper.closeLastOilPrice(map);
                 }
                 //设置启用状态
@@ -164,6 +167,7 @@ public class RmsOilPriceServiceImpl implements IRmsOilPriceService {
                 updateMesMap.put("oilTypeId",oilTypeId);
                 updateMesMap.put("newOilPrice", priceValue);
                 updateMesMap.put("priceDate",rmsOilPrice.getPriceDate());
+                updateMesMap.put("type",transportationType);
                 amsFeign.batchUpdateTransportPriceByOilPrice1(updateMesMap);
             }else {
                 //否则设置停用状态
@@ -173,6 +177,7 @@ public class RmsOilPriceServiceImpl implements IRmsOilPriceService {
         rmsOilPrice.setInsertUsername("admin");
         rmsOilPrice.setInsertTime(new Date());
         rmsOilPrice.setDeleted(new BigDecimal(0));
+        rmsOilPrice.setTransportationType(transportationType);
         return rmsOilPriceMapper.insertSelective(rmsOilPrice);
     }
 

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

@@ -505,6 +505,18 @@
   </where>
   <include refid="orderBy"></include>
 </select>
+
+  <delete id="deleteMaterialForInward">
+      delete  RMS_MATERIAL_TYPE RMT
+      where RMT.MATERIAL_TYPE_ID=#{materialTypeId}
+  </delete>
+
+  <update id="updateMaterialForInward">
+    update RMS_MATERIAL_TYPE RMT
+    set RMT.MATERIAL_TYPE_NAME=#{materialTypeName}
+    where RMT.MATERIAL_TYPE_ID=#{materialTypeId}
+  </update>
+
   <select id="getInwardContractMaterial" resultType="java.util.Map">
     select RMT.MATERIAL_TYPE_ID "materialTypeId",
            RMT.MATERIAL_TYPE_NAME "materialTypeName"

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

@@ -14,15 +14,16 @@
     <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
     <result column="PRICE_STATUS" jdbcType="DECIMAL" property="priceStatus" />
     <result column="FLOATING_SCALE" jdbcType="DECIMAL" property="floatingScale" />
+    <result column="TRANSPORT_TYPE" jdbcType="DECIMAL" property="transportationType" />
   </resultMap>
   <sql id="columns">
     PRICE_ID, PRICE_OIL_TYPE_ID, PRICE_VALUE, PRICE_DATE, INSERT_USERNAME, INSERT_TIME, 
-    UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, PRICE_STATUS, FLOATING_SCALE
+    UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, PRICE_STATUS, FLOATING_SCALE,TRANSPORT_TYPE
   </sql>
   <sql id="columns_alias">
     t.PRICE_ID, t.PRICE_OIL_TYPE_ID, t.PRICE_VALUE, t.PRICE_DATE, t.INSERT_USERNAME, 
     t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, 
-    t.PRICE_STATUS, t.FLOATING_SCALE
+    t.PRICE_STATUS, t.FLOATING_SCALE,t.TRANSPORT_TYPE
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM RMS_OIL_PRICE
@@ -202,6 +203,9 @@
       <if test="floatingScale != null">
         FLOATING_SCALE,
       </if>
+      <if test="transportationType!=null ">
+        TRANSPORT_TYPE
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="priceId != null">
@@ -240,6 +244,9 @@
       <if test="floatingScale != null">
         #{floatingScale,jdbcType=DECIMAL},
       </if>
+      <if test="transportationType!=null">
+        #{transportationType,jdbcType=DECIMAL}
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsOilPrice">
@@ -406,7 +413,11 @@
           then '启用'
           when ROP.PRICE_STATUS = 1
           then '停用'
-     end ) "priceStatus"
+     end ) "priceStatus",
+    case when ROP.TRANSPORT_TYPE=1
+    then '销售'
+    when ROP.TRANSPORT_TYPE=2
+    then '内转' end "transportType"
     FROM RMS_OIL_PRICE ROP
     left join RMS_OIL_TYPE ROT
         on ROP.PRICE_OIL_TYPE_ID = ROT.OIL_TYPE_ID
@@ -482,7 +493,20 @@
       ROP.FLOATING_SCALE    "floatingScale"
     FROM RMS_OIL_PRICE ROP
     WHERE ROP.PRICE_ID=#{id}
+  </select>
 
+  <!--根据Id查询油价-->
+  <select id="getOilPriceByIdNew" parameterType="map" resultType="java.util.LinkedHashMap" >
+    SELECT
+      ROP.PRICE_ID AS "priceId",
+      ROP.PRICE_OIL_TYPE_ID AS "oilTypeId", --批量修改运输单价
+      ROP.PRICE_VALUE AS "newOilPrice", --批量修改运输单价
+      ROP.PRICE_DATE AS "priceDate",
+      ROP.PRICE_STATUS  "priceStatus",
+      ROP.FLOATING_SCALE    "floatingScale",
+      ROP.TRANSPORT_TYPE    "type"
+    FROM RMS_OIL_PRICE ROP
+    WHERE ROP.PRICE_ID=#{id} and ROP.TRANSPORT_TYPE=#{transportationType}
   </select>
 
 <!-- 通过油品ID获取上一次油品价格 -->
@@ -493,6 +517,7 @@
     where ROP.PRICE_OIL_TYPE_ID = #{oilNameId}
       and ROP.DELETED = 0
       and ROP.PRICE_STATUS = 0
+      and ROP.TRANSPORT_TYPE=#{transportationType}
   </select>
 
 <!-- 关闭之前当前油品所有正在启用的油价 -->
@@ -500,6 +525,7 @@
     update RMS_OIL_PRICE RP
         set RP.PRICE_STATUS = 1
     where RP.PRICE_OIL_TYPE_ID = #{oilTypeId} and RP.PRICE_STATUS = 0
+      and RP.TRANSPORT_TYPE=#{type}
   </update>
 
   <delete id="deleteOilPrice">