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

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

@@ -402,4 +402,18 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
         int i = amsContractTruckPriceService.updatePriceByPriceId(map);
         return success(i);
     }
+
+    @ApiOperation(value="查询物资")
+    @PostMapping("/getwz")
+    public RESTfulResult getwz(@RequestBody(required=false) Map<String,Object> map){
+        List<Map<String, Object>> i = amsContractTruckPriceService.getwz(map);
+        return success(i);
+    }
+
+    @ApiOperation(value="查询联动公式数据")
+    @PostMapping("/getcargonameId")
+    public RESTfulResult getcargonameId(@RequestBody(required=false) Map<String,Object> map){
+        Map<String, Object> i = amsContractTruckPriceService.getcargonameId(map);
+        return success(i);
+    }
 }

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

@@ -60,4 +60,8 @@ public interface AmsContractTruckPriceMapper extends IBaseMapper<AmsContractTran
     List<Map<String, Object>> selectInwardPrice(Map<String, Object> mapvalue);
 
     List<Map<String, Object>> getRangePoint(Map<String, Object> mapValue);
+
+    List<Map<String, Object>> selectwz(Map<String, Object> map);
+
+    Map<String, Object> getcargonameId(Map<String, Object> map);
 }

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

@@ -63,4 +63,8 @@ public interface IAmsContractTruckPriceService {
     int updatePriceById(Map<String, Object> map);
 
     int updatePriceByPriceId(Map<String, Object> map);
+
+    List<Map<String, Object>> getwz(Map<String, Object> map);
+
+    Map<String, Object> getcargonameId(Map<String, Object> map);
 }

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

@@ -672,7 +672,7 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
         int i = 0;
         BigDecimal capacityTypeId = DataChange.dataToBigDecimal(mapValue.get("capacityTypeId"));
         BigDecimal lineId = DataChange.dataToBigDecimal(mapValue.get("rangeId"));
-//        BigDecimal formulaId = DataChange.dataToBigDecimal(mapValue.get("cargonameId"));
+        BigDecimal formulaId = DataChange.dataToBigDecimal(mapValue.get("cargonameId"));
         BigDecimal priceValue = DataChange.dataToBigDecimal(mapValue.get("priceValue"));
         Date priceDate = new Date((Long)mapValue.get("priceDate"));
         BigDecimal type = DataChange.dataToBigDecimal(mapValue.get("type"));
@@ -687,10 +687,16 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
 //        amsContractTransportPrice.setOilTypeId(oilTypeId);  油品名称
         amsContractTransportPrice.setPriceValue(priceValue);
         amsContractTransportPrice.setPriceDate(priceDate);
-//        amsContractTransportPrice.setCargonameId(formulaId);
+        amsContractTransportPrice.setCargonameId(formulaId);
         amsContractTransportPrice.setPriceId(priceId);
         amsContractTransportPrice.setUpdateTime(new Date());
         i =  amsContractTruckPriceMapper.updateByPrimaryKeySelective(amsContractTransportPrice);
+        // 根据priceId先查询之前是否有物资
+//        如果有，但是接受的没有就删除
+        List<Map<String, Object>> selectwz = amsContractTruckPriceMapper.selectwz(mapValue);
+        if (!selectwz.isEmpty() && mapList.isEmpty()){
+            i = amsContaactPriceMaterialMapper.deletePriceByPriceId(mapValue.get("priceId").toString());
+        }
         //把之前的全删了，然后新增
         if (mapList!=null && mapList.size()>0) {
             i = amsContaactPriceMaterialMapper.deletePriceByPriceId(mapValue.get("priceId").toString());
@@ -709,9 +715,16 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
         return i;
     }
 
-/*    @Override
+    @Override
     public List<Map<String, Object>> getwz(Map<String, Object> map){
         List<Map<String, Object>> selectwz = amsContractTruckPriceMapper.selectwz(map);
         return selectwz;
-    }*/
+    }
+
+    @Override
+    public Map<String, Object> getcargonameId(Map<String, Object> map) {
+        Map<String, Object> value = amsContractTruckPriceMapper.getcargonameId(map);
+        return value;
+    }
+
 }

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

@@ -1063,4 +1063,28 @@
           </if>
         </where>
     </select>
+
+  <select id="selectwz" resultType="java.util.Map">
+  select
+      RMT.MATERIAL_TYPE_NAME "materialName",
+      RMT.MATERIAL_TYPE_ID "materialId"
+      from AMS_CONTAACT_PRICE_MATERIAL acpr
+      left join RMS_MATERIAL_TYPE RMT
+      on RMT.MATERIAL_TYPE_ID = acpr.MATERIAL_ID
+      where
+      RMT.MATERIAL_ISINWARD = 1
+      AND
+      PRICE_ID = #{priceId}
+      AND ACPR.DELETED = 0
+  </select>
+
+  <select id="getcargonameId" resultType="java.util.Map">
+    select
+    BF.FORMULA_ID     AS "formulaId",
+    BF.FORMULA_NAME   AS "formulaName",
+    BF.FORMULA_STRING AS "formulaString"
+    from AMS_CONTRACT_TRANSPORT_PRICE t
+    left join BMSTRUCK_FORMULA bf on t.cargoname_id=bf.formula_id
+    where price_id=#{priceId}
+  </select>
 </mapper>