dev

pom.xml

@@ -106,13 +106,13 @@
                 <version>3.0</version>
                 <configuration>
                     <connUrl>jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri</connUrl>
-                    <user>DAGANG</user>
-                    <password>root123</password>
+                    <user>dil</user>
+                    <password>Dil123789</password>
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
 <!--                        <param>AMS_SALE_ORDER</param>&lt;!&ndash;销售计划&ndash;&gt;-->
-                        <param>OMSTRAIN_ORDER</param>-->
+                        <param>AMS_CONTAACT_PRICE_MATERIAL</param>-->
                     </tables>
                 </configuration>
                 <executions>

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

@@ -339,4 +339,12 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
     public RESTfulResult insertLineNodePoint(@RequestBody(required = false)Map<String,Object>map){
         return success(amsContractTruckPriceService.insertLineNodePoint(map));
     }
+
+    @ApiOperation("根据汽运ID修改单价")
+    @PostMapping("updatePriceById")
+    public RESTfulResult updatePriceById(@RequestBody(required = false) Map<String,Object> map){
+        //
+        int i = amsContractTruckPriceService.updatePriceById(map);
+        return success(i);
+    }
 }

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

@@ -291,5 +291,14 @@ public class AmsSaleOrderMaterialController extends BaseRESTfulController {
         return success(priceMap);
     }
 
+    @ApiOperation("批量保存内转钢材到异地库收货单位和发站")
+    @PostMapping("batchUpdateInwardConsignee")
+    public RESTfulResult batchUpdateInwardConsignee(@RequestBody List<Map<String,Object>> maplist){
+        int i = 0;
+        for(Map<String,Object> map : maplist){
+            i += amsSaleOrderMaterialService.updateInwardConsignee(map);
+        }
+        return success(i);
 
+    }
 }

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

@@ -25,6 +25,12 @@ public class AmsContaactPriceMaterial implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="物资ID",required=false)
     private BigDecimal materialId;
 
+    /**
+     * 逻辑删除,0,未删除，1删除(DELETED,DECIMAL,0)
+     */
+    @ApiModelProperty(value="逻辑删除,0,未删除，1删除",required=false)
+    private BigDecimal deleted;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -61,6 +67,14 @@ public class AmsContaactPriceMaterial implements IBasePO<BigDecimal> {
         this.materialId = materialId;
     }
 
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -70,6 +84,7 @@ public class AmsContaactPriceMaterial implements IBasePO<BigDecimal> {
         sb.append(", priceMaterialId=").append(priceMaterialId);
         sb.append(", priceId=").append(priceId);
         sb.append(", materialId=").append(materialId);
+        sb.append(", deleted=").append(deleted);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -60,4 +60,6 @@ public interface IAmsContractTruckPriceService {
 
     int insertLineNodePoint(Map<String, Object> map);
 
+    int updatePriceById(Map<String, Object> map);
+
 }

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

@@ -580,6 +580,7 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
             amsContaactPriceMaterial.setId(amsContractTruckPriceMapper.selectPriceMaterialMaxId());
             amsContaactPriceMaterial.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
             amsContaactPriceMaterial.setPriceId(amsContractTransportPrice.getPriceId());
+            amsContaactPriceMaterial.setDeleted(new BigDecimal(0));
             i = amsContaactPriceMaterialMapper.insertSelective(amsContaactPriceMaterial);
         }
         return i;
@@ -640,4 +641,17 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
         int i = rmsLineNodePointMapper.insertSelective(rmsLineNodePoint);
         return i;
     }
+
+    @Override
+    public int updatePriceById(Map<String, Object> map) {
+        int count = 0;
+        //获取单价ID
+        BigDecimal priceId = DataChange.dataToBigDecimal(map.get("priceId"));
+        //获取物资详ID
+        List<Map<String, Object>> materialTypeList = (List<Map<String,Object>>)map.get("materialTypeList");
+        for (Map<String,Object> materialTypeMap:materialTypeList){
+
+        }
+        return count;
+    }
 }

src/main/resources/application-prod.yml

@@ -13,7 +13,7 @@ openfeign:
    ESFeign:
      url: ${ESFEIGN_URL:172.16.33.166:8089}
    ColumnDataFeign:
-     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+     url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
    TmsTruckFeign:
       url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
    ImFeign:

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

@@ -5,12 +5,13 @@
     <id column="PRICE_MATERIAL_ID" jdbcType="DECIMAL" property="priceMaterialId" />
     <result column="PRICE_ID" jdbcType="DECIMAL" property="priceId" />
     <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId" />
+    <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
   </resultMap>
   <sql id="columns">
-    PRICE_MATERIAL_ID, PRICE_ID, MATERIAL_ID
+    PRICE_MATERIAL_ID, PRICE_ID, MATERIAL_ID, DELETED
   </sql>
   <sql id="columns_alias">
-    t.PRICE_MATERIAL_ID, t.PRICE_ID, t.MATERIAL_ID
+    t.PRICE_MATERIAL_ID, t.PRICE_ID, t.MATERIAL_ID, t.DELETED
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM AMS_CONTAACT_PRICE_MATERIAL
@@ -29,6 +30,9 @@
       <if test="materialId != null">
         and MATERIAL_ID = #{materialId}
       </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -42,6 +46,9 @@
       <if test="materialId != null">
         and MATERIAL_ID = #{materialId}
       </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
@@ -51,18 +58,21 @@
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from AMS_CONTAACT_PRICE_MATERIAL
     where 1!=1
-      <if test="priceId != null">
-        or PRICE_ID = #{priceId}
-      </if>
-      <if test="materialId != null">
-        or MATERIAL_ID = #{materialId}
-      </if>
+    <if test="priceId != null">
+      or PRICE_ID = #{priceId}
+    </if>
+    <if test="materialId != null">
+      or MATERIAL_ID = #{materialId}
+    </if>
+    <if test="deleted != null">
+      or DELETED = #{deleted}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.AmsContaactPriceMaterial">
-    insert into AMS_CONTAACT_PRICE_MATERIAL (PRICE_MATERIAL_ID, PRICE_ID, MATERIAL_ID
-      )
-    values (#{priceMaterialId,jdbcType=DECIMAL}, #{priceId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL}
-      )
+    insert into AMS_CONTAACT_PRICE_MATERIAL (PRICE_MATERIAL_ID, PRICE_ID, MATERIAL_ID,
+                                             DELETED)
+    values (#{priceMaterialId,jdbcType=DECIMAL}, #{priceId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL},
+            #{deleted,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsContaactPriceMaterial">
     insert into AMS_CONTAACT_PRICE_MATERIAL
@@ -76,6 +86,9 @@
       <if test="materialId != null">
         MATERIAL_ID,
       </if>
+      <if test="deleted != null">
+        DELETED,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="priceMaterialId != null">
@@ -87,12 +100,16 @@
       <if test="materialId != null">
         #{materialId,jdbcType=DECIMAL},
       </if>
+      <if test="deleted != null">
+        #{deleted,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsContaactPriceMaterial">
     update AMS_CONTAACT_PRICE_MATERIAL
     set PRICE_ID = #{priceId,jdbcType=DECIMAL},
-      MATERIAL_ID = #{materialId,jdbcType=DECIMAL}
+        MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
+        DELETED = #{deleted,jdbcType=DECIMAL}
     where PRICE_MATERIAL_ID = #{priceMaterialId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsContaactPriceMaterial">
@@ -104,6 +121,9 @@
       <if test="materialId != null">
         MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
       </if>
+      <if test="deleted != null">
+        DELETED = #{deleted,jdbcType=DECIMAL},
+      </if>
     </set>
     where PRICE_MATERIAL_ID = #{priceMaterialId,jdbcType=DECIMAL}
   </update>
@@ -119,36 +139,41 @@
     <include refid="select" />
     <include refid="whereLike" />
   </select>
-
   <insert id="batchInsert" parameterType="java.util.List">
     insert into AMS_CONTAACT_PRICE_MATERIAL
-      (PRICE_MATERIAL_ID,
-      PRICE_ID, MATERIAL_ID)
+    (PRICE_MATERIAL_ID,
+    PRICE_ID, MATERIAL_ID, DELETED
+    )
     ( <foreach collection="list" item="item" separator="union all">
-   select
-      #{item.priceMaterialId,jdbcType=DECIMAL},
-      #{item.priceId,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL} from dual
-   </foreach> )
+    select
+    #{item.priceMaterialId,jdbcType=DECIMAL},
+    #{item.priceId,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL}, #{item.deleted,jdbcType=DECIMAL}
+    from dual
+  </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
-     update AMS_CONTAACT_PRICE_MATERIAL
-     set
-       PRICE_MATERIAL_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case PRICE_MATERIAL_ID" separator=" ">
-          when #{item.priceMaterialId,jdbcType=DECIMAL} then #{item.priceMaterialId,jdbcType=DECIMAL}
-       </foreach>
-       ,PRICE_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case PRICE_MATERIAL_ID" separator=" ">
-          when #{item.priceMaterialId,jdbcType=DECIMAL} then #{item.priceId,jdbcType=DECIMAL}
-       </foreach>
-       ,MATERIAL_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case PRICE_MATERIAL_ID" separator=" ">
-          when #{item.priceMaterialId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
-       </foreach>
-     where PRICE_MATERIAL_ID in
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.priceMaterialId,jdbcType=DECIMAL}
-     </foreach>
+    update AMS_CONTAACT_PRICE_MATERIAL
+    set
+    PRICE_MATERIAL_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case PRICE_MATERIAL_ID" separator=" ">
+      when #{item.priceMaterialId,jdbcType=DECIMAL} then #{item.priceMaterialId,jdbcType=DECIMAL}
+    </foreach>
+    ,PRICE_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case PRICE_MATERIAL_ID" separator=" ">
+      when #{item.priceMaterialId,jdbcType=DECIMAL} then #{item.priceId,jdbcType=DECIMAL}
+    </foreach>
+    ,MATERIAL_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case PRICE_MATERIAL_ID" separator=" ">
+      when #{item.priceMaterialId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
+    </foreach>
+    ,DELETED=
+    <foreach close="end" collection="list" index="index" item="item" open="case PRICE_MATERIAL_ID" separator=" ">
+      when #{item.priceMaterialId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+    </foreach>
+    where PRICE_MATERIAL_ID in
+    <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+      #{item.priceMaterialId,jdbcType=DECIMAL}
+    </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from AMS_CONTAACT_PRICE_MATERIAL
@@ -172,5 +197,6 @@
     RMT.MATERIAL_ISINWARD = 1
     AND
     PRICE_ID = #{priceId}
+    AND ACPR.DELETED = 0
   </select>
 </mapper>

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

@@ -919,6 +919,7 @@
       on rtr.trans_range_id = actp.line_id
       where type = #{type}
       and actp.DELETED = 0
+      and acpm.DELETED = 0
       <if test="rangeId != null">
         and actp.LINE_ID = #{rangeId}
       </if>