Merge remote-tracking branch 'origin/master'

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.th.demo</groupId>
-    <artifactId>thware</artifactId>
+    <artifactId>thware_zg</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>war</packaging>
 

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

@@ -123,5 +123,24 @@ public class OutRecordController {
         }
     }
 
+    @RequestMapping(value = "/saveCar.do" , method = RequestMethod.POST)
+    public String saveCar(String json,
+                               String truckNo,
+                               String driverName,
+                               String driverPhone,
+                               HttpServletRequest request) {
+
+        try {
+            String userId = (String) request.getAttribute("userId");
+            String belongId = (String) request.getAttribute("belongId");
+            result = outRecordService.saveCar(json,truckNo,driverName,driverPhone,userId,belongId);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        } finally {
+            return result;
+        }
+    }
+
 
 }

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

@@ -99,6 +99,10 @@ public class StoreController {
                               String materialName,
                              String standard,
                              String customerName,
+                             String fkcustmerName,
+                             String plateNo,
+                             String ordNo,
+                             String contractNo,
                               HttpServletRequest request) {
 
         try {
@@ -112,7 +116,7 @@ public class StoreController {
                     standard,
                       customerName,
                     userId,
-                    belongId);
+                    belongId,plateNo,ordNo,contractNo,fkcustmerName);
         } catch (Exception ex) {
             ex.printStackTrace();
             result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
@@ -153,4 +157,31 @@ public class StoreController {
         }
     }
 
+    @RequestMapping(value = "/changeAll.do")//查询方法 前两个参数是分页参数
+    public String changeAll(
+
+            String json,
+            String newCustomername,
+            String newFKCustomername,
+            String newContractno,
+            String newOrdno,
+            String newReceiveaddress,
+            String newProductionplace,
+            String newPackno,
+
+            HttpServletRequest request) {
+
+        try {
+            String userId = (String) request.getAttribute("userId");
+            String belongId = (String) request.getAttribute("belongId");
+            result = storeService.changeAll( json,newCustomername,newFKCustomername,newContractno,newOrdno,newReceiveaddress,
+                    newProductionplace,newPackno,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/ware/DistributionMapper.java

@@ -11,7 +11,7 @@ public interface DistributionMapper {
 
     int insertSelective(Distribution record);
 
-    Distribution selectByPrimaryKey(Integer id);
+    Distribution selectByPrimaryKey(String id);
 
     int updateByPrimaryKeySelective(Distribution record);
 

src/main/java/com/th/demo/mapping/ware/StoreMapper.java

@@ -31,7 +31,10 @@ 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 userId,String belongId,
+                            String fkcustmerName, String plateNo,String ordNo,String contractNo,
+                            List<String> plateNos,List<String> ordNos, List<String> contractNos);
 
     int updateForUpDownByLayer(String wareName, String stackName, String userId, String belongId, int min, int max, int i);
 

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

@@ -79,14 +79,27 @@ public class DistributionServiceImpl implements DistributionService {
         });
         List<Store> list = JSON.parseObject(jsonList, new TypeReference<List<Store>>() {
         });
-        if (distribution.getListDetail().size() == list.size()) {
-            distribution.setOutFlag("2");
-            num += distributionMapper.updateByPrimaryKey(distribution);
-        }
+
+        double cancelWeight = 0;
+        double cancelNum = 0;
+
         for (int i = 0; i < list.size(); i++) {
+            cancelWeight+=list.get(i).getWeight();
+            cancelNum+=list.get(i).getCount();
             list.get(i).setLockFlag("0");
             num += storeMapper.updateByPrimaryKey(list.get(i));
         }
+        if (distribution.getListDetail().size() == list.size()) {
+            distribution.setOutFlag("2");
+            distribution.setSumCount(distribution.getSumCount()-cancelNum);
+            distribution.setSumWeight(distribution.getSumWeight()-cancelWeight);
+            num += distributionMapper.updateByPrimaryKey(distribution);
+        }else{
+            distribution.setSumCount(distribution.getSumCount()-cancelNum);
+            distribution.setSumWeight(distribution.getSumWeight()-cancelWeight);
+            num += distributionMapper.updateByPrimaryKey(distribution);
+
+        }
         for (int i = 0; i < distribution.getListDetail().size(); i++) {
             for (int j = 0; j < list.size(); j++) {
                 if (distribution.getListDetail().get(i).getStore().getId().equals(list.get(j).getId())) {

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

@@ -152,27 +152,28 @@ public class InServiceImpl implements InService {
             int currentLayer = Integer.parseInt(storeMapper.selectLayerByStackId(listStore.get(0).getStack().getId(), belongId));
             int min = listStore.get(0).getLayer();
             int max = listStore.get(listStore.size() - 1).getLayer();
-            if (currentLayer != max) {
-                result = JSONTools.toString(ResponseCodeMsg.CODE_EX, "必须包含最上层取消出库！");
-            } else if (!WareTools.checkOrder(listStore)) {
-                result = JSONTools.toString(ResponseCodeMsg.CODE_EX, "请选中连续数据取消出库！");
-            } else {
-                for (int i = 0; i < listStore.size(); i++) {
-                    int effStoreCnt = storeMapper.selEffStore(listStore.get(i).getPlateNo());
-                    if(effStoreCnt == 0){
-                        return JSONTools.toString(1,"库存中不存在板号"+listStore.get(i).getPlateNo()+",无法取消出库");
-                    }
-                    InRecord inRecord = getInRecord(listStore.get(i), "0", userId);
-                    num += inRecordMapper.insert(inRecord);
+//            if (currentLayer != max) {
+//                result = JSONTools.toString(ResponseCodeMsg.CODE_EX, "必须包含最上层取消出库！");
+//            } else if (!WareTools.checkOrder(listStore)) {
+//                result = JSONTools.toString(ResponseCodeMsg.CODE_EX, "请选中连续数据取消出库！");
+//            } else {
+//
+//            }
+            for (int i = 0; i < listStore.size(); i++) {
+                int effStoreCnt = storeMapper.selEffStore(listStore.get(i).getPlateNo());
+                if(effStoreCnt == 0){
+                    return JSONTools.toString(1,"库存中不存在板号"+listStore.get(i).getPlateNo()+",无法取消出库");
+                }
+                InRecord inRecord = getInRecord(listStore.get(i), "0", userId);
+                num += inRecordMapper.insert(inRecord);
 
-                    //listStore.get(i).setOutId(outRecord.getId());
-                    listStore.get(i).setCancelFlag("1");
-                    num += storeMapper.updateByPrimaryKey(listStore.get(i));
-                    num += inRecordMapper.deleteByPrimaryKey(listStore.get(i).getInId());
+                //listStore.get(i).setOutId(outRecord.getId());
+                listStore.get(i).setCancelFlag("1");
+                num += storeMapper.updateByPrimaryKey(listStore.get(i));
+                num += inRecordMapper.deleteByPrimaryKey(listStore.get(i).getInId());
 
-                }
-                result = Tools.moreThanZeroResultJSON(num);
             }
+            result = Tools.moreThanZeroResultJSON(num);
         }
         return result;
     }
@@ -274,7 +275,7 @@ public class InServiceImpl implements InService {
         String standard = listJO.get(0).get("钢种").toString();
         String customerName = listJO.get(0).get("客户名称").toString();
         String fk_compony_name = listJO.get(0).get("货权单位").toString();
-        String addUserName = listJO.get(0).get("入库操作人").toString();
+        String addUserName = listJO.get(0).get("入库操作人员").toString();
         //验证信息增加多条信息验证
         Ware ware = wareMapper.selectByWareName(wareName, userId, belongId);
         if (ware == null) {

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

@@ -6,10 +6,12 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.th.demo.mapping.finance.ModPriceLogMapper;
 import com.th.demo.mapping.finance.VerifyAccountMapper;
+import com.th.demo.mapping.ware.DistributionMapper;
 import com.th.demo.mapping.ware.OutRecordMapper;
 import com.th.demo.model.finance.ModPriceLog;
 import com.th.demo.model.finance.VerifyAccount;
 import com.th.demo.model.system.Type;
+import com.th.demo.model.ware.Distribution;
 import com.th.demo.model.ware.OutRecord;
 import com.th.demo.model.ware.Store;
 import com.th.demo.model.ware.TotalRecord;
@@ -30,6 +32,8 @@ public class OutRecordServiceImpl implements OutRecordService {
     public OutRecordMapper outRecordMapper;
     @Autowired
     public VerifyAccountMapper verifyAccountMapper;
+    @Autowired
+    public DistributionMapper distributionMapper;
 
     @Autowired
     public ModPriceLogMapper modPriceLogMapper;
@@ -140,6 +144,19 @@ public class OutRecordServiceImpl implements OutRecordService {
         }
         return Tools.moreThanZeroResultJSON(num);
     }
+
+    @Override
+    public String saveCar(String json,String truckNo,String driverName,String driverPhone,String userId,String belongId) {
+        List<OutRecord> list = JSON.parseObject(json, new TypeReference<List<OutRecord>>() {
+        });
+        Distribution distribution = distributionMapper.selectByPrimaryKey(list.get(0).getDistributionId());
+        distribution.setTruckNo(truckNo);
+        distribution.setDriverName(driverName);
+        distribution.setDriverPhone(driverPhone);
+        num = distributionMapper.updateByPrimaryKey(distribution);
+
+        return Tools.moreThanZeroResultJSON(num);
+    }
 }
 
 

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

@@ -113,6 +113,10 @@ public class OutServiceImpl implements OutService {
                 OutRecord outRecord = getOutRecord(store, "", "0", userId);
                 num += outRecordMapper.insert(outRecord);
                 num += storeMapper.insert(store);
+                Distribution distribution = distributionMapper.selectByPrimaryKey(listOutRecord.get(i).getDistributionId());
+                distribution.setSumWeight(distribution.getSumWeight()- store.getWeight());
+                distribution.setSumCount(distribution.getSumCount()- store.getCount());
+                num=distributionMapper.updateByPrimaryKey(distribution);
             }
             result = Tools.moreThanZeroResultJSON(num);
         } else {
@@ -129,6 +133,10 @@ public class OutServiceImpl implements OutService {
                 OutRecord outRecord = getOutRecord(store, "", "0", userId);
                 num += outRecordMapper.insert(outRecord);
                 num += storeMapper.insert(store);
+                Distribution distribution = distributionMapper.selectByPrimaryKey(listOutRecord.get(i).getDistributionId());
+                distribution.setSumWeight(distribution.getSumWeight()- store.getWeight());
+                distribution.setSumCount(distribution.getSumCount()- store.getCount());
+                num=distributionMapper.updateByPrimaryKey(distribution);
             }
             result = Tools.moreThanZeroResultJSON(num);
         }
@@ -181,27 +189,28 @@ public class OutServiceImpl implements OutService {
                 int currentLayer = Integer.parseInt(storeMapper.selectLayerByStackId(listStore.get(0).getStack().getId(), belongId));
                 int min = listStore.get(0).getLayer();
                 int max = listStore.get(listStore.size() - 1).getLayer();
-                if (currentLayer != max) {
-                    throw new Exception("库房：" + listStore.get(m).getWare().getName() + ",垛位：" + listStore.get(m).getStack().getName() + ",出库物料不在最上层，无法出库！");
-                    // result = JSONTools.toString(ResponseCodeMsg.CODE_EX, "必须选择最上层出库！");
-                } else if (!WareTools.checkOrder(listStore)) {
-                    throw new Exception("库房：" + listStore.get(m).getWare().getName() + ",垛位：" + listStore.get(m).getStack().getName() + ",出库物料不在最上层，无法出库！");
-                    //  result = JSONTools.toString(ResponseCodeMsg.CODE_EX, "请选中连续数据移动！");
-                } else {
-                    for (int i = 0; i < listStore.size(); i++) {
-                        OutRecord outRecord = getOutRecord(listStore.get(i), distribution.getId(), "1", userId);
-                        num += outRecordMapper.insert(outRecord);
+//                if (currentLayer != max) {
+//                    throw new Exception("库房：" + listStore.get(m).getWare().getName() + ",垛位：" + listStore.get(m).getStack().getName() + ",出库物料不在最上层，无法出库！");
+//                    // result = JSONTools.toString(ResponseCodeMsg.CODE_EX, "必须选择最上层出库！");
+//                } else if (!WareTools.checkOrder(listStore)) {
+//                    throw new Exception("库房：" + listStore.get(m).getWare().getName() + ",垛位：" + listStore.get(m).getStack().getName() + ",出库物料不在最上层，无法出库！");
+//                    //  result = JSONTools.toString(ResponseCodeMsg.CODE_EX, "请选中连续数据移动！");
+//                } else {
+//
+//                }
+                for (int i = 0; i < listStore.size(); i++) {
+                    OutRecord outRecord = getOutRecord(listStore.get(i), distribution.getId(), "1", userId);
+                    num += outRecordMapper.insert(outRecord);
 
-                        AccountDetail accountDetail = getAccountDetail(listStore.get(i), distribution.getSumWeight(), distribution.getSuttle(), userId, belongId);
-                        num += accountDetailMapper.insert(accountDetail);
+                    AccountDetail accountDetail = getAccountDetail(listStore.get(i), distribution.getSumWeight(), distribution.getSuttle(), userId, belongId);
+                    num += accountDetailMapper.insert(accountDetail);
 
-                        listStore.get(i).setOutId(outRecord.getId());
-                        listStore.get(i).setOutFlag("1");
-                        num += storeMapper.updateByPrimaryKey(listStore.get(i));
+                    listStore.get(i).setOutId(outRecord.getId());
+                    listStore.get(i).setOutFlag("1");
+                    num += storeMapper.updateByPrimaryKey(listStore.get(i));
 
-                    }
-                    result = Tools.moreThanZeroResultJSON(num);
                 }
+                result = Tools.moreThanZeroResultJSON(num);
             }
         }
         return result;

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

@@ -6,11 +6,13 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.th.demo.mapping.maint.CustomerMapper;
 import com.th.demo.mapping.ware.ChangeRecordMapper;
+import com.th.demo.mapping.ware.InRecordMapper;
 import com.th.demo.mapping.ware.StoreMapper;
 import com.th.demo.model.maint.Customer;
 import com.th.demo.model.maint.Stack;
 import com.th.demo.model.system.Type;
 import com.th.demo.model.ware.ChangeRecord;
+import com.th.demo.model.ware.InRecord;
 import com.th.demo.model.ware.SplitRecord;
 import com.th.demo.model.ware.Store;
 import com.th.demo.service.maint.CustomerService;
@@ -22,6 +24,7 @@ import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -32,6 +35,10 @@ public class StoreServiceImpl implements StoreService {
     public ChangeRecordMapper changeRecordMapper;
     @Autowired//自动注入Mapper
     public StoreMapper storeMapper;
+    @Autowired//自动注入Mapper
+    public CustomerMapper customerMapper;
+    @Autowired//自动注入Mapper
+    public InRecordMapper inRecordMapper;
     String result = Type.FAIL;
     int num = 0;
 
@@ -80,11 +87,36 @@ public class StoreServiceImpl implements StoreService {
                              String standard,
                              String customerName,
                              String userId,
-                             String belongId) {
-        PageHelper.startPage(page, rows);
-        List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard,    customerName,   userId,belongId);
-        PageInfo<Store> pageInfo = new PageInfo<>(list);
-        result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
+                             String belongId,
+                             String plateNo,
+                             String ordNo,
+                             String contractNo,
+                             String fkcustmerName) {
+        List<String> pltNos =new ArrayList<>() ;
+        List<String> ordNos =new ArrayList<>() ;
+        List<String> contractNos =new ArrayList<>() ;
+        if (plateNo.indexOf(",") != -1){
+            pltNos = Arrays.asList(plateNo.split(","));
+        }
+        if (ordNo.indexOf(",") != -1){
+            ordNos = Arrays.asList(ordNo.split(","));
+        }
+        if (contractNo.indexOf(",") != -1){
+            contractNos = Arrays.asList(contractNo.split(","));
+        }
+
+        if (page == -1 && rows == -1){
+            List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard,    customerName,   userId,belongId,
+                    fkcustmerName,plateNo,ordNo,contractNo,pltNos,ordNos,contractNos);
+            result = JSONTools.toStringyyyyMMddHHmmss(list);
+        }else {
+            PageHelper.startPage(page, rows);
+            List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard,    customerName,   userId,belongId,
+                    fkcustmerName,plateNo,ordNo,contractNo,pltNos,ordNos,contractNos);
+            PageInfo<Store> pageInfo = new PageInfo<>(list);
+            result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
+        }
+
         return result;
     }
 
@@ -216,4 +248,89 @@ public class StoreServiceImpl implements StoreService {
 //        return result;
 //
 //    }
+    @Override
+    public String changeAll(String json,
+                            String newCustomername,
+                            String newFKCustomername,
+                            String newContractno,
+                            String newOrdno,
+                            String newReceiveaddress,
+                            String newProductionplace,
+                            String newPackno,
+                            String userId,
+                            String belongId) {
+        List<Store> list = JSON.parseObject(json, new TypeReference<List<Store>>() {
+        });
+        Customer customer = new Customer();
+        Customer kfcustomer = new Customer();
+        if(newCustomername != null && !newCustomername.equals("")){
+            customer = customerMapper.selectByName(newCustomername,belongId);
+
+        }
+
+        if(newFKCustomername != null && !newFKCustomername.equals("")){
+            kfcustomer = customerMapper.selectByName(newFKCustomername,belongId);
+
+        }
+
+        for(int i = 0; i < list.size(); i++){
+            InRecord inRecord = inRecordMapper.selectByPrimaryKey(list.get(i).getInId());
+            if (newCustomername != null && !newCustomername.equals("")){
+                list.get(i).setCustomer(customer);
+                inRecord.setCustomerName(newCustomername);
+            }
+            if(newFKCustomername != null && !newFKCustomername.equals("")){
+                list.get(i).setFkComponyId(kfcustomer.getId());
+                num += storeMapper.updateFKByPKey(list.get(i));
+                inRecord.setFkComponyName(kfcustomer.getId());
+            }
+
+
+            if (newContractno != null && !newContractno.equals("")){
+                list.get(i).setContractNo(newContractno);
+                inRecord.setContractNo(newContractno);
+            } else if (newContractno.equals("0")) {
+                list.get(i).setContractNo("");
+                inRecord.setContractNo("");
+            }
+
+            if (newOrdno != null && !newOrdno.equals("")){
+                list.get(i).setOrdNo(newOrdno);
+                inRecord.setOrdNo(newOrdno);
+            } else if (newOrdno.equals("0")) {
+                list.get(i).setOrdNo("");
+                inRecord.setOrdNo("");
+            }
+
+            if (newReceiveaddress != null && !newReceiveaddress.equals("")){
+                list.get(i).setReceiveAddress(newReceiveaddress);
+                inRecord.setReceiveAddress(newReceiveaddress);
+            } else if (newReceiveaddress.equals("0")) {
+                list.get(i).setReceiveAddress("");
+                inRecord.setReceiveAddress("");
+            }
+
+            if (newProductionplace != null && !newProductionplace.equals("")){
+                list.get(i).setProductionPlace(newProductionplace);
+                inRecord.setProductionPlace(newProductionplace);
+            } else if (newProductionplace.equals("0")) {
+                list.get(i).setProductionPlace("");
+                inRecord.setProductionPlace("");
+            }
+
+            if (newPackno != null && !newPackno.equals("")){
+                list.get(i).setPackNo(newPackno);
+                inRecord.setPackNo(newPackno);
+            } else if (newPackno.equals("0")) {
+                list.get(i).setPackNo("");
+                inRecord.setPackNo("");
+            }
+            num += storeMapper.updateByPrimaryKey(list.get(i));
+
+
+            num += inRecordMapper.updateIn(inRecord);
+
+        }
+        return Tools.moreThanZeroResultJSON(num);
+    }
 }

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

@@ -12,4 +12,7 @@ public interface OutRecordService {
     String saveVerifyAcc(String json, String accWgt, String accAmt, String invoiceAmt, String accDate, String accReminder, String userId, String belongId);
 
     String savePriceMod(String json, String modPrice, String userId, String belongId);
+
+    String saveCar(String json,String truckNo,String driverName,String driverPhone,String userId,String belongId);
+
 }

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

@@ -11,9 +11,23 @@ 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 userId,String belongId,
+                      String plateNo, String ordNo, String contractNo,String fkcustmerName);
 
     String modifyCustomer(String id,String customerNameOld,String customerNameNew);
 
     String modifyCustomeradress(String id,String customerAddressOld,String customerAddressNew);
+
+    String changeAll(String json,
+                     String newCustomername,
+                     String newFKCustomername,
+                     String newContractno,
+                     String newOrdno,
+                     String newReceiveaddress,
+                     String newProductionplace,
+                     String newPackno,
+                     String userId,
+                     String belongId);
+
 }

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

@@ -323,7 +323,12 @@
     receive_address = #{receiveAddress,jdbcType=VARCHAR},
         contract_no= #{contractNo,jdbcType=VARCHAR},
         pack_no= #{packNo,jdbcType=VARCHAR},
-        out_flag= #{outFlag,jdbcType=VARCHAR}
+        out_flag= #{outFlag,jdbcType=VARCHAR},
+      ord_no= #{ordNo,jdbcType=VARCHAR},
+        fk_compony_name= #{fkComponyName,jdbcType=VARCHAR},
+        production_place= #{productionPlace,jdbcType=VARCHAR}
+
+
     where id = #{id,jdbcType=VARCHAR}
   </update>
 

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

@@ -390,6 +390,7 @@
     set t.invoice_price = #{invoicePrice,jdbcType=DOUBLE}
     where id = #{id,jdbcType=VARCHAR}
   </update>
+
   <update id="cleanVerifyInfo" parameterType="java.lang.String" >
     update t_ware_out_record t
     set t.verify_account_id = null

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

@@ -371,7 +371,9 @@
         keep_day = #{keepDay,jdbcType=DOUBLE},
         ord_price = #{ordPrice,jdbcType=DOUBLE},
         out_ord_price = #{outOrdPrice,jdbcType=DOUBLE},
-        pay_way = #{payWay,jdbcType=VARCHAR}
+        pay_way = #{payWay,jdbcType=VARCHAR},
+        ord_no= #{ordNo,jdbcType=VARCHAR},
+        production_place= #{productionPlace,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 
@@ -493,6 +495,26 @@ 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  e.name like concat('%',#{param9,jdbcType=VARCHAR},'%')
+
+      and  (t.plate_no like concat('%',#{param10,jdbcType=VARCHAR},'%')
+    <if test="param13 != null and param13.size() !=0" >
+      or t.plate_no IN <foreach  item="item" collection="param13" index="index"  open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}  </foreach>
+    </if>
+    )
+    and  (t.ord_no like concat('%',#{param11,jdbcType=VARCHAR},'%')
+    <if test="param14 != null and param14.size() !=0" >
+      OR t.ord_no IN <foreach  item="item" collection="param14" index="index"  open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}  </foreach>
+    </if>
+    )
+    and  (t.contract_no like concat('%',#{param12,jdbcType=VARCHAR},'%')
+    <if test="param15 != null and param15.size() !=0" >
+      OR t.contract_no IN <foreach  item="item" collection="param15" index="index"  open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}  </foreach>
+    </if>
+    )
     and t.belong_id = #{param8,jdbcType=VARCHAR}
     and t.cancel_flag = '0'
     and t.out_flag = '0'