Просмотр исходного кода

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

zhaiyifei 11 месяцев назад
Родитель
Сommit
5e3e237de1

+ 10 - 11
src/main/java/com/yunfeiyun/agmp/fms/controller/WmsStockController.java

@@ -46,13 +46,22 @@ public class WmsStockController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(WmsStockListReqVo wmsStockListReqVo) {
         startPage();
-        wmsStockListReqVo.setTid(SecurityUtils.getTid());
         List<WmsStockListResVo> list = wmsStockService.selectWmsStockList(wmsStockListReqVo);
         fmsLandService.appendLandNameByTid(list);
         return getDataTable(list);
     }
 
     /**
+     * 新增库存
+     */
+    @PreAuthorize("@ss.hasPermi('wms:stock:add')")
+    @Log(title = "库存", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody WmsStockAddReqVo wmsStockAddReqVo) {
+        return toAjax(wmsStockService.add(wmsStockAddReqVo));
+    }
+
+    /**
      * app查询库存农资信息列表
      */
     @PreAuthorize("@ss.hasPermi('wms:stock:app:map')")
@@ -96,16 +105,6 @@ public class WmsStockController extends BaseController
     /**
      * 新增库存
      */
-    @PreAuthorize("@ss.hasPermi('wms:stock:add')")
-    @Log(title = "库存", businessType = BusinessType.INSERT)
-    @PostMapping("/add")
-    public AjaxResult add(@RequestBody WmsStockAddReqVo wmsStockAddReqVo) {
-        return toAjax(wmsStockService.add(wmsStockAddReqVo));
-    }
-
-    /**
-     * 新增库存
-     */
     @PreAuthorize("@ss.hasPermi('wms:stock:batch:change')")
     @Log(title = "库存", businessType = BusinessType.INSERT)
     @PostMapping("/batch/change")

+ 9 - 0
src/main/java/com/yunfeiyun/agmp/fms/service/IWmsChangeService.java

@@ -72,4 +72,13 @@ public interface IWmsChangeService
     public int deleteWmsChangeByChangeId(String changeId, String tid);
 
     List<WmsFinishgoodsChangeApplyExcelVo> selectWmsFinishgoodsChangeApplyExcelVoList(WmsChangeReqVo reqVo);
+
+
+    /**
+     * 新增变动
+     *
+     * @param wmsChangeList 变动
+     * @return 结果
+     */
+    public int insertWmsChangeList(List<WmsChange> wmsChangeList);
 }

+ 8 - 0
src/main/java/com/yunfeiyun/agmp/fms/service/IWmsChangeapplyitemService.java

@@ -60,4 +60,12 @@ public interface IWmsChangeapplyitemService
      * @return 结果
      */
     public int deleteWmsChangeapplyitemByChangeapplyitemId(String changeapplyitemId, String tid);
+
+    /**
+     * 新增变动申请物件
+     *
+     * @param wmsChangeapplyitemList 变动申请物件列表
+     * @return 结果
+     */
+    public int insertWmsChangeapplyitemList(List<WmsChangeapplyitem> wmsChangeapplyitemList);
 }

+ 10 - 0
src/main/java/com/yunfeiyun/agmp/fms/service/IWmsStockService.java

@@ -89,4 +89,14 @@ public interface IWmsStockService
      * @return 结果
      */
     public int deleteWmsStockByStockId(String stockId, String tid);
+
+    public int insertWmsStock(WmsStock wmsStock);
+
+    /**
+     * 批量修改库存
+     *
+     * @param wmsStockList 库存列表
+     * @return 结果
+     */
+    public int updateWmsStockByBatch(List<WmsStock> wmsStockList);
 }

+ 3 - 2
src/main/java/com/yunfeiyun/agmp/fms/service/impl/WmsAssetgoodsServiceImpl.java

@@ -4,10 +4,10 @@ package com.yunfeiyun.agmp.fms.service.impl;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.fms.domain.WmsAssetgoods;
 import com.yunfeiyun.agmp.fms.domain.reqvo.WmsStockListReqVo;
+import com.yunfeiyun.agmp.fms.domain.resvo.WmsGoodsAppMapResVo;
 import com.yunfeiyun.agmp.fms.domain.vo.WmsAssetgoodsExcelVo;
-import com.yunfeiyun.agmp.fms.mapper.WmsAssetgoodsMapper;
 import com.yunfeiyun.agmp.fms.domain.vo.WmsAssetgoodsVo;
-import com.yunfeiyun.agmp.fms.domain.resvo.WmsGoodsAppMapResVo;
+import com.yunfeiyun.agmp.fms.mapper.WmsAssetgoodsMapper;
 import com.yunfeiyun.agmp.fms.service.IWmsAssetgoodsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -74,6 +74,7 @@ public class WmsAssetgoodsServiceImpl implements IWmsAssetgoodsService
      */
     @Override
     public int insertWmsAssetgoodsVo(WmsAssetgoods wmsAssetgoods) {
+        wmsAssetgoods.setTid(SecurityUtils.getTid());
         return wmsAssetgoodsMapper.insertWmsAssetgoods(wmsAssetgoods);
     }
 

+ 22 - 4
src/main/java/com/yunfeiyun/agmp/fms/service/impl/WmsChangeServiceImpl.java

@@ -1,16 +1,17 @@
 package com.yunfeiyun.agmp.fms.service.impl;
 
-import java.util.List;
-
+import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.fms.domain.WmsChange;
-import com.yunfeiyun.agmp.fms.domain.vo.WmsFinishgoodsChangeApplyExcelVo;
-import com.yunfeiyun.agmp.fms.mapper.WmsChangeMapper;
 import com.yunfeiyun.agmp.fms.domain.reqvo.WmsChangeReqVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.WmsChangeResVo;
+import com.yunfeiyun.agmp.fms.domain.vo.WmsFinishgoodsChangeApplyExcelVo;
+import com.yunfeiyun.agmp.fms.mapper.WmsChangeMapper;
 import com.yunfeiyun.agmp.fms.service.IWmsChangeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 
 /**
  * 变动Service业务层处理
@@ -59,6 +60,7 @@ public class WmsChangeServiceImpl implements IWmsChangeService
      */
     @Override
     public int insertWmsChange(WmsChange wmsChange) {
+        wmsChange.setTid(SecurityUtils.getTid());
         return wmsChangeMapper.insertWmsChange(wmsChange);
     }
 
@@ -99,4 +101,20 @@ public class WmsChangeServiceImpl implements IWmsChangeService
     public List<WmsFinishgoodsChangeApplyExcelVo> selectWmsFinishgoodsChangeApplyExcelVoList(WmsChangeReqVo reqVo) {
         return wmsChangeMapper.selectWmsFinishgoodsChangeApplyExcelVoList(reqVo);
     }
+
+    /**
+     * 新增变动
+     *
+     * @param wmsChangeList 变动
+     * @return 结果
+     */
+    @Override
+    public int insertWmsChangeList(List<WmsChange> wmsChangeList) {
+        String tid = SecurityUtils.getTid();
+        for (WmsChange wmsChange : wmsChangeList) {
+            wmsChange.setTid(tid);
+        }
+        return wmsChangeMapper.insertWmsChangeList(wmsChangeList);
+    }
+
 }

+ 3 - 1
src/main/java/com/yunfeiyun/agmp/fms/service/impl/WmsChangeapplyServiceImpl.java

@@ -119,6 +119,7 @@ public class WmsChangeapplyServiceImpl implements IWmsChangeapplyService {
      */
     @Override
     public int insertWmsChangeapply(WmsChangeapply wmsChangeapply) {
+        wmsChangeapply.setTid(SecurityUtils.getTid());
         return wmsChangeapplyMapper.insertWmsChangeapply(wmsChangeapply);
     }
 
@@ -331,7 +332,8 @@ public class WmsChangeapplyServiceImpl implements IWmsChangeapplyService {
         wmsChangeapply.setChangeapplyAuditstatus(ChangeApplyAuditStatus.UNAUDITED.getCode());
         wmsChangeapply.setChangeapplyRemark(wmsChangeApplyReqVo.getRemark());
         // 保存申请信息到数据库
-        wmsChangeapplyMapper.insertWmsChangeapply(wmsChangeapply);
+
+        insertWmsChangeapply(wmsChangeapply);
         // 查询农资信息
         WmsAssetgoodsVo wmsAssetGoodsVo = wmsAssetgoodsMapper.selectWmsAssetgoodsVoByGoodsId(wmsStock.getGoodsId(),SecurityUtils.getTid());
         // 生成变动申请物件

+ 19 - 2
src/main/java/com/yunfeiyun/agmp/fms/service/impl/WmsChangeapplyitemServiceImpl.java

@@ -1,13 +1,14 @@
 package com.yunfeiyun.agmp.fms.service.impl;
 
-import java.util.List;
-
+import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.fms.domain.WmsChangeapplyitem;
 import com.yunfeiyun.agmp.fms.mapper.WmsChangeapplyitemMapper;
 import com.yunfeiyun.agmp.fms.service.IWmsChangeapplyitemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 变动申请物件Service业务层处理
  * 
@@ -50,6 +51,7 @@ public class WmsChangeapplyitemServiceImpl implements IWmsChangeapplyitemService
      */
     @Override
     public int insertWmsChangeapplyitem(WmsChangeapplyitem wmsChangeapplyitem) {
+        wmsChangeapplyitem.setTid(SecurityUtils.getTid());
         return wmsChangeapplyitemMapper.insertWmsChangeapplyitem(wmsChangeapplyitem);
     }
 
@@ -85,4 +87,19 @@ public class WmsChangeapplyitemServiceImpl implements IWmsChangeapplyitemService
     public int deleteWmsChangeapplyitemByChangeapplyitemId(String changeapplyitemId, String tid) {
         return wmsChangeapplyitemMapper.deleteWmsChangeapplyitemByChangeapplyitemId(changeapplyitemId,tid);
     }
+
+    /**
+     * 新增变动申请物件
+     *
+     * @param wmsChangeapplyitemList 变动申请物件列表
+     * @return 结果
+     */
+    @Override
+    public int insertWmsChangeapplyitemList(List<WmsChangeapplyitem> wmsChangeapplyitemList) {
+        String tid = SecurityUtils.getTid();
+        for (WmsChangeapplyitem wmsChangeapplyitem : wmsChangeapplyitemList) {
+            wmsChangeapplyitem.setTid(tid);
+        }
+        return wmsChangeapplyitemMapper.insertWmsChangeapplyitemList(wmsChangeapplyitemList);
+    }
 }

+ 2 - 0
src/main/java/com/yunfeiyun/agmp/fms/service/impl/WmsGoodsServiceImpl.java

@@ -1,5 +1,6 @@
 package com.yunfeiyun.agmp.fms.service.impl;
 
+import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.fms.domain.WmsGoods;
 import com.yunfeiyun.agmp.fms.mapper.WmsGoodsMapper;
 import com.yunfeiyun.agmp.fms.service.IWmsGoodsService;
@@ -26,6 +27,7 @@ public class WmsGoodsServiceImpl implements IWmsGoodsService
      */
     @Override
     public int insertWmsGoods(WmsGoods wmsGoods) {
+        wmsGoods.setTid(SecurityUtils.getTid());
         return wmsGoodsMapper.insertWmsGoods(wmsGoods);
     }
 

+ 56 - 24
src/main/java/com/yunfeiyun/agmp/fms/service/impl/WmsStockServiceImpl.java

@@ -7,7 +7,6 @@ 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.fms.domain.*;
-import com.yunfeiyun.agmp.fms.mapper.*;
 import com.yunfeiyun.agmp.fms.domain.reqvo.WmsStockAddReqVo;
 import com.yunfeiyun.agmp.fms.domain.reqvo.WmsStockBatchChangeReqVo;
 import com.yunfeiyun.agmp.fms.domain.reqvo.WmsStockBatchChangeReqVoItem;
@@ -15,11 +14,13 @@ import com.yunfeiyun.agmp.fms.domain.reqvo.WmsStockListReqVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.WmsStockAppMapResVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.WmsStockAppMapResVoItem;
 import com.yunfeiyun.agmp.fms.domain.resvo.WmsStockListResVo;
-import com.yunfeiyun.agmp.fms.service.IWmsStockService;
+import com.yunfeiyun.agmp.fms.mapper.WmsStockMapper;
+import com.yunfeiyun.agmp.fms.service.*;
 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.util.ArrayList;
@@ -40,15 +41,19 @@ public class WmsStockServiceImpl implements IWmsStockService {
     @Autowired
     private WmsStockMapper wmsStockMapper;
     @Resource
-    private WmsGoodsMapper wmsGoodsMapper;
-    @Resource
-    private WmsChangeMapper wmsChangeMapper;
-    @Resource
-    private WmsChangeapplyMapper wmsChangeapplyMapper;
-    @Resource
-    private WmsChangeapplyitemMapper wmsChangeapplyitemMapper;
-    @Resource
-    private WmsAssetgoodsMapper wmsAssetgoodsMapper;
+    private IWmsGoodsService iWmsGoodsService;
+
+    @Autowired
+    private IWmsAssetgoodsService iWmsAssetgoodsService;
+
+    @Autowired
+    private IWmsChangeapplyitemService iWmsChangeapplyitemService;
+
+    @Autowired
+    private IWmsChangeapplyService iWmsChangeapplyService;
+
+    @Autowired
+    private IWmsChangeService iWmsChangeService;
 
     /**
      * 查询库存
@@ -63,6 +68,7 @@ public class WmsStockServiceImpl implements IWmsStockService {
 
     @Override
     public List<WmsStock> selectWmsStockByGoodsIdAndWarehouseId(WmsStock wmsStock) {
+        wmsStock.setTid(SecurityUtils.getTid());
         return wmsStockMapper.selectWmsStock(wmsStock);
     }
 
@@ -74,6 +80,7 @@ public class WmsStockServiceImpl implements IWmsStockService {
      */
     @Override
     public List<WmsStockListResVo> selectWmsStockList(WmsStockListReqVo wmsStockListReqVo) {
+        wmsStockListReqVo.setTid(SecurityUtils.getTid());
         return wmsStockMapper.selectWmsStockList(wmsStockListReqVo);
     }
 
@@ -86,7 +93,7 @@ public class WmsStockServiceImpl implements IWmsStockService {
     public List<WmsStockAppMapResVo> selectWmsStockAppMapResVoList() {
         WmsStockListReqVo wmsStockListReqVo = new WmsStockListReqVo();
         wmsStockListReqVo.setMinStockAmount(0);
-        List<WmsStockListResVo> list = wmsStockMapper.selectWmsStockList(wmsStockListReqVo);
+        List<WmsStockListResVo> list = selectWmsStockList(wmsStockListReqVo);
         Map<String, WmsStockAppMapResVo> map = new HashMap<>();
         for (WmsStockListResVo wmsStockListResVo : list) {
             WmsStockAppMapResVo wmsStockAppMapResVo = map.get(wmsStockListResVo.getWarehouseId());
@@ -128,7 +135,8 @@ public class WmsStockServiceImpl implements IWmsStockService {
         wmsStockListReqVo.setGoodsName(wmsStockAddReqVo.getGoodsName());
         wmsStockListReqVo.setGoodsType(wmsStockAddReqVo.getGoodsType());
         wmsStockListReqVo.setWarehouseId(wmsStockAddReqVo.getWarehouseId());
-        List<WmsStockListResVo> wmsStockListResVos = wmsStockMapper.selectWmsStockList(wmsStockListReqVo);
+
+        List<WmsStockListResVo> wmsStockListResVos = selectWmsStockList(wmsStockListReqVo);
         if(!wmsStockListResVos.isEmpty()){
             throw new BizException(ErrorCode.WMS_GOODS_EXIST);
         }
@@ -138,7 +146,7 @@ public class WmsStockServiceImpl implements IWmsStockService {
         BeanUtils.copyProperties(wmsStockAddReqVo, wmsGoods);
         wmsGoods.setGoodsId(wmsGoods.getId());
         // 保存
-        wmsGoodsMapper.insertWmsGoods(wmsGoods);
+        iWmsGoodsService.insertWmsGoods(wmsGoods);
         // 生成农资
         WmsAssetgoods wmsAssetgoods = new WmsAssetgoods();
         wmsAssetgoods.setAssetgoodsId(wmsAssetgoods.getId());
@@ -146,9 +154,8 @@ public class WmsStockServiceImpl implements IWmsStockService {
         wmsAssetgoods.setAssetgoodsType(wmsStockAddReqVo.getGoodsType());
         wmsAssetgoods.setAssetgoodsManufactor(wmsStockAddReqVo.getGoodsManufactor());
         wmsAssetgoods.setSupplierId(wmsStockAddReqVo.getSupplierId());
-        wmsAssetgoods.setTid(wmsStockAddReqVo.getTid());
         // 保存
-        wmsAssetgoodsMapper.insertWmsAssetgoods(wmsAssetgoods);
+        iWmsAssetgoodsService.insertWmsAssetgoodsVo(wmsAssetgoods);
 
         // 生成库存
         WmsStock wmsStock = new WmsStock();
@@ -156,19 +163,22 @@ public class WmsStockServiceImpl implements IWmsStockService {
         wmsStock.setStockId(wmsStock.getId());
         wmsStock.setGoodsId(wmsGoods.getGoodsId());
         // 保存
-        wmsStockMapper.insertWmsStock(wmsStock);
+        insertWmsStock(wmsStock);
+
         // 保存变动申请
         WmsChangeapply wmsChangeapply = generateWmsChangeApply(wmsStockAddReqVo);
-        wmsChangeapplyMapper.insertWmsChangeapply(wmsChangeapply);
+        iWmsChangeapplyService.insertWmsChangeapply(wmsChangeapply);
         // 保存变动申请物件
         WmsChangeapplyitem wmsChangeapplyitem = generateWmsChangeApplyItem(wmsGoods, wmsChangeapply, wmsStockAddReqVo);
-        wmsChangeapplyitemMapper.insertWmsChangeapplyitem(wmsChangeapplyitem);
+        iWmsChangeapplyitemService.insertWmsChangeapplyitem(wmsChangeapplyitem);
         // 保存变动记录
         WmsChange wmsChange = generateWmsChange(wmsStock, wmsChangeapply, wmsStockAddReqVo);
-        wmsChangeMapper.insertWmsChange(wmsChange);
+        iWmsChangeService.insertWmsChange(wmsChange);
         return 1;
     }
 
+
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     @RedisLock(key = RedisLockKey.STOCK_CHANGE_BIZ_LOCK)
@@ -199,13 +209,13 @@ public class WmsStockServiceImpl implements IWmsStockService {
             wmsChanges.add(wmsChange);
         }
         // 保存变动申请
-        wmsChangeapplyMapper.insertWmsChangeapply(wmsChangeapply);
+        iWmsChangeapplyService.insertWmsChangeapply(wmsChangeapply);
         // 保存变动申请物件信息列表
-        wmsChangeapplyitemMapper.insertWmsChangeapplyitemList(wmsChangeapplyitems);
+        iWmsChangeapplyitemService.insertWmsChangeapplyitemList(wmsChangeapplyitems);
         // 保存变动记录
-        wmsChangeMapper.insertWmsChangeList(wmsChanges);
+        iWmsChangeService.insertWmsChangeList(wmsChanges);
         // 更新库存信息
-        wmsStockMapper.updateWmsStockByBatch(new ArrayList<>(wmsStockMap.values()));
+        updateWmsStockByBatch(new ArrayList<>(wmsStockMap.values()));
         return 1;
     }
 
@@ -379,6 +389,7 @@ public class WmsStockServiceImpl implements IWmsStockService {
      */
     @Override
     public int updateWmsStock(WmsStock wmsStock) {
+        wmsStock.setTid(SecurityUtils.getTid());
         return wmsStockMapper.updateWmsStock(wmsStock);
     }
 
@@ -403,4 +414,25 @@ public class WmsStockServiceImpl implements IWmsStockService {
     public int deleteWmsStockByStockId(String stockId, String tid) {
         return wmsStockMapper.deleteWmsStockByStockId(stockId,tid);
     }
+
+    @Override
+    public int insertWmsStock(WmsStock wmsStock) {
+        wmsStock.setTid(SecurityUtils.getTid());
+        return wmsStockMapper.insertWmsStock(wmsStock);
+    }
+
+    /**
+     * 批量修改库存
+     *
+     * @param wmsStockList 库存列表
+     * @return 结果
+     */
+    @Override
+    public int updateWmsStockByBatch(List<WmsStock> wmsStockList) {
+        String tid = SecurityUtils.getTid();
+        for (WmsStock wmsStock : wmsStockList) {
+            wmsStock.setTid(tid);
+        }
+        return wmsStockMapper.updateWmsStockByBatch(wmsStockList);
+    }
 }

+ 6 - 11
src/main/resources/mapper/WmsStockMapper.xml

@@ -29,12 +29,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN WmsWarehouse w ON w.warehouseId = s.warehouseId
         LEFT JOIN WmsSupplier u ON u.supplierId = ag.supplierId
         <where>
+            and s.tid = #{tid}
             <if test="goodsType != null and goodsType != ''">and ag.assetgoodsType =#{goodsType}</if>
             <if test="warehouseId != null  and warehouseId != ''"> and s.warehouseId = #{warehouseId}</if>
             <if test="goodsName != null and goodsName != ''">and g.goodsName like concat('%', #{goodsName}, '%')</if>
             <if test="warehouseType != null and warehouseType !=''">and w.warehouseType = #{warehouseType}</if>
             <if test="minStockAmount != null ">and stockAmount > #{minStockAmount}</if>
-            <if test="tid != null and tid !='' and tid != '-1'">and s.tid = #{tid}</if>
         </where>
     </select>
 
@@ -113,9 +113,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stockRemark != null">stockRemark = #{stockRemark},</if>
             <if test="tid != null">tid = #{tid},</if>
         </trim>
-        where stockId = #{stockId}
-        <if test="tid != null and tid !='' and tid != '-1'">and tid = #{tid}</if>
+        where stockId = #{stockId} and tid = #{tid}
     </update>
+
     <update id="updateWmsStockByBatch" parameterType="WmsStock">
         <foreach collection="wmsStockList" item="item" index="index">
             update WmsStock
@@ -126,24 +126,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="item.stockRemark != null">stockRemark = #{item.stockRemark},</if>
                 <if test="item.tid != null">tid = #{item.tid}</if>
             </trim>
-            where
-            stockId = #{item.stockId};
-            <if test="tid != null and tid !='' and tid != '-1'">and tid = #{tid}</if>
+            where stockId = #{item.stockId} and tid = #{tid}
         </foreach>
     </update>
 
     <delete id="deleteWmsStockByStockId" parameterType="String">
         delete from WmsStock
-        where
-        stockId = #{stockId}
-        <if test="tid != null and tid !='' and tid != '-1'">and tid = #{tid}</if>
+        where stockId = #{stockId} and tid = #{tid}
     </delete>
 
     <delete id="deleteWmsStockByStockIds" parameterType="String">
-        delete from WmsStock where stockId in 
+        delete from WmsStock where tid = #{tid} and stockId in
         <foreach item="stockId" collection="array" open="(" separator="," close=")">
             #{stockId}
         </foreach>
-        <if test="tid != null and tid !='' and tid != '-1'">and tid = #{tid}</if>
     </delete>
 </mapper>