修改价格界面逻辑

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

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

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

@@ -1,6 +1,7 @@
 package com.th.demo.model.maint;
 
 import com.th.demo.model.system.SysUser;
+import com.th.demo.model.maint.Customer;
 
 import java.util.Date;
 
@@ -33,6 +34,44 @@ public class Price {
 
     private String   storageType;
 
+    // 20250324新增字段
+    private Customer customer;
+    private int keepDay;
+    private double ordPrice;
+    private double outOrdPrice;
+
+    public Customer getCustomer() {
+        return customer;
+    }
+
+    public void setCustomer(Customer customer) {
+        this.customer = customer;
+    }
+
+    public int getKeepDay() {
+        return keepDay;
+    }
+
+    public void setKeepDay(int keepDay) {
+        this.keepDay = keepDay;
+    }
+
+    public double getOrdPrice() {
+        return ordPrice;
+    }
+
+    public void setOrdPrice(double ordPrice) {
+        this.ordPrice = ordPrice;
+    }
+
+    public double getOutOrdPrice() {
+        return outOrdPrice;
+    }
+
+    public void setOutOrdPrice(double outOrdPrice) {
+        this.outOrdPrice = outOrdPrice;
+    }
+
     public String getId() {
         return id;
     }

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

@@ -6,8 +6,10 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.th.demo.mapping.maint.PriceMapper;
 import com.th.demo.mapping.maint.ProdPriceMapper;
+import com.th.demo.mapping.maint.CustomerMapper;
 import com.th.demo.model.maint.Price;
 import com.th.demo.model.maint.ProdPrice;
+import com.th.demo.model.maint.Customer;
 import com.th.demo.model.system.SysUser;
 import com.th.demo.model.system.Type;
 import com.th.demo.service.maint.PriceService;
@@ -26,6 +28,8 @@ public class PriceServiceImpl implements PriceService {
     public PriceMapper priceMapper;
     @Autowired
     ProdPriceMapper prodPriceMapper;
+    @Autowired
+    public CustomerMapper customerMapper;
 
     String result = Type.FAIL;
     int num = 0;
@@ -33,7 +37,7 @@ public class PriceServiceImpl implements PriceService {
     @Override
     public String query(int page, int rows, String materialName,String standard, String userId, String belongId) {
         PageHelper.startPage(page, rows);
-        List<Price> list = priceMapper.select(  materialName,standard, belongId);
+        List<Price> list = priceMapper.select(materialName,belongId);
         PageInfo<Price> pageInfo = new PageInfo<>(list);
         result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
         return result;
@@ -43,7 +47,13 @@ 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("")){
-            int priceCnt = priceMapper.selectCntByMaterialChangeTime(price.getMaterial().getId(),Integer.parseInt(price.getStorageType()) , belongId);
+            Customer customers = customerMapper.selectByName(price.getCustomer().getName(),belongId);
+            if (customers.getId()==null||customers.getId().equals("")){
+                result = JSONTools.toStringyyyyMMddHHmmss(0);
+                result = "该客户名称不存才";
+                return result;
+            }
+            int priceCnt = priceMapper.selectCntByMaterialChangeTime(customers.getId(),0 , belongId);
             if(priceCnt > 0){
                 result = JSONTools.toStringyyyyMMddHHmmss(0);
                 result = "已存在该价格信息";

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

@@ -16,14 +16,19 @@
     <result column="cancel_flag" property="cancelFlag" jdbcType="VARCHAR" />
     <result column="belong_id" property="belongId" jdbcType="VARCHAR" />
 
+    <result column="keep_day" property="keepDay" jdbcType="INTEGER" />
+    <result column="ord_price" property="ordPrice" jdbcType="DOUBLE" />
+    <result column="out_ord_price" property="outOrdPrice" jdbcType="DOUBLE" />
+
       <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" />
     <association  column="modify_id" property="modifyUser" select="com.th.demo.mapping.system.SysUserMapper.selectByPrimaryKey" />
+    <association  column="customer_id" property="customer" select="com.th.demo.mapping.maint.CustomerMapper.selectByPrimaryKey" />
 
   </resultMap>
   <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
+    modify_id, modify_time, cancel_id, cancel_time, cancel_flag, belong_id,storage_type,customer_id,keep_day,ord_price,out_ord_price
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -45,12 +50,14 @@
       transfer_price, weight_price, add_id,
       add_time, modify_id, modify_time, 
       cancel_id, cancel_time, cancel_flag, 
-      belong_id,storage_type)
+      belong_id,storage_type,customer_id,
+      keep_day,ord_price,out_ord_price)
     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})
+      #{belongId,jdbcType=VARCHAR},#{storageType,jdbcType=VARCHAR},#{customer.id,jdbcType=VARCHAR},
+      #{keepDay,jdbcType=INTEGER},#{ordPrice,jdbcType=DOUBLE},#{outOrdPrice,jdbcType=DOUBLE}  )
   </insert>
   <insert id="insertSelective" parameterType="com.th.demo.model.maint.Price" >
     insert into t_maint_price
@@ -193,33 +200,37 @@ transfer_price,
       cancel_time = #{cancelTime,jdbcType=TIMESTAMP},
       cancel_flag = #{cancelFlag,jdbcType=VARCHAR},
       belong_id =  #{belongId,jdbcType=VARCHAR},
-     storage_type = #{storageType,jdbcType=VARCHAR}
+      storage_type = #{storageType,jdbcType=VARCHAR},
+      customer_id = #{customer.id,jdbcType=VARCHAR},
+        keep_day = #{keepDay,jdbcType=INTEGER},
+        ord_price = #{ordPrice,jdbcType=VARCHAR},
+        out_ord_price = #{outOrdPrice,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 
   <select id="selectByMaterialChangeTime" resultMap="BaseResultMap" >
     select *   from t_maint_price
-    where material_id = #{param1,jdbcType=VARCHAR}
-      and storage_type = #{param2,jdbcType=VARCHAR}
-     and belong_id = #{param3,jdbcType=VARCHAR}
+    where 1=1 --material_id = #{param1,jdbcType=VARCHAR}
+      --and storage_type = #{param2,jdbcType=VARCHAR}
+      and customer_id = #{param1,jdbcType=VARCHAR}
+     and belong_id = #{param2,jdbcType=VARCHAR}
      and cancel_flag = '0'
   </select>
 
 
   <select id="select" resultMap="BaseResultMap" >
-    select  t.*   from t_maint_price t ,t_maint_material d
-    where t.material_id = d.id
-    and d.name like concat('%',#{param1,jdbcType=VARCHAR},'%')
-      and d.standard like concat('%',#{param2,jdbcType=VARCHAR},'%')
-     and t.belong_id=#{param3,jdbcType=VARCHAR}
+    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.belong_id = #{param2,jdbcType=VARCHAR}
       and t.cancel_flag = '0'
   </select>
 
 
   <select id="selectCntByMaterialChangeTime" resultType="java.lang.Integer" >
     select count(*)  from t_maint_price
-    where material_id = #{param1,jdbcType=VARCHAR}
-      and storage_type = #{param2,jdbcType=VARCHAR}
+    where 1=1
+     and customer_id = #{param1,jdbcType=VARCHAR}
      and belong_id = #{param3,jdbcType=VARCHAR}
      and cancel_flag = '0'
   </select>