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

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

@@ -73,7 +73,7 @@ public class WmsFinishgoodsController extends BaseController
         boolean b = SecurityUtils.isValidate();
         if (b) {
             List<String> warehouseIds = dataAuthUtil.getManagerWarehouse();
-            if (warehouseIds.size() == 0) {
+            if (warehouseIds.isEmpty()) {
                 return getDataTable(new ArrayList<>());
             }
             reqVo.setWarehouseIds(warehouseIds);

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

@@ -4,7 +4,6 @@ import com.yunfeiyun.agmp.fms.domain.WmsFinishgoods;
 import com.yunfeiyun.agmp.fms.domain.reqvo.AppSeedOutAddHistoryListReqVo;
 import com.yunfeiyun.agmp.fms.domain.reqvo.WmsFinishgoodsReqVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.*;
-import com.yunfeiyun.agmp.fms.domain.vo.WmsFinishgoodsChangeApplyExcelVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -25,13 +24,6 @@ public interface WmsFinishgoodsMapper
      * @return 农产品货物
      */
     public WmsFinishgoodsInfoResVo selectWmsFinishgoodsByFinishgoodsId(@Param("finishgoodsId") String finishgoodsId, @Param("tid") String tid);
-    /**
-     * 查询农产品货物
-     *
-     * @param stockId 农产品货物主键
-     * @return 农产品货物
-     */
-    public WmsFinishgoodsStockResVo selectWmsFinishgoodsStockResVoByStockId(@Param("stockId") String stockId, @Param("tid") String tid);
 
 
     /***/
@@ -62,8 +54,6 @@ public interface WmsFinishgoodsMapper
      * @return 结果
      */
     public int updateWmsFinishgoods(WmsFinishgoods wmsFinishgoods);
-    
-    public int batchVidByNo(WmsFinishgoods wmsFinishgoods);
 
     /**
      * 删除农产品货物
@@ -81,9 +71,5 @@ public interface WmsFinishgoodsMapper
      */
     public int deleteWmsFinishgoodsByFinishgoodsIds(@Param("array") String[] finishgoodsIds, @Param("tid") String tid);
 
-    public WmsFinishgoodsSourceInfo selectWmsFinishgoodsSourceInfo(@Param("stockId") String stockId, @Param("tid") String tid);
-
-    public int selectCount(@Param("sourceinfoId") String sourceinfoId, @Param("tid") String tid);
-
     List<AppSeedOutAddHistoryResVo> selectAppSeedOutAddHistoryList(AppSeedOutAddHistoryListReqVo appSeedOutAddHistoryListReqVo);
 }

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

@@ -6,7 +6,6 @@ import com.yunfeiyun.agmp.fms.domain.reqvo.WmsFinishgoodsReqVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.AppSeedOutAddHistoryResVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.WmsFinishGoodsStockSumInfoResVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.WmsFinishgoodsInfoResVo;
-import com.yunfeiyun.agmp.fms.domain.vo.WmsFinishgoodsChangeApplyExcelVo;
 
 import java.util.List;
 
@@ -69,8 +68,6 @@ public interface IWmsFinishgoodsService
      */
     public int deleteWmsFinishgoodsByFinishgoodsId(String finishgoodsId, String tid);
 
-    public int selectCount(String sourceinfoId, String tid);
-
 
     List<AppSeedOutAddHistoryResVo> selectAppSeedOutAddHistoryList(AppSeedOutAddHistoryListReqVo appSeedOutAddHistoryListReqVo);
 }

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

@@ -1,26 +1,24 @@
 package com.yunfeiyun.agmp.fms.service.impl;
 
-import java.util.List;
-
 import com.yunfeiyun.agmp.common.enums.DictTypeEnums;
 import com.yunfeiyun.agmp.common.utils.DictUtils;
+import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.fms.domain.WmsFinishgoods;
 import com.yunfeiyun.agmp.fms.domain.WmsGoods;
 import com.yunfeiyun.agmp.fms.domain.reqvo.AppSeedOutAddHistoryListReqVo;
-import com.yunfeiyun.agmp.fms.domain.resvo.AppSeedOutAddHistoryResVo;
-import com.yunfeiyun.agmp.fms.domain.vo.WmsFinishgoodsChangeApplyExcelVo;
-import com.yunfeiyun.agmp.fms.mapper.WmsFinishgoodsMapper;
-import com.yunfeiyun.agmp.fms.mapper.WmsGoodsMapper;
 import com.yunfeiyun.agmp.fms.domain.reqvo.WmsFinishgoodsReqVo;
+import com.yunfeiyun.agmp.fms.domain.resvo.AppSeedOutAddHistoryResVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.WmsFinishGoodsStockSumInfoResVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.WmsFinishgoodsInfoResVo;
+import com.yunfeiyun.agmp.fms.mapper.WmsFinishgoodsMapper;
 import com.yunfeiyun.agmp.fms.service.IWmsFinishgoodsService;
+import com.yunfeiyun.agmp.fms.service.IWmsGoodsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import java.util.List;
 
 
 /**
@@ -34,8 +32,9 @@ public class WmsFinishgoodsServiceImpl implements IWmsFinishgoodsService
 {
     @Autowired
     private WmsFinishgoodsMapper wmsFinishgoodsMapper;
-    @Resource
-    private WmsGoodsMapper wmsGoodsMapper;
+
+    @Autowired
+    private IWmsGoodsService wmsGoodsService;
 
     /**
      * 查询农产品货物
@@ -56,11 +55,13 @@ public class WmsFinishgoodsServiceImpl implements IWmsFinishgoodsService
      */
     @Override
     public List<WmsFinishgoods> selectWmsFinishgoodsList(WmsFinishgoods wmsFinishgoods) {
+        wmsFinishgoods.setTid(SecurityUtils.getTid());
         return wmsFinishgoodsMapper.selectWmsFinishgoodsList(wmsFinishgoods);
     }
 
     @Override
     public List<WmsFinishGoodsStockSumInfoResVo> selectWmsFinishGoodsStockSumInfo(WmsFinishgoodsReqVo reqVo) {
+        reqVo.setTid(SecurityUtils.getTid());
         return wmsFinishgoodsMapper.selectWmsFinishGoodsStockSumInfo(reqVo);
     }
 
@@ -72,6 +73,7 @@ public class WmsFinishgoodsServiceImpl implements IWmsFinishgoodsService
      */
     @Override
     public int insertWmsFinishgoods(WmsFinishgoods wmsFinishgoods) {
+        wmsFinishgoods.setTid(SecurityUtils.getTid());
         return wmsFinishgoodsMapper.insertWmsFinishgoods(wmsFinishgoods);
     }
 
@@ -84,12 +86,13 @@ public class WmsFinishgoodsServiceImpl implements IWmsFinishgoodsService
     @Transactional
     @Override
     public int updateWmsFinishgoods(WmsFinishgoods wmsFinishgoods) {
+        wmsFinishgoods.setTid(SecurityUtils.getTid());
         wmsFinishgoodsMapper.updateWmsFinishgoods(wmsFinishgoods);
         if (!StringUtils.isEmpty(wmsFinishgoods.getFinishgoodscode()) && !StringUtils.isEmpty(wmsFinishgoods.getGoodsId())) {
             WmsGoods wmsGoods = new WmsGoods();
             wmsGoods.setGoodsId(wmsFinishgoods.getGoodsId());
             wmsGoods.setGoodsName(DictUtils.getDictLabel(DictTypeEnums.AGM_MPP_PRODUCT.getCode(), wmsFinishgoods.getFinishgoodscode()));
-            wmsGoodsMapper.updateWmsGoods(wmsGoods);
+            wmsGoodsService.updateWmsGoods(wmsGoods);
         }
         return 1;
     }
@@ -117,12 +120,8 @@ public class WmsFinishgoodsServiceImpl implements IWmsFinishgoodsService
     }
 
     @Override
-    public int selectCount(String sourceinfoId, String tid) {
-        return wmsFinishgoodsMapper.selectCount(sourceinfoId,tid);
-    }
-
-    @Override
     public List<AppSeedOutAddHistoryResVo> selectAppSeedOutAddHistoryList(AppSeedOutAddHistoryListReqVo appSeedOutAddHistoryListReqVo) {
+        appSeedOutAddHistoryListReqVo.setTid(SecurityUtils.getTid());
         return wmsFinishgoodsMapper.selectAppSeedOutAddHistoryList(appSeedOutAddHistoryListReqVo);
     }
 

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

@@ -39,6 +39,7 @@ public class WmsGoodsServiceImpl implements IWmsGoodsService
      */
     @Override
     public int updateWmsGoods(WmsGoods wmsGoods) {
+        wmsGoods.setTid(SecurityUtils.getTid());
         return wmsGoodsMapper.updateWmsGoods(wmsGoods);
     }
 

src/main/resources/mapper/WmsFinishgoodsMapper.xml

@@ -78,24 +78,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and fg.tid = #{tid}
         </if>
     </select>
-    <select id="selectWmsFinishgoodsStockResVoByStockId" parameterType="String" resultType="com.yunfeiyun.agmp.fms.domain.resvo.WmsFinishgoodsStockResVo">
-        SELECT
-        fg.*,
-        g.goodsName,
-        g.goodsSpec,
-        g.goodsUnit,
-        s.stockAmount,
-        w.warehouseName
-        FROM
-        WmsFinishgoods fg
-        LEFT JOIN WmsGoods g ON fg.goodsId = g.goodsId
-        LEFT JOIN WmsStock s on s.goodsId = g.goodsId
-        LEFT JOIN WmsWarehouse w on w.warehouseId = s.warehouseId
-        where s.stockId = #{stockId}
-        <if test="tid != null and tid !='' and tid != '-1'">
-            and fg.tid = #{tid}
-        </if>
-    </select>
         
     <insert id="insertWmsFinishgoods" parameterType="WmsFinishgoods">
         insert into WmsFinishgoods
@@ -113,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="finishgoodsExpense != null">finishgoodsExpense,</if>
             <if test="supplierId != null">supplierId,</if>
             <if test="finishgoodsLevel != null">finishgoodsLevel,</if>
+            <if test="tid != null">tid,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="finishgoodsId != null">#{finishgoodsId},</if>
@@ -128,6 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="finishgoodsExpense != null">#{finishgoodsExpense},</if>
             <if test="supplierId != null">#{supplierId},</if>
             <if test="finishgoodsLevel != null">#{finishgoodsLevel},</if>
+            <if test="tid != null">#{tid},</if>
          </trim>
     </insert>
 
@@ -166,33 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and tid = #{tid}
         </if>
     </delete>
-    <select id="selectWmsFinishgoodsSourceInfo" parameterType="String" resultType="com.yunfeiyun.agmp.fms.domain.resvo.WmsFinishgoodsSourceInfo">
-        SELECT
-        ws.stockId,
-        wfg.finishgoodNo,
-        wfg.finishgoodsId,
-        wfg.finishgoodscode,
-        tsi.sourceinfoName,
-        wfg.finishgoodCreateddate,
-        wtp.pickDate,
-        wfg.finishgoodsLevel,
-        wfg.supplierId
 
-        FROM
-        WmsFinishgoods wfg
-        LEFT JOIN WmsStock ws on  ws.goodsId	= wfg.goodsId
-        LEFT JOIN WmsGoods wg ON ws.goodsId = wg.goodsId
-        LEFT JOIN TssSourceinfo tsi on tsi.sourceinfoId = wfg.sourceinfoId
-        LEFT JOIN FmsTaskpick wtp on wtp.pickNo = wfg.finishgoodPickno
-        where
-        ws.stockId = #{stockId}
-        <if test="tid != null and tid !='' and tid != '-1'">
-            and wfg.tid = #{tid}
-        </if>
-    </select>
-    <select id="selectCount" parameterType="String" resultType="int">
-        select count(1) from WmsFinishgoods where sourceinfoId = #{sourceinfoId}
-    </select>
     <select id="selectAppSeedOutAddHistoryList"
             resultType="com.yunfeiyun.agmp.fms.domain.resvo.AppSeedOutAddHistoryResVo">
         SELECT
@@ -230,15 +188,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
     </select>
-
-    <!-- 批量回写上链平台生成的批次标识（根据农产品批次编号） -->
-    <update id="batchVidByNo" parameterType="WmsFinishgoods">
-        update WmsFinishgoods
-        set vid = #{vid}
-        where finishgoodNo = #{finishgoodNo}
-        <if test="tid != null and tid !='' and tid != '-1'">
-            and tid = #{tid}
-        </if>
-    </update>
     
 </mapper>