Merge remote-tracking branch 'origin/master'

README.md

@@ -0,0 +1,38 @@
+# 保胜库房仓储管理系统
+
+远程数据库信息
+
+# jdbc.driverClass=com.mysql.jdbc.Driver
+# jdbc.jdbcUrl=jdbc:mysql://172.18.200.32:3306/ware?useUnicode=true&characterEncoding=utf8
+# jdbc.user=root
+# jdbc.password=root
+
+远程上传文件操作
+
+远程系统为Linux系统需要挂载山钢VPN和远程软件进行操作
+
+远程服务器地址: 172.18.200.32
+远程账号：root
+远程密码：@Sdgt@1234
+
+上传文件操作流程
+后台：
+1、执行 cd /home/apache-tomcat-8.5.51/webapps/
+2、执行 rz
+3、 选择本地打包好的文件上传war包
+4、 浏览器打开 http://120.224.213.150/thware/ 显示启动成功即可
+5、 cd /home/apache-tomcat-8.5.51/webapps/thware/home/sam/thwareUpload/ureportfiles/ 
+    前去这个文件夹下面查看出库单配车单的xml文件是否存在，如果不存在了需要将项目中的xml文件上传
+6、 cd /home/apache-tomcat-8.5.51/webapps/thware/ 
+    前去这个文件夹下面查看导入模板(import.xls)文件是否存在，如果不存在了需要将项目中的import.xls文件上传
+
+
+
+前台；
+1、 将本地打包的dist文件夹压缩成zip文件(一定要压缩成zip文件)
+2、 执行 cd /home/apache-tomcat-8.5.51/webapps/
+3、 查看是否有dist.zip文件，如果有则执行 rm -f dist.zip
+4、 执行 rz
+5、 选择本地打包好的文件上传zip文件
+6、 上传至完成之后执行 unzip dist.zip 在选择是否全部替换的时候选择A
+7、 执行完成之后回到前台界面刷新界面或者清空浏览器缓存查看更改信息是否已经生效

src/main/java/com/th/demo/controller/ware/StoreController.java

@@ -97,8 +97,11 @@ public class StoreController {
                               String stackName,
                               String model,
                               String materialName,
-                             String standard,
-                             String customerName,
+                              String standard,
+                              String customerName,
+                              String plateNo,
+                              String fromDate,
+                              String toDate,
                               HttpServletRequest request) {
 
         try {
@@ -110,7 +113,10 @@ public class StoreController {
                     model,
                     materialName,
                     standard,
-                      customerName,
+                    customerName,
+                    plateNo,
+                    fromDate,
+                    toDate,
                     userId,
                     belongId);
         } catch (Exception ex) {

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, 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/mapping/ware/StoreMapper.java

@@ -31,7 +31,7 @@ public interface StoreMapper {
 
     Store selectByOutId(String id,String noUserParam,String userId, String belongId);
 
-    List<Store> selectStore(String wareName, String stackName, String model, String materialName, String standard,   String customerName, String userId,String belongId);
+    List<Store> selectStore(String wareName, String stackName, String model, String materialName, String standard,   String customerName, String fromDate,   String toDate, String userId,String belongId,String plateNo);
 
     int updateForUpDownByLayer(String wareName, String stackName, String userId, String belongId, int min, int max, int i);
 

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/model/ware/InRecord.java

@@ -61,6 +61,15 @@ public class InRecord {
     private String tallyPeople;
 
     private String fkComponyName;
+    private double invoicePrice;
+
+    public double getInvoicePrice() {
+        return invoicePrice;
+    }
+
+    public void setInvoicePrice(double invoicePrice) {
+        this.invoicePrice = invoicePrice;
+    }
 
     public String getFkComponyName() {
         return fkComponyName;

src/main/java/com/th/demo/model/ware/OutRecord.java

@@ -85,6 +85,15 @@ public class OutRecord {
 
     private Double storeFee;
     private Integer inWareDays;
+    private Double unitPrice;
+
+    public Double getUnitPrice() {
+        return unitPrice;
+    }
+
+    public void setUnitPrice(Double unitPrice) {
+        this.unitPrice = unitPrice;
+    }
 
     public Double getStoreFee() {
         return storeFee;

src/main/java/com/th/demo/model/ware/Store.java

@@ -74,6 +74,15 @@ public class Store  implements Comparable<Store>{
     private String fkComponyId ;
 
     private Double invoicePrice;
+    private String contractNo;
+
+    public String getContractNo() {
+        return contractNo;
+    }
+
+    public void setContractNo(String contractNo) {
+        this.contractNo = contractNo;
+    }
 
     public Double getInvoicePrice() {
         return invoicePrice;

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/java/com/th/demo/service/impl/ware/InServiceImpl.java

@@ -45,6 +45,8 @@ public class InServiceImpl implements InService {
     public MaterialMapper materialMapper;
     @Autowired
     public ProdPriceMapper prodPriceMapper;
+    @Autowired
+    public PriceMapper priceMapper;
     String result = Type.FAIL;
     int num = 0;
 
@@ -211,16 +213,16 @@ public class InServiceImpl implements InService {
 
     private int insert(List<Store> listSameStack, Stack stack, String userId, String belongId) throws Exception{
         int currentLayer = 0;
-        if (stack.getIsLayer().equals("1")) {
+        /*if (stack.getIsLayer().equals("1")) {
             currentLayer = Integer.parseInt(storeMapper.selectLayerByStackId(stack.getId(), belongId));
         } else {
             currentLayer = -1;
-        }
-        ProdPrice prodPrice = new ProdPrice();
+        }*/
+        Price Price = new Price();
         for (int m = 0; m < listSameStack.size(); m++) {
-
+            currentLayer = Integer.parseInt(storeMapper.selectLayerByStackId(stack.getId(), belongId));
             if (stack.getIsLayer().equals("1")) {
-                listSameStack.get(m).setLayer(currentLayer + m + 1);
+                listSameStack.get(m).setLayer(currentLayer + 1);
             } else {
                 listSameStack.get(m).setLayer(0);
             }
@@ -228,11 +230,12 @@ public class InServiceImpl implements InService {
             listSameStack.get(m).setAddTime(new Date());
             listSameStack.get(m).setCancelFlag("0");
             listSameStack.get(m).setBelongId(belongId);
-            /*prodPrice = prodPriceMapper.selectByProdNm(listSameStack.get(m).getMaterial().getName());
-            if(prodPrice == null){
-                throw new Exception(listSameStack.get(m).getMaterial().getName()+"价格未维护");
+            Price = priceMapper.selectByMaterialChangeTime(listSameStack.get(m).getFkComponyId().toString(),belongId);
+            if(Price == null){
+                Customer fk_compony = customerMapper.selectByPrimaryKey(listSameStack.get(m).getFkComponyId());
+                throw new Exception(fk_compony.getName()+"公司的价格未维护");
             }
-            listSameStack.get(m).setInvoicePrice(prodPrice.getInvoicePrice());*/
+            listSameStack.get(m).setInvoicePrice(Price.getOrdPrice());
             InRecord inRecord = getInRecord(listSameStack.get(m), "1", userId);
             num += inRecordMapper.insert(inRecord);
 
@@ -250,10 +253,10 @@ public class InServiceImpl implements InService {
         List<Store> listStore = new ArrayList<>();
         String wareName = listJO.get(0).get("仓库名称").toString();
         String stackName = listJO.get(0).get("垛位号").toString();
-        String materialName = listJO.get(0).get("物料类型").toString();
-        String standard = listJO.get(0).get("钢种").toString();
+        String materialName = listJO.get(0).get("货物品名").toString();
+        String standard = listJO.get(0).get("材质").toString();
         String customerName = listJO.get(0).get("客户名称").toString();
-        String fk_compony_name = listJO.get(0).get("货权单位").toString();
+        String fk_compony_name = listJO.get(0).get("客户名称").toString();
         Ware ware = wareMapper.selectByWareName(wareName, userId, belongId);
         if (ware == null) {
             err += "未找到名为\"" + wareName + "\"的库房；";
@@ -303,33 +306,33 @@ public class InServiceImpl implements InService {
                 }
                 store.setStack(stack);
             }
-            if (listJO.get(i).get("物料类型").toString().equals(materialName) && listJO.get(i).get("钢种").toString().equals(standard)) {
+            if (listJO.get(i).get("货物品名").toString().equals(materialName) && listJO.get(i).get("材质").toString().equals(standard)) {
                 store.setMaterial(material);
             } else {
-                materialName = listJO.get(i).get("物料类型").toString();
-                standard = listJO.get(i).get("钢种").toString();
+                materialName = listJO.get(i).get("货物品名").toString();
+                standard = listJO.get(i).get("材质").toString();
                 material = materialMapper.selectByNameStandard(materialName, standard, belongId);
                 if (material == null) {
-                    err += "未找到名为\"" + materialName + "，" + standard + "\"的物料类型；";
+                    err += "未找到名为\"" + materialName + "，" + standard + "\"的货物品名；";
                     throw new Exception(err);
                 }
                 store.setMaterial(material);
             }
-            if (listJO.get(i).get("客户名称").toString().equals(customerName)) {
+            if (listJO.get(i).get("订单客户").toString().equals(customerName)) {
                 store.setCustomer(customer);
             } else {
-                customerName = listJO.get(i).get("客户名称").toString();
+                customerName = listJO.get(i).get("订单客户").toString();
                 customer = customerMapper.selectByName(customerName, belongId);
                 if (customer == null) {
-                    err += "未找到名为\"" + customerName + "\"的客户名称；";
+                    err += "未找到名为\"" + customerName + "\"的订单客户名称；";
                     throw new Exception(err);
                 }
                 store.setCustomer(customer);
             }
-            if (listJO.get(i).get("货权单位").toString().equals(fk_compony_name)) {
+            if (listJO.get(i).get("客户名称").toString().equals(fk_compony_name)) {
                 store.setFkComponyId(fk_compony.getId());
             } else {
-                fk_compony_name = listJO.get(i).get("货权单位").toString();
+                fk_compony_name = listJO.get(i).get("客户名称").toString();
                 fk_compony = customerMapper.selectByName(fk_compony_name, belongId);
                 if (customer == null) {
                     err += "未找到名为\"" + customerName + "\"的客户名称；";
@@ -338,14 +341,14 @@ public class InServiceImpl implements InService {
                 store.setFkComponyId(fk_compony.getId());
             }
             store.setLayer(Integer.parseInt(listJO.get(i).get("层号").toString()));
-            store.setPlateNo(listJO.get(i).get("产品编号").toString());
-            store.setModel(listJO.get(i).get("产品规格").toString());
+            store.setPlateNo(listJO.get(i).get("顺序号").toString());
+            store.setModel(listJO.get(i).get("规格").toString());
             store.setCount(Double.parseDouble(listJO.get(i).get("数量").toString()));
             store.setWeight(Double.parseDouble(listJO.get(i).get("重量").toString()));
-            if (listJO.get(i).get("收货地址") == null || listJO.get(i).get("收货地址").toString().equals("")) {
+            if (listJO.get(i).get("目的地") == null || listJO.get(i).get("目的地").toString().equals("")) {
                 store.setReceiveAddress(customer.getAddress());
             } else {
-                store.setReceiveAddress(listJO.get(i).get("收货地址").toString());
+                store.setReceiveAddress(listJO.get(i).get("目的地").toString());
             }
             if(listJO.get(i).get("备注") != null){
                 store.setRemark(listJO.get(i).get("备注").toString());
@@ -356,12 +359,6 @@ public class InServiceImpl implements InService {
             store.setCancelFlag("0");
             store.setOutFlag("0");
             store.setBelongId(belongId);
-            if(listJO.get(i).get("计量方式") != null){
-                store.setWgtDcnMtcCd(listJO.get(i).get("计量方式").toString());
-            }
-            if(listJO.get(i).get("切边类型") != null){
-                store.setEdgeTy(listJO.get(i).get("切边类型").toString());
-            }
             if(listJO.get(i).get("产地") != null){
                 store.setProductionPlace(listJO.get(i).get("产地").toString());
             }
@@ -369,11 +366,14 @@ public class InServiceImpl implements InService {
             if(listJO.get(i).get("订单号") != null){
                 store.setOrdNo(listJO.get(i).get("订单号").toString());
             }
+            if(listJO.get(i).get("合约号") != null){
+                store.setContractNo(listJO.get(i).get("合约号").toString());
+            }
             if(listJO.get(i).get("车号") != null){
                 store.setCarNo(listJO.get(i).get("车号").toString());
             }
-            if(listJO.get(i).get("入库理货人员") != null){
-                store.setTallyPeople(listJO.get(i).get("入库理货人员").toString());
+            if(listJO.get(i).get("吊装工") != null){
+                store.setTallyPeople(listJO.get(i).get("吊装工").toString());
             }
             listStore.add(store);
         }

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

@@ -47,6 +47,8 @@ public class OutServiceImpl implements OutService {
     public ChangeRecordMapper changeRecordMapper;
     @Autowired
     public PriceMapper priceMapper;
+    @Autowired
+    public InRecordMapper inRecordMapper;
 
     String result = Type.FAIL;
     int num = 0;
@@ -298,7 +300,19 @@ public class OutServiceImpl implements OutService {
         outRecord.setWgtDcnMtcCd(store.getWgtDcnMtcCd());
         outRecord.setEdgeTy(store.getEdgeTy());
         outRecord.setProductionPlace(store.getProductionPlace());
-        outRecord.setInvoicePrice(store.getInvoicePrice());
+        InRecord inRecord = inRecordMapper.selectByPrimaryKey(store.getInId());
+        double asd = (outRecord.getAddTime().getDate() - inRecord.getAddTime().getTime())/ (24 * 60 * 60 * 1000);
+        Price price = priceMapper.selectByMaterialChangeTime(store.getFkComponyId(),store.getBelongId());
+        if (asd > price.getKeepDay()){
+            outRecord.setInvoicePrice(price.getOutOrdPrice());
+            outRecord.setUnitPrice(price.getOutOrdPrice());
+        }else {
+            outRecord.setInvoicePrice(price.getOrdPrice());
+            outRecord.setUnitPrice(price.getOrdPrice());
+        }
+
+
+
         return outRecord;
     }
 

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

@@ -79,10 +79,13 @@ public class StoreServiceImpl implements StoreService {
                              String materialName,
                              String standard,
                              String customerName,
+                             String plateNo,
+                             String fromDate,
+                             String toDate,
                              String userId,
                              String belongId) {
         PageHelper.startPage(page, rows);
-        List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard,    customerName,   userId,belongId);
+        List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard,    customerName,fromDate, toDate,  userId,belongId, plateNo);
         PageInfo<Store> pageInfo = new PageInfo<>(list);
         result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
         return result;

src/main/java/com/th/demo/service/ware/StoreService.java

@@ -11,7 +11,7 @@ public interface StoreService {
     
     String modify(String json, String userId, String belongId);
 
-    String queryStore(int page,int rows,String wareName,String stackName,String model,String materialName,String standard,  String customerName, String userId,String belongId);
+    String queryStore(int page,int rows,String wareName,String stackName,String model,String materialName,String standard, String customerName, String plateNo,String fromDate,  String toDate, String userId,String belongId);
 
     String modifyCustomer(String id,String customerNameOld,String customerNameNew);
 

src/main/resource/localhost/db.properties

@@ -1,12 +1,10 @@
-jdbc.driverClass=com.mysql.jdbc.Driver
-jdbc.jdbcUrl=jdbc:mysql://172.18.200.32:3306/ware?useUnicode=true&characterEncoding=utf8
-jdbc.user=root
-jdbc.password=root
 #jdbc.driverClass=com.mysql.jdbc.Driver
-#jdbc.jdbcUrl=jdbc:mysql://localhost:3306/thware?characterEncoding=utf8
+#jdbc.jdbcUrl=jdbc:mysql://172.18.200.32:3306/ware?useUnicode=true&characterEncoding=utf8
 #jdbc.user=root
-#jdbc.password=alyaly
-#jdbc.driverClass=com.mysql.jdbc.Driver
-#jdbc.jdbcUrl=jdbc:mysql://39.105.120.43:3306/thware?characterEncoding=utf8
-#jdbc.user=thware
-#jdbc.password=Lwyh:333333
+#jdbc.password=root
+
+#???????????????????????????????
+jdbc.driverClass=com.mysql.jdbc.Driver
+jdbc.jdbcUrl=jdbc:mysql://localhost:3306/ware?characterEncoding=utf8
+jdbc.user=root
+jdbc.password=root

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,36 @@ 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
+      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>

src/main/resource/mapper/ware/OutRecordMapper.xml

@@ -39,6 +39,7 @@
     <result column="fk_compony_name" property="fkComponyName" jdbcType="VARCHAR" />
     <result column="invoice_price" property="invoicePrice" jdbcType="DOUBLE" />
     <result column="verify_account_id" property="verifyAccountId" jdbcType="DOUBLE" />
+    <result column="unit_price" property="unitPrice" jdbcType="DOUBLE" />
 
     <result column="in_ware_days" property="inWareDays" jdbcType="INTEGER" />
     <result column="store_fee" property="storeFee" jdbcType="DOUBLE" />
@@ -88,6 +89,7 @@
     <result column="distribution_id" property="distributionId" jdbcType="VARCHAR" />
     <result column="in_ware_days" property="inWareDays" jdbcType="INTEGER" />
     <result column="store_fee" property="storeFee" jdbcType="DOUBLE" />
+    <result column="unit_price" property="unitPrice" jdbcType="DOUBLE" />
   </resultMap>
   <resultMap id="TotalResultMap" type="com.th.demo.model.ware.TotalRecord">
     <result column="total_amount" property="totalAmount" jdbcType="DOUBLE" />
@@ -96,7 +98,7 @@
   <sql id="Base_Column_List" >
     id, ware_name, stack_name, layer, material_name, material_no, standard, model, customer_name, 
     customer_no, count, weight, remark, add_id, add_time, modify_id, modify_time, cancel_id, 
-    cancel_time, cancel_flag, belong_id, plate_no,in_id, record_type,back_flag,receive_address,distribution_id,wgt_dcn_mtc_cd,edge_ty,production_place,verify_account_id
+    cancel_time, cancel_flag, belong_id, plate_no,in_id, record_type,back_flag,receive_address,distribution_id,wgt_dcn_mtc_cd,edge_ty,production_place,verify_account_id,unit_price
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -120,7 +122,7 @@
       modify_id, modify_time, cancel_id, 
       cancel_time, cancel_flag, belong_id, 
       plate_no,in_id, record_type,back_flag,receive_address,distribution_id
-    ,wgt_dcn_mtc_cd,edge_ty,production_place,tally_people,invoice_price)
+    ,wgt_dcn_mtc_cd,edge_ty,production_place,tally_people,invoice_price,unit_price)
     values (#{id,jdbcType=VARCHAR}, #{wareName,jdbcType=VARCHAR}, #{stackName,jdbcType=VARCHAR}, 
       #{layer,jdbcType=INTEGER}, #{materialName,jdbcType=VARCHAR}, #{materialNo,jdbcType=VARCHAR}, 
       #{standard,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR}, #{customerName,jdbcType=VARCHAR}, 
@@ -130,7 +132,7 @@
       #{cancelTime,jdbcType=TIMESTAMP}, #{cancelFlag,jdbcType=VARCHAR}, #{belongId,jdbcType=VARCHAR},
     #{plateNo,jdbcType=VARCHAR},  #{inId,jdbcType=VARCHAR}, #{recordType,jdbcType=VARCHAR},
     #{backFlag,jdbcType=VARCHAR}, #{receiveAddress,jdbcType=VARCHAR}, #{distributionId,jdbcType=VARCHAR}
-    ,#{wgtDcnMtcCd,jdbcType=VARCHAR},#{edgeTy,jdbcType=VARCHAR},#{productionPlace,jdbcType=VARCHAR},#{tallyPeople,jdbcType=VARCHAR},#{invoicePrice,jdbcType=DOUBLE})
+    ,#{wgtDcnMtcCd,jdbcType=VARCHAR},#{edgeTy,jdbcType=VARCHAR},#{productionPlace,jdbcType=VARCHAR},#{tallyPeople,jdbcType=VARCHAR},#{invoicePrice,jdbcType=DOUBLE},#{unitPrice,jdbcType=DOUBLE})
   </insert>
   <insert id="insertSelective" parameterType="com.th.demo.model.ware.OutRecord" >
     insert into t_ware_out_record
@@ -367,7 +369,8 @@
            record_type = #{recordType,jdbcType=VARCHAR},
           back_flag =  #{backFlag,jdbcType=VARCHAR},
     receive_address = #{receiveAddress,jdbcType=VARCHAR},
-      distribution_id =  #{distributionId,jdbcType=VARCHAR}
+      distribution_id =  #{distributionId,jdbcType=VARCHAR},
+        unit_price =  #{unitPrice,jdbcType=DOUBLE}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 
@@ -379,7 +382,7 @@
 
   <update id="savePriceMod" parameterType="com.th.demo.model.ware.OutRecord" >
     update t_ware_out_record t
-    set t.invoice_price = #{invoicePrice,jdbcType=DOUBLE}
+    set t.unit_price = #{invoicePrice,jdbcType=DOUBLE}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="cleanVerifyInfo" parameterType="java.lang.String" >

src/main/resource/mapper/ware/StoreMapper.xml

@@ -32,6 +32,7 @@
     <result column="fk_compony_id" property="fkComponyId" jdbcType="VARCHAR" />
 
     <result column="invoice_price" property="invoicePrice" jdbcType="DOUBLE" />
+    <result column="contract_no" property="contractNo" jdbcType="VARCHAR" />
 
 
     <association  column="ware_id" property="ware" select="com.th.demo.mapping.maint.WareMapper.selectByPrimaryKey" />
@@ -56,7 +57,7 @@
   <sql id="Base_Column_List" >
     id, ware_id, stack_id, layer, material_id, model, plate_no, customer_id, count, weight,
     remark, add_id, add_time, modify_id, modify_time, cancel_id, cancel_time, cancel_flag,
-    belong_id, in_id, out_id, receive_address, out_flag, lock_flag,wgt_dcn_mtc_cd,edge_ty,production_place
+    belong_id, in_id, out_id, receive_address, out_flag, lock_flag,wgt_dcn_mtc_cd,edge_ty,production_place,contract_no
   </sql>
 
 
@@ -86,7 +87,7 @@
       belong_id, in_id, out_id,
       receive_address, out_flag, lock_flag
       ,wgt_dcn_mtc_cd,edge_ty,production_place,ord_no
-      ,car_no,tally_people,fk_compony_id,invoice_price
+      ,car_no,tally_people,fk_compony_id,invoice_price,contract_no
     )
     values (#{id,jdbcType=VARCHAR}, #{ware.id,jdbcType=VARCHAR}, #{stack.id,jdbcType=VARCHAR},
       #{layer,jdbcType=INTEGER}, #{material.id,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR},
@@ -97,7 +98,7 @@
       #{belongId,jdbcType=VARCHAR}, #{inId,jdbcType=VARCHAR}, #{outId,jdbcType=VARCHAR},
       #{receiveAddress,jdbcType=VARCHAR}, #{outFlag,jdbcType=VARCHAR}, #{lockFlag,jdbcType=VARCHAR}
       ,#{wgtDcnMtcCd,jdbcType=VARCHAR},#{edgeTy,jdbcType=VARCHAR},#{productionPlace,jdbcType=VARCHAR},#{ordNo,jdbcType=VARCHAR}
-     ,#{carNo,jdbcType=VARCHAR},#{tallyPeople,jdbcType=VARCHAR},#{fkComponyId,jdbcType=VARCHAR},#{invoicePrice,jdbcType=DOUBLE}
+     ,#{carNo,jdbcType=VARCHAR},#{tallyPeople,jdbcType=VARCHAR},#{fkComponyId,jdbcType=VARCHAR},#{invoicePrice,jdbcType=DOUBLE},#{contractNo,jdbcType=VARCHAR}
       )
   </insert>
 
@@ -324,7 +325,8 @@
       out_id = #{outId,jdbcType=VARCHAR},
       receive_address = #{receiveAddress,jdbcType=VARCHAR},
       out_flag = #{outFlag,jdbcType=VARCHAR},
-      lock_flag = #{lockFlag,jdbcType=VARCHAR}
+      lock_flag = #{lockFlag,jdbcType=VARCHAR},
+      contract_no = #{contractNo,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 
@@ -436,11 +438,15 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
     and  c.name like concat('%',#{param4,jdbcType=VARCHAR},'%')
     and  c.standard like concat('%',#{param5,jdbcType=VARCHAR},'%')
     and  d.name like concat('%',#{param6,jdbcType=VARCHAR},'%')
-    and t.belong_id = #{param8,jdbcType=VARCHAR}
+    and t.belong_id = #{param10,jdbcType=VARCHAR}
+    and t.plate_no like concat('%',#{param11,jdbcType=VARCHAR},'%')
     and t.cancel_flag = '0'
     and t.out_flag = '0'
+      <if test="param7 != null and param7 != '' and param8 != null and param8 != ''">
+      and t.add_time between #{param7,jdbcType=TIMESTAMP} and #{param8,jdbcType=TIMESTAMP}
+      </if>
     and t.ware_id in (
-    select m.ware_id from t_maint_userware m  where m.user_id = #{param7,jdbcType=VARCHAR}
+    select m.ware_id from t_maint_userware m  where m.user_id = #{param9,jdbcType=VARCHAR}
      )
     order by b.code,t.layer desc
   </select>