新增 农产品，农资管理迁移SAAS平台

src/main/java/com/yunfeiyun/agmp/fms/controller/FmsMachController.java

@@ -139,7 +139,7 @@ public class FmsMachController extends BaseController
         reqVo.setMachName(fmsMach.getMachName());
         reqVo.setMachType(fmsMach.getMachType());
         List<FmsMach> list = fmsMachService.selectFmsMachList(reqVo);
-        if (list.size() > 0) {
+        if (!list.isEmpty()) {
             return AjaxResult.error(ErrorCode.FMS_MACH_EXIST.getCode(), ErrorCode.FMS_MACH_EXIST.getMessage());
         }
         return toAjax(fmsMachService.insertFmsMach(fmsMach));
@@ -158,7 +158,7 @@ public class FmsMachController extends BaseController
             reqVo.setMachName(fmsMach.getMachName());
             reqVo.setMachType(fmsMach.getMachType());
             List<FmsMach> list = fmsMachService.selectFmsMachList(reqVo);
-            if (list.size() > 0) {
+            if (!list.isEmpty()) {
                 return AjaxResult.error(ErrorCode.FMS_MACH_EXIST.getCode(), ErrorCode.FMS_MACH_EXIST.getMessage());
             }
         }

src/main/java/com/yunfeiyun/agmp/fms/mapper/WmsStockMapper.java

@@ -40,14 +40,14 @@ public interface WmsStockMapper
      * @param wmsChangeapplyitemList 变动申请物件
      * @return 库存
      */
-    public List<WmsStock> selectWmsStockByChangeApplyItemList(@Param("wmsChangeapplyitemList") List<WmsChangeapplyitem> wmsChangeapplyitemList);
+    public List<WmsStock> selectWmsStockByChangeApplyItemList(@Param("wmsChangeapplyitemList") List<WmsChangeapplyitem> wmsChangeapplyitemList, @Param("tid") String tid);
 
     /**
      * 根据stockIds批量查询库存
      * @param stockIds
      * @return 库存
      * */
-    public List<WmsStock> slectWmsStockListByStockIds(@Param("stockIds") List<String> stockIds);
+    public List<WmsStock> slectWmsStockListByStockIds(@Param("stockIds") List<String> stockIds, @Param("tid") String tid);
 
 
     /**
@@ -75,7 +75,7 @@ public interface WmsStockMapper
      * @param wmsStock 库存
      * @return 结果
      */
-    public int updateWmsStock(WmsStock wmsStock);
+    public int  updateWmsStock(WmsStock wmsStock);
     /**
      * 批量修改库存
      *

src/main/java/com/yunfeiyun/agmp/fms/service/IFmsMachService.java

@@ -1,6 +1,5 @@
 package com.yunfeiyun.agmp.fms.service;
 
-import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
 import com.yunfeiyun.agmp.fms.domain.FmsMach;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsMachListReqVo;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsMachRecordListReqVo;
@@ -90,4 +89,6 @@ public interface IFmsMachService
     BigDecimal selectFmsMachSum();
 
     List<FmsMachTypeStatResVo> selectFmsMachTypeStat();
+
+    public FmsMach selectFmsMachByMachNo(String machNo, String tid);
 }

src/main/java/com/yunfeiyun/agmp/fms/service/IWmsStockService.java

@@ -1,5 +1,6 @@
 package com.yunfeiyun.agmp.fms.service;
 
+import com.yunfeiyun.agmp.fms.domain.WmsChangeapplyitem;
 import com.yunfeiyun.agmp.fms.domain.WmsStock;
 import com.yunfeiyun.agmp.fms.domain.reqvo.WmsStockAddReqVo;
 import com.yunfeiyun.agmp.fms.domain.reqvo.WmsStockBatchChangeReqVo;
@@ -99,4 +100,14 @@ public interface IWmsStockService
      * @return 结果
      */
     public int updateWmsStockByBatch(List<WmsStock> wmsStockList);
+
+    public List<WmsStock> selectWmsStockByChangeApplyItemList(List<WmsChangeapplyitem> wmsChangeapplyitemList);
+
+    /**
+     * 根据stockIds批量查询库存
+     * @param stockIds
+     * @return 库存
+     * */
+    public List<WmsStock> slectWmsStockListByStockIds(List<String> stockIds);
+
 }

src/main/java/com/yunfeiyun/agmp/fms/service/impl/AgmTaskpickServiceImpl.java

@@ -1,42 +1,40 @@
 package com.yunfeiyun.agmp.fms.service.impl;
 
-import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson2.JSONObject;
 import com.yunfeiyun.agmp.common.constant.ErrorCode;
 import com.yunfeiyun.agmp.common.constant.ResConstants;
-import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
-import com.yunfeiyun.agmp.common.core.domain.entity.SysDictData;
 import com.yunfeiyun.agmp.common.enums.*;
 import com.yunfeiyun.agmp.common.exception.BizException;
 import com.yunfeiyun.agmp.common.framework.manager.ResManager;
-import com.yunfeiyun.agmp.common.utils.*;
+import com.yunfeiyun.agmp.common.utils.DateUtils;
+import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.common.utils.serialno.NoGenerator;
-import com.yunfeiyun.agmp.common.utils.uuid.IdUtils;
 import com.yunfeiyun.agmp.common.web.system.domain.SysCusarea;
 import com.yunfeiyun.agmp.common.web.system.domain.SysRes;
 import com.yunfeiyun.agmp.common.web.system.mapper.SysResMapper;
 import com.yunfeiyun.agmp.common.web.system.service.ISysConfigService;
 import com.yunfeiyun.agmp.common.web.system.service.ISysCusareaService;
 import com.yunfeiyun.agmp.fms.domain.*;
-import com.yunfeiyun.agmp.fms.domain.reqvo.*;
+import com.yunfeiyun.agmp.fms.domain.dto.FmsTaskrcdListDto;
+import com.yunfeiyun.agmp.fms.domain.reqvo.AddAgmTaskPickOutReqVo;
+import com.yunfeiyun.agmp.fms.domain.reqvo.AddAgmTaskPickReqVo;
+import com.yunfeiyun.agmp.fms.domain.reqvo.AgmTaskPickListReqVo;
+import com.yunfeiyun.agmp.fms.domain.reqvo.FmsTaskrcdListReqVo;
+import com.yunfeiyun.agmp.fms.domain.resvo.AgmTaskPickListResVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.AppSeedOutAddInfoResVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.WmsFinishgoodsListResVo;
 import com.yunfeiyun.agmp.fms.mapper.*;
-import com.yunfeiyun.agmp.fms.domain.dto.FmsTaskrcdListDto;
-import com.yunfeiyun.agmp.fms.domain.resvo.AgmTaskPickListResVo;
-import com.yunfeiyun.agmp.fms.domain.resvo.FmsTaskResVo;
-import com.yunfeiyun.agmp.fms.service.*;
+import com.yunfeiyun.agmp.fms.service.IAgmTaskpickService;
+import com.yunfeiyun.agmp.fms.service.IWmsSupplierService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -76,9 +74,6 @@ public class AgmTaskpickServiceImpl implements IAgmTaskpickService
     private SysResMapper sysResMapper;
     @Autowired
     private FmsTaskpickMapper fmsTaskpickMapper;
-
-    @Autowired
-    private WmsSupplierMapper wmsSupplierMapper;
     @Resource
     private IWmsSupplierService wmsSupplierService;
 
@@ -120,11 +115,11 @@ public class AgmTaskpickServiceImpl implements IAgmTaskpickService
         if(appSeedOutAddInfoResVo==null){
             throw new BizException(ErrorCode.SYSTEM_ERROR);
         }
-        WmsSupplier supplier = wmsSupplierMapper.selectWmsSupplierBySupplierId(appSeedOutAddInfoResVo.getSupplierId(),tid);
+        WmsSupplier supplier = wmsSupplierService.selectWmsSupplierBySupplierId(appSeedOutAddInfoResVo.getSupplierId(),tid);
         if(supplier==null){
             throw new BizException(ErrorCode.SYSTEM_ERROR);
         }
-        WmsSupplier checkCompany =wmsSupplierMapper.selectWmsSupplierBySupplierId(appSeedOutAddInfoResVo.getQualitycheckOrg(),tid);
+        WmsSupplier checkCompany =wmsSupplierService.selectWmsSupplierBySupplierId(appSeedOutAddInfoResVo.getQualitycheckOrg(),tid);
         if(checkCompany==null){
             throw new BizException(ErrorCode.SYSTEM_ERROR);
         }

src/main/java/com/yunfeiyun/agmp/fms/service/impl/FmsMachServiceImpl.java

@@ -6,16 +6,15 @@ import com.yunfeiyun.agmp.common.enums.TaskrcdAuditStatus;
 import com.yunfeiyun.agmp.common.exception.BizException;
 import com.yunfeiyun.agmp.common.utils.DateUtils;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
-import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.fms.domain.FmsMach;
-import com.yunfeiyun.agmp.fms.domain.resvo.FmsMachTypeStatResVo;
-import com.yunfeiyun.agmp.fms.domain.vo.FmsMachExcelVo;
-import com.yunfeiyun.agmp.fms.domain.vo.FmsMachRecordExcelVo;
-import com.yunfeiyun.agmp.fms.mapper.FmsMachMapper;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsMachListReqVo;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsMachRecordListReqVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.FmsMachAppMapResVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.FmsMachRecordListResVo;
+import com.yunfeiyun.agmp.fms.domain.resvo.FmsMachTypeStatResVo;
+import com.yunfeiyun.agmp.fms.domain.vo.FmsMachExcelVo;
+import com.yunfeiyun.agmp.fms.domain.vo.FmsMachRecordExcelVo;
+import com.yunfeiyun.agmp.fms.mapper.FmsMachMapper;
 import com.yunfeiyun.agmp.fms.service.IFmsMachService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -67,8 +66,7 @@ public class FmsMachServiceImpl implements IFmsMachService
     @Override
     public List<FmsMachAppMapResVo> selectFmsMachAppMapResVoList(){
         FmsMachListReqVo fmsMachListReqVo = new FmsMachListReqVo();
-        fmsMachListReqVo.setTid(SecurityUtils.getTid());
-        List<FmsMach> fmsMachList = fmsMachMapper.selectFmsMachList(fmsMachListReqVo);
+        List<FmsMach> fmsMachList = selectFmsMachList(fmsMachListReqVo);
         Map<String, FmsMachAppMapResVo> map = new HashMap<>();
         for(FmsMach item : fmsMachList){
             FmsMachAppMapResVo vo = map.get(item.getMachType());
@@ -121,15 +119,14 @@ public class FmsMachServiceImpl implements IFmsMachService
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int insertFmsMach(FmsMach fmsMach) {
+        String tid = fmsMach.getTid();
         String machNo = fmsMach.getMachNo();
-        FmsMach oldFmsMach = this.fmsMachMapper.selectFmsMachByMachNo(machNo,fmsMach.getTid());
+        FmsMach oldFmsMach = selectFmsMachByMachNo(machNo, tid);
         if (!ObjectUtils.isEmpty(oldFmsMach)){
             throw new BizException(ErrorCode.FMS_MACH_RECORD_EXIST);
         }
         fmsMach.setMachId(fmsMach.getId());
-        if(StringUtils.isEmpty(fmsMach.getTid())){
-            fmsMach.setTid(SecurityUtils.getTid());
-        }
+        fmsMach.setTid(tid);
         fmsMach.setMachUsestatus(MachStatus.UNUSED.getCode());
         return fmsMachMapper.insertFmsMach(fmsMach);
     }
@@ -142,18 +139,20 @@ public class FmsMachServiceImpl implements IFmsMachService
      */
     @Override
     public int updateFmsMach(FmsMach fmsMach) {
+        String tid = SecurityUtils.getTid();
         String machId = fmsMach.getMachId();
         String machNo = fmsMach.getMachNo();
-        FmsMach oldFmsMach = this.fmsMachMapper.selectFmsMachByMachId(machId,fmsMach.getTid());
+        FmsMach oldFmsMach = selectFmsMachByMachId(machId, tid);
         if (ObjectUtils.isEmpty(oldFmsMach)){
             throw new BizException(ErrorCode.FMS_MACH_RECORD_NO_EXIST);
         }
-        FmsMach tempFmsMach = this.fmsMachMapper.selectFmsMachByMachNo(machNo,fmsMach.getTid());
+        FmsMach tempFmsMach = selectFmsMachByMachNo(machNo, tid);
         if (!ObjectUtils.isEmpty(tempFmsMach) && !Objects.equals(machId, tempFmsMach.getMachId()) &&
                 Objects.equals(machNo, tempFmsMach.getMachNo())){
             throw new BizException(ErrorCode.FMS_MACH_RECORD_MACHNO_EXIST);
         }
         fmsMach.setMachUsestatus(null);
+        fmsMach.setTid(tid);
         return fmsMachMapper.updateFmsMach(fmsMach);
     }
 
@@ -176,7 +175,7 @@ public class FmsMachServiceImpl implements IFmsMachService
      */
     @Override
     public int deleteFmsMachByMachId(String machId, String tid) {
-        FmsMach oldFmsMach = this.fmsMachMapper.selectFmsMachByMachId(machId, tid);
+        FmsMach oldFmsMach = selectFmsMachByMachId(machId, tid);
         if (ObjectUtils.isEmpty(oldFmsMach)){
             throw new BizException(ErrorCode.FMS_MACH_RECORD_NO_EXIST);
         }
@@ -202,4 +201,9 @@ public class FmsMachServiceImpl implements IFmsMachService
     public List<FmsMachTypeStatResVo> selectFmsMachTypeStat() {
         return fmsMachMapper.selectFmsMachTypeStat(SecurityUtils.getTid());
     }
+
+    @Override
+    public FmsMach selectFmsMachByMachNo(String machNo, String tid) {
+        return fmsMachMapper.selectFmsMachByMachNo(machNo, tid);
+    }
 }

src/main/java/com/yunfeiyun/agmp/fms/service/impl/WmsChangeapplyServiceImpl.java

@@ -25,6 +25,7 @@ import com.yunfeiyun.agmp.fms.domain.resvo.*;
 import com.yunfeiyun.agmp.fms.domain.vo.WmsAssetgoodsVo;
 import com.yunfeiyun.agmp.fms.mapper.*;
 import com.yunfeiyun.agmp.fms.service.IWmsChangeapplyService;
+import com.yunfeiyun.agmp.fms.service.IWmsStockService;
 import com.yunfeiyun.agmp.fms.util.DataAuthUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -65,6 +66,10 @@ public class WmsChangeapplyServiceImpl implements IWmsChangeapplyService {
     @Resource
     private MessageUtil messageUtil;
 
+    @Autowired
+    private IWmsStockService wmsStockService;
+
+
 
 
     /**
@@ -217,13 +222,13 @@ public class WmsChangeapplyServiceImpl implements IWmsChangeapplyService {
             wmsChangeapplyitem.setChangeapplyId(wmsChangeapply.getChangeapplyId());
             List<WmsChangeapplyitem> wmsChangeapplyitems = wmsChangeapplyitemMapper.selectWmsChangeapplyitemList(wmsChangeapplyitem);
             // 查询变动申请物件信息关联的农资库存
-            List<WmsStock> wmsStock = wmsStockMapper.selectWmsStockByChangeApplyItemList(wmsChangeapplyitems);
+            List<WmsStock> wmsStock = wmsStockService.selectWmsStockByChangeApplyItemList(wmsChangeapplyitems);
             // 生成变动记录，同时修改库存
             List<WmsChange> wmsChangeList = generateWmsChangeAndChangeStockAmount(wmsStock, wmsChangeapply, wmsChangeapplyitems);
             // 保存变动记录
             wmsChangeMapper.insertWmsChangeList(wmsChangeList);
             // 更新库存信息
-            wmsStockMapper.updateWmsStockByBatch(wmsStock);
+            wmsStockService.updateWmsStockByBatch(wmsStock);
             // 更新变动申请
             int i = wmsChangeapplyMapper.updateWmsChangeapply(wmsChangeapply);
 
@@ -299,7 +304,7 @@ public class WmsChangeapplyServiceImpl implements IWmsChangeapplyService {
     @Transactional(rollbackFor = Exception.class)
     public int apply(WmsChangeApplyReqVo wmsChangeApplyReqVo) {
         // 查询库存信息
-        WmsStock wmsStock = wmsStockMapper.selectWmsStockByStockId(wmsChangeApplyReqVo.getStockId(),SecurityUtils.getTid());
+        WmsStock wmsStock = wmsStockService.selectWmsStockByStockId(wmsChangeApplyReqVo.getStockId(),SecurityUtils.getTid());
         if (null == wmsStock) {
             // 库存不存在
             throw new BizException(ErrorCode.WMS_STOCK_NOT_EXIST);

src/main/java/com/yunfeiyun/agmp/fms/service/impl/WmsStockServiceImpl.java

@@ -186,7 +186,7 @@ public class WmsStockServiceImpl implements IWmsStockService {
         // 获取库存标识
         List<String> stockIds = wmsStockBatchChangeReqVo.getWmsStockBatchChangeReqVoItemList().stream().map(WmsStockBatchChangeReqVoItem::getStockId).collect(Collectors.toList());
         // 查询改动的库存
-        List<WmsStock> wmsStockList = wmsStockMapper.slectWmsStockListByStockIds(stockIds);
+        List<WmsStock> wmsStockList = slectWmsStockListByStockIds(stockIds);
         // 转化为库存map
         Map<String, WmsStock> wmsStockMap = wmsStockList.stream().collect(Collectors.toMap(WmsStock::getStockId, wmsStock -> wmsStock));
         // 生成变动申请
@@ -435,4 +435,22 @@ public class WmsStockServiceImpl implements IWmsStockService {
         }
         return wmsStockMapper.updateWmsStockByBatch(wmsStockList);
     }
+
+    @Override
+    public List<WmsStock> selectWmsStockByChangeApplyItemList(List<WmsChangeapplyitem> wmsChangeapplyitemList) {
+        String tid = SecurityUtils.getTid();
+        return wmsStockMapper.selectWmsStockByChangeApplyItemList(wmsChangeapplyitemList, tid);
+    }
+
+    /**
+     * 根据stockIds批量查询库存
+     *
+     * @param stockIds
+     * @return 库存
+     */
+    @Override
+    public List<WmsStock> slectWmsStockListByStockIds(List<String> stockIds) {
+        String tid = SecurityUtils.getTid();
+        return wmsStockMapper.slectWmsStockListByStockIds(stockIds, tid);
+    }
 }

src/main/java/com/yunfeiyun/agmp/fms/service/impl/WmsWarehouseServiceImpl.java

@@ -109,7 +109,7 @@ public class WmsWarehouseServiceImpl implements IWmsWarehouseService
         if(wmsWarehouseOld == null){
             throw new BizException(ErrorCode.INVALID_PARAMETER.getCode(), "仓库不存在");
         }
-
+        wmsWarehouse.setTid(tid);
         int i = wmsWarehouseMapper.updateWmsWarehouse(wmsWarehouse);
 
         //更新关联关系

src/main/resources/mapper/FmsMachMapper.xml

@@ -144,13 +144,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
         machType,
         IFNULL( count( machType ), 0 ) AS num
-        FROM
-        FmsMach
+        FROM FmsMach
         <where>
-            machSystype = '0'
-            <if test="tid != null and tid !='' and tid != '-1'">
-                and tid = #{tid}
-            </if>
+            machSystype = '0' and tid = #{tid}
         </where>
         GROUP BY machType
     </select>
@@ -180,7 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="machOwnername != null">machOwnername,</if>
             <if test="machOwnermobile != null">machOwnermobile,</if>
             machSystype,
-            <if test="tid != null">tid,</if>
+            tid
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="machId != null">#{machId},</if>
@@ -194,7 +190,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="machOwnername != null">#{machOwnername},</if>
             <if test="machOwnermobile != null">#{machOwnermobile},</if>
             '0',
-            <if test="tid != null">#{tid},</if>
+            #{tid}
          </trim>
     </insert>
 
@@ -212,26 +208,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="machOwnermobile != null">machOwnermobile = #{machOwnermobile},</if>
             <if test="tid != null">tid = #{tid},</if>
         </trim>
-        where machId = #{machId} and machSystype = '0'
-        <if test="tid != null and tid !='' and tid != '-1'">
-            and tid = #{tid}
-        </if>
+        where machId = #{machId} and machSystype = '0' and tid = #{tid}
     </update>
 
     <delete id="deleteFmsMachByMachId" parameterType="String">
-        delete from FmsMach where machId = #{machId} and machSystype = '0'
-        <if test="tid != null and tid !='' and tid != '-1'">
-            and tid = #{tid}
-        </if>
+        delete from FmsMach where machId = #{machId} and machSystype = '0' and tid = #{tid}
     </delete>
 
     <delete id="deleteFmsMachByMachIds" parameterType="String">
-        delete from FmsMach where machSystype = '0' and  machId in
+        delete from FmsMach where machSystype = '0' and tid = #{tid} and machId in
         <foreach item="machId" collection="array" open="(" separator="," close=")">
             #{machId}
         </foreach>
-        <if test="tid != null and tid !='' and tid != '-1'">
-            and tid = #{tid}
-        </if>
     </delete>
 </mapper>

src/main/resources/mapper/WmsStockMapper.xml

@@ -53,15 +53,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tid != null and tid !='' and tid != '-1'">and tid = #{tid}</if>
         </where>
     </select>
-    <select id="selectWmsStockByChangeApplyItemList" parameterType="WmsChangeapplyitem" resultType="WmsStock">
+
+    <select id="selectWmsStockByChangeApplyItemList" parameterType="string" resultType="WmsStock">
         <include refid="selectWmsStockVo"/>
-        where
-        (goodsId,warehouseId) in
+        where tid = #{tid} and (goodsId,warehouseId) in
          <foreach collection="wmsChangeapplyitemList" item="item" open="(" separator="," close=")">
-             (#{item.goodsId},#{item.warehouseId})
+             (#{item.goodsId}, #{item.warehouseId})
          </foreach>
-        <if test="tid != null and tid !='' and tid != '-1'">and tid = #{tid}</if>
     </select>
+
     <select id="slectWmsStockListByStockIds" parameterType="String" resultType="WmsStock">
         <include refid="selectWmsStockVo"/>
         where stockId in
@@ -80,8 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN WmsAssetgoods ag ON ag.goodsId = g.goodsId
         LEFT JOIN WmsWarehouse w ON w.warehouseId = s.warehouseId
         LEFT JOIN WmsSupplier u ON u.supplierId = ag.supplierId
-        where w.warehouseType = '1'
-        <if test="tid != null and tid !='' and tid != '-1'">and s.tid = #{tid}</if>
+        where w.warehouseType = '1' and s.tid = #{tid}
     </select>
 
     <insert id="insertWmsStock" parameterType="WmsStock">