1111

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

@@ -23,7 +23,7 @@ public interface PriceMapper {
 
     List<Price> select(String customerName, String belongId,String materialName);
 
-    List<Price> selectListByCustomer(String customerName, String belongId,String materialName);
+    List<Price> selectListByCustomer(String customerName, String belongId,String attri1 ,String attri2 ,String attri3);
 
     int selectCntByMaterialChangeTime(String id, int i, String belongId);
 

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

@@ -29,6 +29,10 @@ public class Material {
 
     private String belongId;
 
+    private String attri1;
+    private String attri2;
+    private String attri3;
+
     public String getId() {
         return id;
     }
@@ -132,4 +136,28 @@ public class Material {
     public void setBelongId(String belongId) {
         this.belongId = belongId == null ? null : belongId.trim();
     }
+
+    public String getAttri1() {
+        return attri1;
+    }
+
+    public void setAttri1(String attri1) {
+        this.attri1 = attri1;
+    }
+
+    public String getAttri2() {
+        return attri2;
+    }
+
+    public void setAttri2(String attri2) {
+        this.attri2 = attri2;
+    }
+
+    public String getAttri3() {
+        return attri3;
+    }
+
+    public void setAttri3(String attri3) {
+        this.attri3 = attri3;
+    }
 }

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

@@ -44,10 +44,10 @@ 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,"");
-            if (priceList.size() >= 1){
-                return JSONTools.toString(1,"该客户的价格已维护，请勿重复维护");
-            }
+//            List<Price> priceList = priceMapper.selectListByCustomer(price.getCustomer().getId(),belongId,"");
+//            if (priceList.size() >= 1){
+//                return JSONTools.toString(1,"该客户的价格已维护，请勿重复维护");
+//            }
             price.setAddUser(new SysUser(userId));
             price.setAddTime(new Date());
             price.setModifyUser(new SysUser(userId));
@@ -56,12 +56,12 @@ public class PriceServiceImpl implements PriceService {
             price.setBelongId(belongId);
             num += priceMapper.insert(price);
         }else {
-            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) {
-                return JSONTools.toString(1,"该客户的价格已维护，请勿重复维护");
-            }
+//            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) {
+//                return JSONTools.toString(1,"该客户的价格已维护，请勿重复维护");
+//            }
             price.setModifyUser(new SysUser(userId));
             price.setModifyTime(new Date());
             num += priceMapper.updateByPrimaryKey(price);

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

@@ -398,16 +398,16 @@ 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,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());
-                listSameStack.get(m).setOutOrdPrice(priceList.get(0).getOutOrdPrice());
-            }
-            List<OrdTract> ordTractList = ordTractMapper.selectByOrdNo(listSameStack.get(m).getOrdNo(),belongId);
-            if (ordTractList.size() >= 1){
-                listSameStack.get(m).setPayWay(ordTractList.get(0).getPayWay());
-            }
+//            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());
+//                listSameStack.get(m).setOutOrdPrice(priceList.get(0).getOutOrdPrice());
+//            }
+//            List<OrdTract> ordTractList = ordTractMapper.selectByOrdNo(listSameStack.get(m).getOrdNo(),belongId);
+//            if (ordTractList.size() >= 1){
+//                listSameStack.get(m).setPayWay(ordTractList.get(0).getPayWay());
+//            }
             InRecord inRecord = getInRecord(listSameStack.get(m), "1", userId);
             num += inRecordMapper.insert(inRecord);
 

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

@@ -319,7 +319,7 @@ public class OutServiceImpl implements OutService {
             int days = toIntExact(days_L);
             outRecord.setInWareDays(days);
 
-            List<Price> priceList = priceMapper.selectListByCustomer(store.getFkComponyId(), store.getBelongId(),store.getMaterial().getCode());
+            List<Price> priceList = priceMapper.selectListByCustomer(store.getFkComponyId(), store.getBelongId(),store.getMaterial().getAttri1(),store.getMaterial().getAttri2(),store.getMaterial().getAttri3());
             if (priceList.size() ==1){
                 Price price = priceList.get(0);
                 if (price.getKeepDay() >= days){

src/main/resource/localhost/db.properties

@@ -3,12 +3,12 @@
 #jdbc.user=root
 #jdbc.password=root
 
-jdbc.driverClass=com.mysql.jdbc.Driver
-jdbc.jdbcUrl=jdbc:mysql://localhost:3306/ware_zg?characterEncoding=utf8
-jdbc.user=root
-jdbc.password=root
-
 #jdbc.driverClass=com.mysql.jdbc.Driver
-#jdbc.jdbcUrl=jdbc:mysql://60.205.9.174:3309/ware_zg?useUnicode=true&characterEncoding=utf8
+#jdbc.jdbcUrl=jdbc:mysql://localhost:3306/ware_zg?characterEncoding=utf8
 #jdbc.user=root
-#jdbc.password=122403
+#jdbc.password=root
+
+jdbc.driverClass=com.mysql.jdbc.Driver
+jdbc.jdbcUrl=jdbc:mysql://60.205.9.174:3309/ware_zg?useUnicode=true&characterEncoding=utf8
+jdbc.user=root
+jdbc.password=122403

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

@@ -15,6 +15,9 @@
     <result column="cancel_time" property="cancelTime" jdbcType="TIMESTAMP" />
     <result column="cancel_flag" property="cancelFlag" jdbcType="VARCHAR" />
     <result column="belong_id" property="belongId" jdbcType="VARCHAR" />
+    <result column="attri1" property="attri1" jdbcType="VARCHAR" />
+    <result column="attri2" property="attri2" jdbcType="VARCHAR" />
+    <result column="attri3" property="attri3" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, name, code, standard, model, add_id, add_time, modify_id, modify_time, cancel_id, 
@@ -22,7 +25,7 @@
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
-    <include refid="Base_Column_List" />
+    *
     from t_maint_material
     where id = #{id,jdbcType=VARCHAR}
   </select>
@@ -40,12 +43,12 @@
       standard, model, add_id, 
       add_time, modify_id, modify_time, 
       cancel_id, cancel_time, cancel_flag, 
-      belong_id)
+      belong_id,attri1,attri2,attri3)
     values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, 
       #{standard,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR}, #{addId,jdbcType=VARCHAR}, 
       #{addTime,jdbcType=TIMESTAMP}, #{modifyId,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, 
       #{cancelId,jdbcType=VARCHAR}, #{cancelTime,jdbcType=TIMESTAMP}, #{cancelFlag,jdbcType=VARCHAR}, 
-      #{belongId,jdbcType=VARCHAR})
+      #{belongId,jdbcType=VARCHAR},#{attri1,jdbcType=VARCHAR},#{attri2,jdbcType=VARCHAR},#{attri3,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.th.demo.model.maint.Material" >
     insert into t_maint_material
@@ -187,7 +190,10 @@
       cancel_id = #{cancelId,jdbcType=VARCHAR},
       cancel_time = #{cancelTime,jdbcType=TIMESTAMP},
       cancel_flag = #{cancelFlag,jdbcType=VARCHAR},
-      belong_id = #{belongId,jdbcType=VARCHAR}
+      belong_id = #{belongId,jdbcType=VARCHAR},
+        attri1 = #{attri1,jdbcType=VARCHAR},
+        attri2 = #{attri2,jdbcType=VARCHAR},
+        attri3 = #{attri3,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 
@@ -228,7 +234,4 @@
       and ifnull(cancel_flag,'0') = '0'
   </select>
 
-
-
-
 </mapper>

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

@@ -244,7 +244,9 @@ 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.material_name = #{param3,jdbcType=VARCHAR}
+           or t.material_name = #{param4,jdbcType=VARCHAR}
+           or t.material_name = #{param5,jdbcType=VARCHAR})
       and t.cancel_flag = '0'
   </select>
 </mapper>