Przeglądaj źródła

新增 农事智库管理迁移SAAS平台

zhaiyifei 11 miesięcy temu
rodzic
commit
c3caea3c14

+ 0 - 1
src/main/java/com/yunfeiyun/agmp/fms/controller/WmsAssetgoodsController.java

@@ -60,7 +60,6 @@ public class WmsAssetgoodsController extends BaseController {
     @Log(title = "货物", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response,@RequestBody WmsStockListReqVo wmsStockListReqVo) {
-        wmsStockListReqVo.setTid(SecurityUtils.getTid());
         List<WmsAssetgoodsExcelVo> list = wmsAssetgoodsService.selectWmsAssetgoodsExcelVoList(wmsStockListReqVo);
         for(int i = 1;i<=list.size();i++){
             WmsAssetgoodsExcelVo wmsAssetgoodsExcelVo = list.get(i-1);

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

@@ -44,6 +44,7 @@ public class WmsAssetgoodsServiceImpl implements IWmsAssetgoodsService
 
     @Override
     public List<WmsAssetgoodsVo> selectWmsAssetgoodsVoList(WmsAssetgoodsVo wmsAssetgoodsVo) {
+        wmsAssetgoodsVo.setTid(SecurityUtils.getTid());
         return wmsAssetgoodsMapper.selectWmsAssetgoodsVoList(wmsAssetgoodsVo);
     }
 
@@ -51,8 +52,7 @@ public class WmsAssetgoodsServiceImpl implements IWmsAssetgoodsService
     @Override
     public List<WmsGoodsAppMapResVo> selectWmsGoodsAppMapResVo(String landId) {
         WmsAssetgoodsVo wmsAssetgoodsVo = new WmsAssetgoodsVo();
-        wmsAssetgoodsVo.setTid(landId);
-        List<WmsAssetgoodsVo> wmsAssetGoodsVoList = wmsAssetgoodsMapper.selectWmsAssetgoodsVoList(wmsAssetgoodsVo);
+        List<WmsAssetgoodsVo> wmsAssetGoodsVoList = selectWmsAssetgoodsVoList(wmsAssetgoodsVo);
         Map<String,WmsGoodsAppMapResVo> map = new HashMap<>();
         for(WmsAssetgoodsVo item : wmsAssetGoodsVoList){
             WmsGoodsAppMapResVo vo = map.get(item.getGoodsType());
@@ -86,6 +86,7 @@ public class WmsAssetgoodsServiceImpl implements IWmsAssetgoodsService
      */
     @Override
     public int updateWmsAssetgoodsVo(WmsAssetgoods wmsAssetgoods) {
+        wmsAssetgoods.setTid(SecurityUtils.getTid());
         return wmsAssetgoodsMapper.updateWmsAssetgoods(wmsAssetgoods);
     }
 
@@ -113,6 +114,7 @@ public class WmsAssetgoodsServiceImpl implements IWmsAssetgoodsService
 
     @Override
     public List<WmsAssetgoodsExcelVo> selectWmsAssetgoodsExcelVoList(WmsStockListReqVo wmsStockListReqVo) {
+        wmsStockListReqVo.setTid(SecurityUtils.getTid());
         return wmsAssetgoodsMapper.selectWmsAssetgoodsExcelVoList(wmsStockListReqVo);
     }
 }

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

@@ -24,10 +24,7 @@ import com.yunfeiyun.agmp.fms.domain.reqvo.WmsChangeApplyReqVo;
 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.IWmsChangeService;
-import com.yunfeiyun.agmp.fms.service.IWmsChangeapplyService;
-import com.yunfeiyun.agmp.fms.service.IWmsChangeapplyitemService;
-import com.yunfeiyun.agmp.fms.service.IWmsStockService;
+import com.yunfeiyun.agmp.fms.service.*;
 import com.yunfeiyun.agmp.fms.util.DataAuthUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -77,6 +74,9 @@ public class WmsChangeapplyServiceImpl implements IWmsChangeapplyService {
     @Autowired
     private IWmsChangeapplyitemService wmsChangeapplyitemService;
 
+    @Autowired
+    private IWmsAssetgoodsService wmsAssetgoodsService;
+
 
 
 
@@ -352,7 +352,7 @@ public class WmsChangeapplyServiceImpl implements IWmsChangeapplyService {
 
         insertWmsChangeapply(wmsChangeapply);
         // 查询农资信息
-        WmsAssetgoodsVo wmsAssetGoodsVo = wmsAssetgoodsMapper.selectWmsAssetgoodsVoByGoodsId(wmsStock.getGoodsId(),SecurityUtils.getTid());
+        WmsAssetgoodsVo wmsAssetGoodsVo = wmsAssetgoodsService.selectWmsAssetgoodsVoByGoodsId(wmsStock.getGoodsId(),SecurityUtils.getTid());
         // 生成变动申请物件
         WmsChangeapplyitem wmsChangeapplyitem = new WmsChangeapplyitem();
         wmsChangeapplyitem.setChangeapplyitemId(wmsChangeapplyitem.getId());