修改价格信息，增加物料品名下

拉框

src/main/java/com/th/demo/controller/maint/MaterialController.java

@@ -69,6 +69,21 @@ public class MaterialController {
             return result;
         }
     }
+
+    @RequestMapping(value = "/queryMaterialName.do")//查询方法 前两个参数是分页参数
+    public String queryMaterialName( HttpServletRequest request) {
+
+        try {
+            String userId = (String) request.getAttribute("userId");
+            String belongId = (String) request.getAttribute("belongId");
+            result = materialService.queryMaterialName(userId,belongId);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        } finally {
+            return result;
+        }
+    }
 //
 
 }

src/main/java/com/th/demo/mapping/maint/MaterialMapper.java

@@ -22,4 +22,5 @@ public interface MaterialMapper {
     Material selectByNameStandard(String materialName, String standard, String belongId);
 
     List<Material> selectListByNameStandard(String materialName, String standard, String belongId);
+    List<Material> selectMaterialName(String belongId);
 }

src/main/java/com/th/demo/mapping/maint/PriceMapper.java

@@ -21,9 +21,9 @@ public interface PriceMapper {
 
     Price selectByMaterialChangeTime(String materialId, int changeTime,String belongId);
 
-    List<Price> select(String materialName, String belongId);
+    List<Price> select(String customerName, String belongId,String materialName);
 
-    List<Price> selectListByCustomer(String materialName, String belongId);
+    List<Price> selectListByCustomer(String customerName, String belongId,String materialName);
 
     int selectCntByMaterialChangeTime(String id, int i, String belongId);
 

src/main/java/com/th/demo/model/maint/Price.java

@@ -34,6 +34,8 @@ public class Price {
     private String storageType;
 
     private Customer customer;
+    private String materialName;
+    private String payWay;
     private double keepDay;
     private double ordPrice;
     private double outOrdPrice;
@@ -181,4 +183,20 @@ public class Price {
     public void setOutOrdPrice(double outOrdPrice) {
         this.outOrdPrice = outOrdPrice;
     }
+
+    public String getMaterialName() {
+        return materialName;
+    }
+
+    public void setMaterialName(String materialName) {
+        this.materialName = materialName;
+    }
+
+    public String getPayWay() {
+        return payWay;
+    }
+
+    public void setPayWay(String payWay) {
+        this.payWay = payWay;
+    }
 }

src/main/java/com/th/demo/service/impl/maint/MaterialServiceImpl.java

@@ -87,4 +87,13 @@ public class MaterialServiceImpl implements MaterialService {
         return result;
 
     }
+
+    @Override
+    public String queryMaterialName(String userId, String belongId) {
+
+        List<Material> list = new ArrayList<Material>();
+        list = materialMapper.selectMaterialName( belongId);
+        result = JSONTools.toString(list);
+        return result;
+    }
 }

src/main/java/com/th/demo/service/impl/maint/PriceServiceImpl.java

@@ -34,7 +34,7 @@ public class PriceServiceImpl implements PriceService {
     @Override
     public String query(int page, int rows, String customerName, String userId, String belongId) {
         PageHelper.startPage(page, rows);
-        List<Price> list = priceMapper.select(customerName, belongId);
+        List<Price> list = priceMapper.select(customerName, belongId,"");
         PageInfo<Price> pageInfo = new PageInfo<>(list);
         result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
         return result;
@@ -44,7 +44,7 @@ public class PriceServiceImpl implements PriceService {
     public String save(String json, String userId, String belongId) {
         Price price = JSON.parseObject(json,new TypeReference<Price>(){});
         if(price.getId()==null||price.getId().equals("")){
-            List<Price> priceList = priceMapper.selectListByCustomer(price.getCustomer().getId(),belongId);
+            List<Price> priceList = priceMapper.selectListByCustomer(price.getCustomer().getId(),belongId,"");
             if (priceList.size() >= 1){
                 return JSONTools.toString(1,"该客户的价格已维护，请勿重复维护");
             }
@@ -56,7 +56,7 @@ public class PriceServiceImpl implements PriceService {
             price.setBelongId(belongId);
             num += priceMapper.insert(price);
         }else {
-            List<Price> priceList = priceMapper.selectListByCustomer(price.getCustomer().getName(),belongId);
+            List<Price> priceList = priceMapper.selectListByCustomer(price.getCustomer().getName(),belongId,price.getMaterialName());
             if (priceList.size() == 1 && !price.getId().equals(priceList.get(0).getId())){
                 return JSONTools.toString(1,"该客户的价格已维护，请勿重复维护");
             } else if (priceList.size() > 1) {

src/main/java/com/th/demo/service/impl/ware/InServiceImpl.java

@@ -244,7 +244,7 @@ public class InServiceImpl implements InService {
 //                throw new Exception(listSameStack.get(m).getMaterial().getName()+"价格未维护");
 //            }
             // listSameStack.get(m).setInvoicePrice(prodPrice.getInvoicePrice());
-            List<Price> priceList = priceMapper.selectListByCustomer(listSameStack.get(m).getFkComponyId(),belongId);
+            List<Price> priceList = priceMapper.selectListByCustomer(listSameStack.get(m).getFkComponyId(),belongId,listSameStack.get(m).getMaterial().getName());
             if (priceList.size() >= 1){
                 listSameStack.get(m).setKeepDay(priceList.get(0).getKeepDay());
                 listSameStack.get(m).setOrdPrice(priceList.get(0).getOrdPrice());

src/main/java/com/th/demo/service/maint/MaterialService.java

@@ -6,4 +6,6 @@ public interface MaterialService {
     String save(String json, String userId, String belongId);
 
     String remove(String id, String userId);
+
+    String queryMaterialName(String userId, String belongId);
 }

src/main/resource/mapper/maint/MaterialMapper.xml

@@ -220,6 +220,14 @@
       and ifnull(cancel_flag,'0') = '0'
   </select>
 
+  <select id="selectMaterialName" resultMap="BaseResultMap" >
+    select distinct name
+    from t_maint_material
+    where 1=1
+      and   belong_id = #{param3,jdbcType=VARCHAR}
+      and ifnull(cancel_flag,'0') = '0'
+  </select>
+
 
 
 

src/main/resource/mapper/maint/PriceMapper.xml

@@ -18,6 +18,8 @@
     <result column="keep_day" property="keepDay" jdbcType="DOUBLE" />
     <result column="ord_price" property="ordPrice" jdbcType="DOUBLE" />
     <result column="out_ord_price" property="outOrdPrice" jdbcType="DOUBLE" />
+    <result column="material_name" property="materialName" jdbcType="VARCHAR" />
+    <result column="pay_way" property="payWay" jdbcType="VARCHAR" />
 
       <association  column="material_id" property="material" select="com.th.demo.mapping.maint.MaterialMapper.selectByPrimaryKey" />
       <association  column="add_id" property="addUser" select="com.th.demo.mapping.system.SysUserMapper.selectByPrimaryKey" />
@@ -28,7 +30,7 @@
   <sql id="Base_Column_List" >
     id, material_id, storage_price,transfer_price, weight_price, add_id, add_time,
     modify_id, modify_time, cancel_id, cancel_time, cancel_flag, belong_id,storage_type,
-      keep_day,ord_price,out_ord_price,customer_id
+      keep_day,ord_price,out_ord_price,customer_id,material_name,pay_way
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -51,13 +53,13 @@
       add_time, modify_id, modify_time, 
       cancel_id, cancel_time, cancel_flag, 
       belong_id,storage_type,
-    keep_day,ord_price,out_ord_price,customer_id)
+    keep_day,ord_price,out_ord_price,customer_id,material_name,pay_way)
     values (#{id,jdbcType=VARCHAR}, #{material.id,jdbcType=VARCHAR}, #{storagePrice,jdbcType=DOUBLE},
       #{transferPrice,jdbcType=DOUBLE}, #{weightPrice,jdbcType=DOUBLE}, #{addUser.id,jdbcType=VARCHAR},
       #{addTime,jdbcType=TIMESTAMP}, #{modifyUser.id,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP},
       #{cancelId,jdbcType=VARCHAR}, #{cancelTime,jdbcType=TIMESTAMP}, #{cancelFlag,jdbcType=VARCHAR}, 
       #{belongId,jdbcType=VARCHAR},#{storageType,jdbcType=VARCHAR}, #{keepDay,jdbcType=DOUBLE},
-      #{ordPrice,jdbcType=DOUBLE},#{outOrdPrice,jdbcType=DOUBLE},#{customer.id,jdbcType=VARCHAR})
+      #{ordPrice,jdbcType=DOUBLE},#{outOrdPrice,jdbcType=DOUBLE},#{customer.id,jdbcType=VARCHAR},#{materialName,jdbcType=VARCHAR},#{payWay,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.th.demo.model.maint.Price" >
     insert into t_maint_price
@@ -204,7 +206,9 @@ transfer_price,
         keep_day = #{keepDay,jdbcType=DOUBLE},
       ord_price = #{ordPrice,jdbcType=DOUBLE},
       out_ord_price = #{outOrdPrice,jdbcType=DOUBLE},
-      customer_id = #{customer.id,jdbcType=VARCHAR}
+      customer_id = #{customer.id,jdbcType=VARCHAR},
+        material_name = #{materialName,jdbcType=VARCHAR},
+        pay_way = #{payWay,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 
@@ -221,6 +225,7 @@ transfer_price,
     select  t.*   from t_maint_price t ,t_maint_customer d
     where t.customer_id = d.id
     and d.name like concat('%',#{param1,jdbcType=VARCHAR},'%')
+    and t.material_name like concat('%',#{param3,jdbcType=VARCHAR},'%')
      and t.belong_id=#{param2,jdbcType=VARCHAR}
       and t.cancel_flag = '0'
   </select>
@@ -239,6 +244,7 @@ transfer_price,
     where 1=1
       and t.customer_id = #{param1,jdbcType=VARCHAR}
       and t.belong_id = #{param2,jdbcType=VARCHAR}
+      and t.material_name = #{param3,jdbcType=VARCHAR}
       and t.cancel_flag = '0'
   </select>
 </mapper>