入库页面测试0403

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

@@ -0,0 +1,160 @@
+package com.th.demo.controller.ware;
+
+import com.th.demo.model.system.ResponseCodeMsg;
+import com.th.demo.model.system.Type;
+import com.th.demo.service.ware.InStoreService;
+import com.th.demo.tools.JSONTools;
+import org.activiti.rest.editor.model.ModelEditorJsonRestResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
+
+@RestController
+@RequestMapping(value = "/WareInStore")
+public class InStoreController {
+    @Autowired
+    public InStoreService inStoreService;
+    String result = Type.FAIL;
+    protected static final Logger logger = LoggerFactory.getLogger(ModelEditorJsonRestResource.class);
+    @RequestMapping(value = "/query.do")//查询方法 前两个参数是分页参数
+    public String query(
+            int page,
+            int rows,
+            String wareName,
+            String stackName,
+            HttpServletRequest request) {
+
+        try {
+            String userId = (String) request.getAttribute("userId");
+            String belongId = (String) request.getAttribute("belongId");
+            result = inStoreService.query(page,rows,wareName, stackName, userId, belongId);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        } finally {
+            return result;
+        }
+    }
+
+
+    @RequestMapping(value = "/queryLayerByStackId.do")//查询方法 前两个参数是分页参数
+    public String queryLayerByStackId(  String stackId,
+                                        HttpServletRequest request) {
+
+        try {
+            String userId = (String) request.getAttribute("userId");
+            String belongId = (String) request.getAttribute("belongId");
+            result = inStoreService.queryLayerByStackId(stackId, userId, belongId);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        } finally {
+            return result;
+        }
+    }
+
+    @RequestMapping(value = "/queryByWareIdStackId.do")//查询方法 前两个参数是分页参数
+    public String queryByWareIdStackId(String wareId,
+                                           String stackId,
+                                           HttpServletRequest request) {
+
+        try {
+            String userId = (String) request.getAttribute("userId");
+            String belongId = (String) request.getAttribute("belongId");
+            result = inStoreService.queryByWareIdStackId(wareId, stackId, userId, belongId);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        } finally {
+            return result;
+        }
+    }
+
+    @RequestMapping(value = "/modify.do")
+    public String updateStore(String json,HttpServletRequest request){
+
+        try{
+            String userId = (String) request.getAttribute("userId");
+            String belongId = (String) request.getAttribute("belongId");
+            result = inStoreService.modify(json,userId,belongId);
+        }catch (Exception ex){
+            ex.printStackTrace();
+            result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        }finally {
+            return result;
+        }
+
+    }
+
+    //根据部分字段查询库存记录
+    @RequestMapping(value = "/queryStore.do")
+    public String queryStore(int page,int rows,
+                              String wareName,
+                              String areaName,
+                              String stackName,
+                              String plateNo,
+                              String ordNo,
+                              HttpServletRequest request) {
+
+        try {
+            String userId = (String) request.getAttribute("userId");
+            String belongId = (String) request.getAttribute("belongId");
+            // 参数校验
+            if (userId == null || belongId == null) {
+                result = JSONTools.toString(ResponseCodeMsg.CODE_EX, "用户ID或归属ID缺失");
+                return result;
+            }
+            result = inStoreService.queryStore(page,rows,
+                    wareName,
+                    areaName,
+                    stackName,
+                    plateNo,
+                    ordNo,
+                    userId,
+                    belongId);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            logger.error("业务逻辑异常", ex);
+            result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        } finally {
+            logger.info("业务逻辑正常");
+            return result;
+        }
+    }
+
+    @RequestMapping(value = "/modifyCustomer.do")
+    public String modifyCustomer(String id,String customerNameOld,String customerNameNew,HttpServletRequest request) {
+
+        try {
+            String userId = (String) request.getAttribute("userId");
+            String belongId = (String) request.getAttribute("belongId");
+            result=inStoreService.modifyCustomer(id,customerNameOld,customerNameNew);
+
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        } finally {
+            return result;
+        }
+    }
+
+    @RequestMapping(value = "/updateCustomerAddress.do")
+    public String updateCustomerAddress(String id,String customerAddressOld,String customerAddressNew,HttpServletRequest request) {
+
+        try {
+            String userId = (String) request.getAttribute("userId");
+            String belongId = (String) request.getAttribute("belongId");
+            result=inStoreService.modifyCustomeradress(id,customerAddressOld,customerAddressNew);
+
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        } finally {
+            return result;
+        }
+    }
+
+}

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

@@ -0,0 +1,55 @@
+package com.th.demo.mapping.ware;
+
+import com.th.demo.model.ware.Store;
+import com.th.demo.model.ware.InStore;
+
+import com.th.demo.model.ware.StoreOfWareStack;
+import com.th.demo.model.ware.TotalRecord;
+
+import java.util.List;
+import java.util.Map;
+
+public interface InStoreMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(Store record);
+
+    int insertSelective(Store record);
+
+    InStore selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(Store record);
+
+    int updateByPrimaryKey(Store record);
+
+    String selectLayerByStackId(String stackId, String belongId);
+
+    List<InStore> selectByWareIdStackId(String wareId, String stackId, String belongId);
+
+    List<InStore> select(String wareName, String stackName, String userId, String belongId);
+
+    List<InStore>  selectForUpDown(String wareName, String stackName, String userId, String belongId, int min, int max);
+
+    InStore selectByOutId(String id, String noUserParam, String userId, String belongId);
+
+    List<InStore> selectStore(String wareName, String areaName, String stackName, String plateNo, String ordNo, String userId, String belongId);
+
+    int updateForUpDownByLayer(String wareName, String stackName, String userId, String belongId, int min, int max, int i);
+
+    int updateForUpDownByStep(String wareName, String stackName, String userId, String belongId, int min, int max, int i);
+
+    List<StoreOfWareStack> selectWareStackByDistributionStore(Map<String, Object> map);
+
+    List<InStore> selectByWareIdStackIdInStoreId(Map<String, Object> mapParam);
+
+    int updateDistributionById(Map<String, Object> map);
+
+    List<InStore> selectForCustomer(String wareName, String stackName, String model, String materialName, String standard, String customerName, String plateNo, String beginDate,
+                                  String endDate, String userId, String ordNo);
+
+    List<TotalRecord> queryTotal(String wareName, String stackName, String model, String materialName, String standard, String customerName, String plateNo, String beginDate, String endDate, String userId, String ordNo);
+
+    int selEffStore(String plateNo);
+
+    void updateByOutId(String id, String noUserParam, String userId, String belongId);
+}

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

@@ -0,0 +1,421 @@
+package com.th.demo.model.ware;
+
+import com.th.demo.model.maint.Customer;
+import com.th.demo.model.maint.Material;
+import com.th.demo.model.maint.Stack;
+import com.th.demo.model.maint.Ware;
+
+import com.th.demo.model.system.SysUser;
+
+import java.util.Date;
+
+public class InStore  implements Comparable<InStore>{
+    private String id;
+
+    private Ware ware;
+
+    private Stack stack;
+
+    private Integer layer;
+
+    private Material material;
+
+    private String model;
+
+    private Customer customer;
+    private Double count;
+
+    private Double weight;
+
+    private String remark;
+
+    private String addId;
+
+    private Date addTime;
+
+    private String modifyId;
+
+    private Date modifyTime;
+
+    private String cancelId;
+
+    private Date cancelTime;
+
+    private String cancelFlag;
+
+    private String belongId;
+
+    private String plateNo;
+
+    private String inId;
+
+    private String outId;
+
+    private String receiveAddress;
+
+    private String outFlag;
+
+    private String lockFlag;
+
+    private String wgtDcnMtcCd;
+
+    private String edgeTy;
+
+    private String productionPlace;
+
+    private String ordNo;
+
+    private SysUser addUser;
+
+    private String carNo;
+
+    private String tallyPeople;
+
+    private String fkComponyId ;
+
+    private Double invoicePrice;
+    private String contractNo;
+    private String customerName;
+
+    public String getCustomerName() {
+        return customerName;
+    }
+
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName;
+    }
+
+    public String getContractNo() {
+        return contractNo;
+    }
+
+    public void setContractNo(String contractNo) {
+        this.contractNo = contractNo;
+    }
+
+    public Double getInvoicePrice() {
+        return invoicePrice;
+    }
+
+    public void setInvoicePrice(Double invoicePrice) {
+        this.invoicePrice = invoicePrice;
+    }
+
+    public String getFkComponyId() {
+        return fkComponyId;
+    }
+
+    public void setFkComponyId(String fkComponyId) {
+        this.fkComponyId = fkComponyId;
+    }
+
+    public String getTallyPeople() {
+        return tallyPeople;
+    }
+
+    public void setTallyPeople(String tallyPeople) {
+        this.tallyPeople = tallyPeople;
+    }
+
+    public String getCarNo() {
+        return carNo;
+    }
+
+    public void setCarNo(String carNo) {
+        this.carNo = carNo;
+    }
+
+    public SysUser getAddUser() {
+        return addUser;
+    }
+
+    public void setAddUser(SysUser addUser) {
+        this.addUser = addUser;
+    }
+
+    public String getOrdNo() {
+        return ordNo;
+    }
+
+    public void setOrdNo(String ordNo) {
+        this.ordNo = ordNo;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+//    public String getWareName() {
+//        return wareName;
+//    }
+//
+
+    public String getWgtDcnMtcCd() {
+        return wgtDcnMtcCd;
+    }
+
+    public void setWgtDcnMtcCd(String wgtDcnMtcCd) {
+        this.wgtDcnMtcCd = wgtDcnMtcCd;
+    }
+
+    public String getEdgeTy() {
+        return edgeTy;
+    }
+
+    public void setEdgeTy(String edgeTy) {
+        this.edgeTy = edgeTy;
+    }
+
+    public String getProductionPlace() {
+        return productionPlace;
+    }
+
+    public void setProductionPlace(String productionPlace) {
+        this.productionPlace = productionPlace;
+    }
+
+//    public void setWareName(String wareName) {
+//        this.wareName = wareName == null ? null : wareName.trim();
+//    }
+//
+//    public String getStackName() {
+//        return stackName;
+//    }
+//
+//    public void setStackName(String stackName) {
+//        this.stackName = stackName == null ? null : stackName.trim();
+//    }
+
+    public Integer getLayer() {
+        return layer;
+    }
+
+    public void setLayer(Integer layer) {
+        this.layer = layer;
+    }
+
+//    public String getMaterialName() {
+//        return materialName;
+//    }
+//
+//    public void setMaterialName(String materialName) {
+//        this.materialName = materialName == null ? null : materialName.trim();
+//    }
+//
+//    public String getMaterialNo() {
+//        return materialNo;
+//    }
+//
+//    public void setMaterialNo(String materialNo) {
+//        this.materialNo = materialNo == null ? null : materialNo.trim();
+//    }
+//
+//    public String getStandard() {
+//        return standard;
+//    }
+//
+//    public void setStandard(String standard) {
+//        this.standard = standard == null ? null : standard.trim();
+//    }
+
+    public String getModel() {
+        return model;
+    }
+
+    public void setModel(String model) {
+        this.model = model == null ? null : model.trim();
+    }
+
+//    public String getCustomerName() {
+//        return customerName;
+//    }
+//
+//    public void setCustomerName(String customerName) {
+//        this.customerName = customerName == null ? null : customerName.trim();
+//    }
+
+//    public String getCustomerNo() {
+//        return customerNo;
+//    }
+//
+//    public void setCustomerNo(String customerNo) {
+//        this.customerNo = customerNo == null ? null : customerNo.trim();
+//    }
+
+    public Double getCount() {
+        return count;
+    }
+
+    public void setCount(Double count) {
+        this.count = count;
+    }
+
+    public Double getWeight() {
+        return weight;
+    }
+
+    public void setWeight(Double weight) {
+        this.weight = weight;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public String getAddId() {
+        return addId;
+    }
+
+    public void setAddId(String addId) {
+        this.addId = addId == null ? null : addId.trim();
+    }
+
+    public Date getAddTime() {
+        return addTime;
+    }
+
+    public void setAddTime(Date addTime) {
+        this.addTime = addTime;
+    }
+
+    public String getModifyId() {
+        return modifyId;
+    }
+
+    public void setModifyId(String modifyId) {
+        this.modifyId = modifyId == null ? null : modifyId.trim();
+    }
+
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    public String getCancelId() {
+        return cancelId;
+    }
+
+    public void setCancelId(String cancelId) {
+        this.cancelId = cancelId == null ? null : cancelId.trim();
+    }
+
+    public Date getCancelTime() {
+        return cancelTime;
+    }
+
+    public void setCancelTime(Date cancelTime) {
+        this.cancelTime = cancelTime;
+    }
+
+    public String getCancelFlag() {
+        return cancelFlag;
+    }
+
+    public void setCancelFlag(String cancelFlag) {
+        this.cancelFlag = cancelFlag == null ? null : cancelFlag.trim();
+    }
+
+    public String getBelongId() {
+        return belongId;
+    }
+
+    public void setBelongId(String belongId) {
+        this.belongId = belongId == null ? null : belongId.trim();
+    }
+
+    public String getPlateNo() {
+        return plateNo;
+    }
+
+    public void setPlateNo(String plateNo) {
+        this.plateNo = plateNo == null ? null : plateNo.trim();
+    }
+
+    public String getInId() {
+        return inId;
+    }
+
+    public void setInId(String inId) {
+        this.inId = inId == null ? null : inId.trim();
+    }
+
+    public String getOutId() {
+        return outId;
+    }
+
+    public void setOutId(String outId) {
+        this.outId = outId == null ? null : outId.trim();
+    }
+
+    public String getReceiveAddress() {
+        return receiveAddress;
+    }
+
+    public void setReceiveAddress(String receiveAddress) {
+        this.receiveAddress = receiveAddress == null ? null : receiveAddress.trim();
+    }
+
+    public String getOutFlag() {
+        return outFlag;
+    }
+
+    public void setOutFlag(String outFlag) {
+        this.outFlag = outFlag;
+    }
+
+    public String getLockFlag() {
+        return lockFlag;
+    }
+
+    public void setLockFlag(String lockFlag) {
+        this.lockFlag = lockFlag;
+    }
+
+    public Ware getWare() {
+        return ware;
+    }
+
+    public void setWare(Ware ware) {
+        this.ware = ware;
+    }
+
+    public Stack getStack() {
+        return stack;
+    }
+
+    public void setStack(Stack stack) {
+        this.stack = stack;
+    }
+
+    public Material getMaterial() {
+        return material;
+    }
+
+    public void setMaterial(Material material) {
+        this.material = material;
+    }
+
+    public Customer getCustomer() {
+        return customer;
+    }
+
+    public void setCustomer(Customer customer) {
+        this.customer = customer;
+    }
+
+    @Override
+    public int compareTo(InStore o) {
+        return 0;
+    }
+}

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

@@ -0,0 +1,214 @@
+package com.th.demo.service.impl.ware;
+
+import com.alibaba.fastjson.JSON;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.th.demo.mapping.ware.ChangeRecordMapper;
+import com.th.demo.mapping.ware.StoreMapper;
+import com.th.demo.mapping.ware.InStoreMapper;
+
+import com.th.demo.model.system.Type;
+import com.th.demo.model.ware.Store;
+import com.th.demo.model.ware.InStore;
+import com.th.demo.service.ware.StoreService;
+import com.th.demo.service.ware.InStoreService;
+import com.th.demo.tools.JSONTools;
+import com.th.demo.tools.Tools;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("InStoreService")
+public class InStoreServiceImpl implements InStoreService {
+
+    @Autowired//自动注入Mapper
+    public ChangeRecordMapper changeRecordMapper;
+    @Autowired//自动注入Mapper
+    public StoreMapper storeMapper;
+    @Autowired//自动注入Mapper
+    public InStoreMapper inStoreMapper;
+    String result = Type.FAIL;
+    int num = 0;
+
+    @Override
+    public String queryLayerByStackId(String stackId, String userId, String belongId) {
+
+        String layer = inStoreMapper.selectLayerByStackId(stackId, belongId);
+        if (layer == null) {
+            layer = "0";
+        }
+        int currentLayer = Integer.parseInt(layer) + 1;
+        result = JSONTools.toStringyyyyMMddHHmmss(currentLayer);
+        return result;
+    }
+
+    @Override
+    public String queryByWareIdStackId(String wareId, String stackId, String userId, String belongId) {
+       List<InStore> list =  inStoreMapper.selectByWareIdStackId(  wareId,   stackId, belongId);
+        result = JSONTools.toStringyyyyMMddHHmmss(list);
+        return result;
+    }
+
+    @Override
+    public String query(int page, int rows, String wareName, String stackName, String userId, String belongId) {
+        PageHelper.startPage(page, rows);
+        List<InStore> list   = inStoreMapper.select(wareName, stackName, userId,belongId);
+        PageInfo<InStore> pageInfo = new PageInfo<>(list);
+        result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
+        return result;
+    }
+
+    @Override
+    public String modify(String json, String userId, String belongId) {
+        Store store = JSON.parseObject(json,Store.class);
+        int num =inStoreMapper.updateByPrimaryKey(store);
+        result=Tools.moreThanZeroResultJSON(num);
+        return result;
+    }
+
+    @Override
+    public String queryStore(int page, int rows,
+                             String wareName,
+                             String areaName,
+                             String stackName,
+                             String plateNo,
+                             String ordNo,
+                             String userId,
+                             String belongId) {
+        PageHelper.startPage(page, rows);
+        List<InStore> list=inStoreMapper.selectStore(wareName, areaName, stackName, plateNo, ordNo, userId,belongId);
+        PageInfo<InStore> pageInfo = new PageInfo<>(list);
+        result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
+        return result;
+    }
+
+    @Override
+    public String modifyCustomer(String id,String customerNameOld,String customerNameNew) {
+//        Store store =inStoreMapper.selectByPrimaryKey(id);
+//        store.setCustomerName(customerNameNew);
+//        ChangeRecord changeRecord =new ChangeRecord();
+//        changeRecord.setWareName(store.getWareName());
+//        changeRecord.setStackName(store.getStackName());
+//        changeRecord.setId(store.getId());
+//        changeRecord.setLayer(store.getLayer());
+//        changeRecord.setMaterialName(store.getMaterialName());
+//        changeRecord.setMaterialNo(store.getMaterialNo());
+//        changeRecord.setStandard(store.getStandard());
+//        changeRecord.setModel(store.getModel());
+//        changeRecord.setCustomerNameOld(customerNameOld);
+//        changeRecord.setCustomerNameNew(customerNameNew);
+//        changeRecord.setCount(store.getCount());
+//        changeRecord.setRemark(store.getRemark());
+//        changeRecord.setAddTime(store.getAddTime());
+//        changeRecord.setModifyId(store.getModifyId());
+//        changeRecord.setModifyTime(store.getModifyTime());
+//        changeRecord.setCancelId(store.getCancelId());
+//        changeRecord.setCancelTime(store.getCancelTime());
+//        changeRecord.setCancelFlag(store.getCancelFlag());
+//        changeRecord.setBelongId(store.getBelongId());
+//        changeRecord.setPlateNo(store.getPlateNo());
+//        changeRecord.setOutId(store.getOutId());
+//        changeRecord.setAddId(store.getAddId());
+//
+//        changeRecordMapper.insert(changeRecord);
+//        num = inStoreMapper.updateByPrimaryKey(store);
+//        result = JSONTools.toString(num);
+        return result;
+    }
+
+    @Override
+    public String modifyCustomeradress(String id, String customerAddressOld, String customerAddressNew) {
+//        Store store =inStoreMapper.selectByPrimaryKey(id);
+//        store.setReceiveAddress(customerAddressNew);
+//        ChangeRecord changeRecord =new ChangeRecord();
+//        changeRecord.setWareName(store.getWareName());
+//        changeRecord.setStackName(store.getStackName());
+//        changeRecord.setId(store.getId());
+//        changeRecord.setLayer(store.getLayer());
+//        changeRecord.setMaterialName(store.getMaterialName());
+//        changeRecord.setMaterialNo(store.getMaterialNo());
+//        changeRecord.setStandard(store.getStandard());
+//        changeRecord.setModel(store.getModel());
+//        changeRecord.setReceiveAddressNew(store.getReceiveAddress());
+//        changeRecord.setCustomerNameNew(customerAddressNew);
+//        changeRecord.setCustomerNameOld(customerAddressOld);
+//        changeRecord.setCount(store.getCount());
+//        changeRecord.setRemark(store.getRemark());
+//        changeRecord.setAddTime(store.getAddTime());
+//        changeRecord.setModifyId(store.getModifyId());
+//        changeRecord.setModifyTime(store.getModifyTime());
+//        changeRecord.setCancelId(store.getCancelId());
+//        changeRecord.setCancelTime(store.getCancelTime());
+//        changeRecord.setCancelFlag(store.getCancelFlag());
+//        changeRecord.setBelongId(store.getBelongId());
+//        changeRecord.setPlateNo(store.getPlateNo());
+//        changeRecord.setOutId(store.getOutId());
+//        changeRecord.setAddId(store.getAddId());
+//
+//        changeRecordMapper.insert(changeRecord);
+//        num = inStoreMapper.updateByPrimaryKey(store);
+//        result = JSONTools.toString(num);
+        return result;
+    }
+
+    //
+
+
+
+//    @Override
+//    public String save(String json, String userId) {
+//        Assets  assets = JSON.parseObject(json, Assets.class);
+//        Assets isnull = assetsMapper.selectByPrimaryKey(assets.getId());
+//        assets.setStatus("正常");
+//        if(isnull==null){
+//        /*assets.setAddId(userId);
+//        assets.setAddTime(new Date());
+//        assets.setCancelFlag("0");*/
+//            num = assetsMapper.insert(assets);
+//            result =JSONTools.toString(num);
+//        }else{
+//        /*arcd.setModifyId(userId);
+//        arcd.setModifyTime(new Date());*/
+//            num = assetsMapper.updateByPrimaryKey(assets);
+//            result =JSONTools.toString(num);
+//        }
+//        return result;
+//    }
+
+//
+//    @Override
+//    public String save(String json, String userId, String belongId) {
+//        result = Type.FAIL;
+//        Customer customer = JSON.parseObject(json, new TypeReference<Customer>() {
+//        });
+//        if (customer.getId() == null || customer.getId().equals("")) {
+//            customer.setAddId(userId);
+//            customer.setAddTime(new Date());
+//            customer.setModifyId(userId);
+//            customer.setModifyTime(new Date());
+//            customer.setCancelFlag("0");
+//            customer.setBelongId(belongId);
+//            num = customerMapper.insert(customer);
+//        } else {
+//            customer.setModifyId(userId);
+//            customer.setModifyTime(new Date());
+//            num = customerMapper.updateByPrimaryKey(customer);
+//        }
+//        result = Tools.moreThanZeroResultJSON(num);
+//        return result;
+//    }
+//
+//
+//    @Override
+//    public String remove(String id, String userId) {
+//        Customer customer = customerMapper.selectByPrimaryKey(id);
+//        customer.setCancelFlag("9");
+//        customer.setCancelId(userId);
+//        customer.setCancelTime(new Date());
+//        num = customerMapper.updateByPrimaryKey(customer);
+//        result = Tools.moreThanZeroResultJSON(num);
+//        return result;
+//
+//    }
+}

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

@@ -0,0 +1,20 @@
+package com.th.demo.service.ware;
+import com.th.demo.model.ware.Store;
+import com.th.demo.model.ware.InStore;
+
+
+public interface InStoreService {
+    String queryLayerByStackId(String stackId, String userId, String belongId);
+
+    String queryByWareIdStackId(String wareId, String stackId, String userId, String belongId);
+
+    String query(int page, int rows, String wareName, String stackName, String userId, String belongId);
+    
+    String modify(String json, String userId, String belongId);
+
+    String queryStore(int page, int rows, String wareName, String areaName, String stackName, String plateNo, String ordNo, String userId, String belongId);
+
+    String modifyCustomer(String id, String customerNameOld, String customerNameNew);
+
+    String modifyCustomeradress(String id, String customerAddressOld, String customerAddressNew);
+}

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

@@ -0,0 +1,534 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.th.demo.mapping.ware.InStoreMapper" >
+  <resultMap id="BaseResultMap" type="com.th.demo.model.ware.InStore" >
+    <id column="id" property="id" jdbcType="VARCHAR" />
+    <result column="layer" property="layer" jdbcType="INTEGER" />
+    <result column="model" property="model" jdbcType="VARCHAR" />
+    <result column="plate_no" property="plateNo" jdbcType="VARCHAR" />
+    <result column="count" property="count" jdbcType="DOUBLE" />
+    <result column="weight" property="weight" jdbcType="DOUBLE" />
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
+    <result column="add_id" property="addId" jdbcType="VARCHAR" />
+    <result column="add_time" property="addTime" jdbcType="TIMESTAMP" />
+    <result column="modify_id" property="modifyId" jdbcType="VARCHAR" />
+    <result column="modify_time" property="modifyTime" jdbcType="TIMESTAMP" />
+    <result column="cancel_id" property="cancelId" jdbcType="VARCHAR" />
+    <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="in_id" property="inId" jdbcType="VARCHAR" />
+    <result column="out_id" property="outId" jdbcType="VARCHAR" />
+    <result column="receive_address" property="receiveAddress" jdbcType="VARCHAR" />
+    <result column="out_flag" property="outFlag" jdbcType="VARCHAR" />
+    <result column="lock_flag" property="lockFlag" jdbcType="VARCHAR" />
+
+    <result column="wgt_dcn_mtc_cd" property="wgtDcnMtcCd" jdbcType="VARCHAR" />
+    <result column="edge_ty" property="edgeTy" jdbcType="VARCHAR" />
+    <result column="production_place" property="productionPlace" jdbcType="VARCHAR" />
+    <result column="ord_no" property="ordNo" jdbcType="VARCHAR" />
+    <result column="car_no" property="carNo" jdbcType="VARCHAR" />
+    <result column="tally_people" property="tallyPeople" jdbcType="VARCHAR" />
+    <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" />
+    <result column="customer_name" property="customerName" jdbcType="VARCHAR" />
+
+    <association  column="ware_id" property="ware" select="com.th.demo.mapping.maint.WareMapper.selectByPrimaryKey" />
+    <association  column="stack_id" property="stack" select="com.th.demo.mapping.maint.StackMapper.selectByPrimaryKey" />
+    <association  column="material_id" property="material" select="com.th.demo.mapping.maint.MaterialMapper.selectByPrimaryKey" />
+    <association  column="customer_id" property="customer" select="com.th.demo.mapping.maint.CustomerMapper.selectByPrimaryKey" />
+    <association  column="add_id" property="addUser" select="com.th.demo.mapping.system.SysUserMapper.selectByPrimaryKey" />
+  </resultMap>
+
+
+
+  <resultMap id="StoreOfWareStack" type="com.th.demo.model.ware.StoreOfWareStack" >
+    <result column="ware_id" property="wareId" jdbcType="VARCHAR" />
+    <result column="stack_id" property="stackId" jdbcType="VARCHAR" />
+  </resultMap>
+
+  <resultMap id="TotalResultMap" type="com.th.demo.model.ware.TotalRecord">
+    <result column="total_amount" property="totalAmount" jdbcType="DOUBLE" />
+    <result column="total_weight" property="totalWeight" jdbcType="DOUBLE" />
+  </resultMap>
+
+  <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
+  </sql>
+
+
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from t_ware_store
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from t_ware_store
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+
+  <insert id="insert" parameterType="com.th.demo.model.ware.Store" >
+
+   <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.String">
+     SELECT  REPLACE(UUID(),'-','') as id from dual
+   </selectKey>
+
+    insert into t_ware_store (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,ord_no
+      ,car_no,tally_people,fk_compony_id,invoice_price
+    )
+    values (#{id,jdbcType=VARCHAR}, #{ware.id,jdbcType=VARCHAR}, #{stack.id,jdbcType=VARCHAR},
+      #{layer,jdbcType=INTEGER}, #{material.id,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR},
+      #{plateNo,jdbcType=VARCHAR}, #{customer.id,jdbcType=VARCHAR}, #{count,jdbcType=DOUBLE},
+      #{weight,jdbcType=DOUBLE}, #{remark,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}, #{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}
+      )
+  </insert>
+
+  <insert id="insertSelective" parameterType="com.th.demo.model.ware.Store" >
+    insert into t_ware_store
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="wareName != null" >
+        ware_name,
+      </if>
+      <if test="stackName != null" >
+        stack_name,
+      </if>
+      <if test="layer != null" >
+        layer,
+      </if>
+      <if test="materialName != null" >
+        material_name,
+      </if>
+      <if test="materialNo != null" >
+        material_no,
+      </if>
+      <if test="standard != null" >
+        standard,
+      </if>
+      <if test="model != null" >
+        model,
+      </if>
+      <if test="customerName != null" >
+        customer_name,
+      </if>
+      <if test="customerNo != null" >
+        customer_no,
+      </if>
+      <if test="count != null" >
+        count,
+      </if>
+      <if test="weight != null" >
+        weight,
+      </if>
+      <if test="remark != null" >
+        remark,
+      </if>
+      <if test="addId != null" >
+        add_id,
+      </if>
+      <if test="addTime != null" >
+        add_time,
+      </if>
+      <if test="modifyId != null" >
+        modify_id,
+      </if>
+      <if test="modifyTime != null" >
+        modify_time,
+      </if>
+      <if test="cancelId != null" >
+        cancel_id,
+      </if>
+      <if test="cancelTime != null" >
+        cancel_time,
+      </if>
+      <if test="cancelFlag != null" >
+        cancel_flag,
+      </if>
+      <if test="belongId != null" >
+        belong_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="wareName != null" >
+        #{wareName,jdbcType=VARCHAR},
+      </if>
+      <if test="stackName != null" >
+        #{stackName,jdbcType=VARCHAR},
+      </if>
+      <if test="layer != null" >
+        #{layer,jdbcType=INTEGER},
+      </if>
+      <if test="materialName != null" >
+        #{materialName,jdbcType=VARCHAR},
+      </if>
+      <if test="materialNo != null" >
+        #{materialNo,jdbcType=VARCHAR},
+      </if>
+      <if test="standard != null" >
+        #{standard,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null" >
+        #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="customerName != null" >
+        #{customerName,jdbcType=VARCHAR},
+      </if>
+      <if test="customerNo != null" >
+        #{customerNo,jdbcType=VARCHAR},
+      </if>
+      <if test="count != null" >
+        #{count,jdbcType=DOUBLE},
+      </if>
+      <if test="weight != null" >
+        #{weight,jdbcType=DOUBLE},
+      </if>
+      <if test="remark != null" >
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="addId != null" >
+        #{addId,jdbcType=VARCHAR},
+      </if>
+      <if test="addTime != null" >
+        #{addTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="modifyId != null" >
+        #{modifyId,jdbcType=VARCHAR},
+      </if>
+      <if test="modifyTime != null" >
+        #{modifyTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="cancelId != null" >
+        #{cancelId,jdbcType=VARCHAR},
+      </if>
+      <if test="cancelTime != null" >
+        #{cancelTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="cancelFlag != null" >
+        #{cancelFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="belongId != null" >
+        #{belongId,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.th.demo.model.ware.Store" >
+    update t_ware_store
+    <set >
+      <if test="wareName != null" >
+        ware_name = #{wareName,jdbcType=VARCHAR},
+      </if>
+      <if test="stackName != null" >
+        stack_name = #{stackName,jdbcType=VARCHAR},
+      </if>
+      <if test="layer != null" >
+        layer = #{layer,jdbcType=INTEGER},
+      </if>
+      <if test="materialName != null" >
+        material_name = #{materialName,jdbcType=VARCHAR},
+      </if>
+      <if test="materialNo != null" >
+        material_no = #{materialNo,jdbcType=VARCHAR},
+      </if>
+      <if test="standard != null" >
+        standard = #{standard,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null" >
+        model = #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="customerName != null" >
+        customer_name = #{customerName,jdbcType=VARCHAR},
+      </if>
+      <if test="customerNo != null" >
+        customer_no = #{customerNo,jdbcType=VARCHAR},
+      </if>
+      <if test="count != null" >
+        count = #{count,jdbcType=DOUBLE},
+      </if>
+      <if test="weight != null" >
+        weight = #{weight,jdbcType=DOUBLE},
+      </if>
+      <if test="remark != null" >
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="addId != null" >
+        add_id = #{addId,jdbcType=VARCHAR},
+      </if>
+      <if test="addTime != null" >
+        add_time = #{addTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="modifyId != null" >
+        modify_id = #{modifyId,jdbcType=VARCHAR},
+      </if>
+      <if test="modifyTime != null" >
+        modify_time = #{modifyTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="cancelId != null" >
+        cancel_id = #{cancelId,jdbcType=VARCHAR},
+      </if>
+      <if test="cancelTime != null" >
+        cancel_time = #{cancelTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="cancelFlag != null" >
+        cancel_flag = #{cancelFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="belongId != null" >
+        belong_id = #{belongId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.th.demo.model.ware.Store" >
+    update t_ware_store
+    set ware_id = #{ware.id,jdbcType=VARCHAR},
+      stack_id = #{stack.id,jdbcType=VARCHAR},
+      layer = #{layer,jdbcType=INTEGER},
+      material_id = #{material.id,jdbcType=VARCHAR},
+      model = #{model,jdbcType=VARCHAR},
+      plate_no = #{plateNo,jdbcType=VARCHAR},
+      customer_id = #{customer.id,jdbcType=VARCHAR},
+      count = #{count,jdbcType=DOUBLE},
+      weight = #{weight,jdbcType=DOUBLE},
+      remark = #{remark,jdbcType=VARCHAR},
+      add_id = #{addId,jdbcType=VARCHAR},
+      add_time = #{addTime,jdbcType=TIMESTAMP},
+      modify_id = #{modifyId,jdbcType=VARCHAR},
+      modify_time = #{modifyTime,jdbcType=TIMESTAMP},
+      cancel_id = #{cancelId,jdbcType=VARCHAR},
+      cancel_time = #{cancelTime,jdbcType=TIMESTAMP},
+      cancel_flag = #{cancelFlag,jdbcType=VARCHAR},
+      belong_id = #{belongId,jdbcType=VARCHAR},
+      in_id = #{inId,jdbcType=VARCHAR},
+      out_id = #{outId,jdbcType=VARCHAR},
+      receive_address = #{receiveAddress,jdbcType=VARCHAR},
+      out_flag = #{outFlag,jdbcType=VARCHAR},
+      lock_flag = #{lockFlag,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+
+
+
+  <select id="selectLayerByStackId" resultType="java.lang.String" >
+  SELECT ifnull(max(t.layer),0) from t_ware_store t
+  where t.stack_id =#{param1,jdbcType=VARCHAR}
+  and t.belong_id = #{param2,jdbcType=VARCHAR}
+  and ifnull(t.cancel_flag,'0') = '0'
+      and ifnull(t.out_flag,'0') = '0'
+  </select>
+
+  <select id="selectByWareIdStackId"  resultMap="BaseResultMap" >
+  SELECT b.name as fk_compony_id,t.* from t_ware_store t left join t_maint_customer b
+  on t.fk_compony_id = b.id
+  where t.ware_id =  #{param1,jdbcType=VARCHAR}
+  and t.stack_id =  #{param2,jdbcType=VARCHAR}
+  and t.belong_id = #{param3,jdbcType=VARCHAR}
+    and ifnull(t.cancel_flag,'0') = '0'
+    and ifnull(t.out_flag,'0') = '0'
+  order by layer desc
+  </select>
+
+  <select id="select"  resultMap="BaseResultMap" >
+
+select t.* from t_ware_store t where t.ware_name in (
+select b.name from t_maint_userware a ,t_maint_ware b  where a.ware_id = b.id
+and  user_id = #{param3,jdbcType=VARCHAR}  )  and t.belong_id = #{param4,jdbcType=VARCHAR}
+    <if test="param1 != ''" >
+      and  t.ware_name = #{param1,jdbcType=VARCHAR}
+    </if>
+    <if test="param2 != ''" >
+      and  t.stack_name = #{param2,jdbcType=VARCHAR}
+    </if>
+    and ifnull(t.cancel_flag,'0') = '0'
+    and ifnull(t.out_flag,'0') = '0'
+order by t.stack_name asc , t.layer desc
+
+  </select>
+
+
+  <select id="selectForUpDown"   resultMap="BaseResultMap"  >
+select t.*  from  t_ware_store t
+    where t.ware_id in (
+    select a.ware_id from t_maint_userware a  where a.user_id = #{param3,jdbcType=VARCHAR}
+     )  and t.belong_id = #{param4,jdbcType=VARCHAR}
+    and  t.ware_id = #{param1,jdbcType=VARCHAR}
+    and  t.stack_id = #{param2,jdbcType=VARCHAR}
+    and t.layer &gt;=  #{param5,jdbcType=INTEGER}
+    and t.layer &lt;=  #{param6,jdbcType=INTEGER}
+      and ifnull(t.cancel_flag,'0') = '0'
+          and ifnull(t.out_flag,'0') = '0'
+  </select>
+
+  <update id="updateForUpDownByStep"    >
+update t_ware_store t set t.layer = t.layer +  #{param7,jdbcType=INTEGER}
+    where t.ware_id in (
+    select a.ware_id from t_maint_userware a  where a.user_id = #{param3,jdbcType=VARCHAR}
+     )  and t.belong_id = #{param4,jdbcType=VARCHAR}
+    and  t.ware_id = #{param1,jdbcType=VARCHAR}
+    and  t.stack_id = #{param2,jdbcType=VARCHAR}
+    and t.layer &gt;=  #{param5,jdbcType=INTEGER}
+    and t.layer &lt;=  #{param6,jdbcType=INTEGER}
+      and ifnull(t.cancel_flag,'0') = '0'
+          and ifnull(t.out_flag,'0') = '0'
+  </update>
+
+  <update id="updateForUpDownByLayer"    >
+update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
+      where t.ware_id in (
+    select a.ware_id from t_maint_userware a  where a.user_id = #{param3,jdbcType=VARCHAR}
+     )  and t.belong_id = #{param4,jdbcType=VARCHAR}
+    and  t.ware_id = #{param1,jdbcType=VARCHAR}
+    and  t.stack_id = #{param2,jdbcType=VARCHAR}
+    and t.layer &gt;=  #{param5,jdbcType=INTEGER}
+    and t.layer &lt;=  #{param6,jdbcType=INTEGER}
+      and ifnull(t.cancel_flag,'0') = '0'
+          and ifnull(t.out_flag,'0') = '0'
+  </update>
+
+  <select id="selectByOutId"   resultMap="BaseResultMap"  >
+    select t.*  from  t_ware_store t
+      where t.ware_id in (
+    select a.ware_id from t_maint_userware a  where a.user_id = #{param3,jdbcType=VARCHAR}
+     )  and t.belong_id = #{param4,jdbcType=VARCHAR}
+    and  t.out_id = #{param1,jdbcType=VARCHAR}
+  </select>
+
+
+  <update id="updateByOutId"  >
+    update  t_ware_store t set t.cancel_flag = '1'
+      where t.ware_id in (
+    select a.ware_id from t_maint_userware a  where a.user_id = #{param3,jdbcType=VARCHAR}
+     )  and t.belong_id = #{param4,jdbcType=VARCHAR}
+    and  t.out_id = #{param1,jdbcType=VARCHAR}
+  </update>
+
+
+  <select id="selectStore" resultMap="BaseResultMap" >
+    select ws.*, wi.*, mm.*, mc.* from t_ware_store ws,t_ware_in_record wi, t_maint_ware mw, t_maint_stack ms, t_maint_material mm,t_maint_customer mc
+    where ws.ware_id = mw.id
+    and ws.stack_id = ms.id
+    and ws.material_id  = mm.id
+    and ws.customer_id = mc.id
+    and ws.in_id = wi.id
+    and mw.id like concat('%',#{param1,jdbcType=VARCHAR},'%')
+    and ms.code like concat('_',#{param2,jdbcType=VARCHAR},'%')
+    and ms.name like concat('%',#{param3,jdbcType=VARCHAR},'%')
+    and ws.plate_no like concat('%',#{param4,jdbcType=VARCHAR},'%')
+    and ws.ord_no like concat('%',#{param5,jdbcType=VARCHAR},'%')
+    and ws.belong_id = #{param7,jdbcType=VARCHAR}
+    and ws.cancel_flag = '0'
+    and ws.out_flag = '0'
+    and ws.ware_id in (
+    select m.ware_id from t_maint_userware m  where m.user_id = #{param6,jdbcType=VARCHAR}
+     )
+    order by ms.code,ws.layer desc
+  </select>
+  <select id="selectWareStackByDistributionStore" resultMap="StoreOfWareStack" >
+    select distinct  t.ware_id ,t.stack_id
+    from t_ware_store t where t.id in
+    <foreach item="item" index="index" collection="storeId"
+             open="(" separator="," close=")">
+      #{item}
+    </foreach>
+
+  </select>
+
+
+  <select id="selectByWareIdStackIdInStoreId" resultMap="BaseResultMap" >
+    select *
+    from t_ware_store t where t.id in
+    <foreach item="item" index="index" collection="storeId"
+             open="(" separator="," close=")">
+      #{item}
+    </foreach>
+    and t.ware_id like concat('%',#{wareId,jdbcType=VARCHAR},'%')
+    and t.stack_id like concat('%',#{stackId,jdbcType=VARCHAR},'%')
+  </select>
+
+
+  <update id="updateDistributionById"  >
+    update  t_ware_store t
+    set t.lock_flag = #{lockFlag,jdbcType=VARCHAR} where t.id in
+    <foreach item="item" index="index" collection="storeId"
+             open="(" separator="," close=")">
+      #{item}
+    </foreach>
+
+  </update>
+
+
+
+
+  <select id="selectForCustomer" resultMap="BaseResultMap" >
+    select e.name as fk_compony_id,t.*
+    from t_ware_store t left join t_maint_customer e
+		on t.fk_compony_id = e.id
+		, t_maint_ware a, t_maint_stack b, t_maint_material c,t_maint_customer d
+    where t.ware_id = a.id
+    and t.stack_id = b.id
+    and t.material_id  = c.id
+    and t.customer_id = d.id
+    and  a.name like concat('%',#{param1,jdbcType=VARCHAR},'%')
+    and  b.name like concat('%',#{param2,jdbcType=VARCHAR},'%')
+    and  t.model like concat('%',#{param3,jdbcType=VARCHAR},'%')
+    and  c.name like concat('%',#{param4,jdbcType=VARCHAR},'%')
+    and  c.standard like concat('%',#{param5,jdbcType=VARCHAR},'%')
+    <if test="param6 != null and param6 != ''" >
+      and  d.name = #{param6,jdbcType=VARCHAR}
+    </if>
+    and  t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
+    and t.cancel_flag = '0'
+    and t.out_flag = '0'
+    and IFNULL(t.ord_no,'*') like  concat('%',#{param11,jdbcType=VARCHAR},'%')
+    and d.name like CONCAT((select attr3 from sys_user temp where temp.id=#{param10,jdbcType=VARCHAR}),'%')
+  </select>
+  <select id="queryTotal" resultMap="TotalResultMap" >
+    select sum(t.weight) as total_weight,
+			 sum(t.count) as total_amount
+	from t_ware_store t, t_maint_ware a, t_maint_stack b, t_maint_material c,t_maint_customer d
+    where t.ware_id = a.id
+    and t.stack_id = b.id
+    and t.material_id  = c.id
+    and t.customer_id = d.id
+    and  a.name like concat('%',#{param1,jdbcType=VARCHAR},'%')
+    and  b.name like concat('%',#{param2,jdbcType=VARCHAR},'%')
+    and  t.model like concat('%',#{param3,jdbcType=VARCHAR},'%')
+    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.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
+    and t.cancel_flag = '0'
+    and t.out_flag = '0'
+    and IFNULL(t.ord_no,'*') like  concat('%',#{param11,jdbcType=VARCHAR},'%')
+    and d.name like CONCAT((select attr3 from sys_user temp where temp.id=#{param10,jdbcType=VARCHAR}),'%')
+  </select>
+
+  <select id="selEffStore" resultType="java.lang.Integer" parameterType="java.lang.String">
+      select count(*)
+      from t_ware_store t
+      where t.cancel_flag = '0'
+      and t.plate_no = #{param1,jdbcType=VARCHAR};
+
+  </select>
+</mapper>