修复溯源bug

src/main/java/com/yunfeiyun/agmp/tss/controller/AgmTaskPickController.java

@@ -36,6 +36,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -106,9 +107,12 @@ public class AgmTaskPickController extends BaseController
         reqVo.setTid(SecurityUtils.getTid());
         List<WmsFinishgoodsListResVo> list = agmTaskpickService.selectWmsFinishgoodsList(reqVo);
         List<String> stockIds = list.stream().map(WmsFinishgoodsListResVo::getStockId).collect(Collectors.toList());
-        List<SpmOrderNoSendAmountResVo> spmOrderList = spmOrderMapper.selectSpmOrderNoSendAmount(stockIds);
-        Map<String,BigDecimal> spmOrderMap = spmOrderList.stream().collect(Collectors.toMap(SpmOrderNoSendAmountResVo::getStockId,SpmOrderNoSendAmountResVo::getOrderGoodscount));
-        for (WmsFinishgoodsListResVo wmsFinishgoodsListResVo : list) {
+        Map<String,BigDecimal> spmOrderMap = new HashMap<>();
+        if(!stockIds.isEmpty()){
+            List<SpmOrderNoSendAmountResVo> spmOrderList = spmOrderMapper.selectSpmOrderNoSendAmount(stockIds);
+            spmOrderMap = spmOrderList.stream().collect(Collectors.toMap(SpmOrderNoSendAmountResVo::getStockId,SpmOrderNoSendAmountResVo::getOrderGoodscount));
+        }
+         for (WmsFinishgoodsListResVo wmsFinishgoodsListResVo : list) {
             //查询溯源图片
             List<SysRes> res = sysResService.selectResByBusIdAndTid(wmsFinishgoodsListResVo.getSourceinfoId(), ResConstants.BizType.SOURCE_INFO_AVATAR.getKey(),reqVo.getTid());
             if (res.size() > 0) {

src/main/java/com/yunfeiyun/agmp/tss/controller/WmsSupplierController.java

@@ -52,6 +52,7 @@ public class WmsSupplierController extends BaseController {
         if(StringUtils.isNotEmpty(wmsSupplier.getSupplierTypeStr())){
             wmsSupplier.setSupplierTypes(Arrays.asList(wmsSupplier.getSupplierTypeStr().split(",")));
         }
+        wmsSupplier.setTid(SecurityUtils.getTid());
         List<WmsSupplierListResVo> list = wmsSupplierService.selectWmsSupplierListResVoList(wmsSupplier);
         return getDataTable(list);
     }

src/main/java/com/yunfeiyun/agmp/tss/mapper/TssSourceperiodMapper.java

@@ -49,7 +49,7 @@ public interface TssSourceperiodMapper {
      * @return 结果
      */
     public int updateTssSourceperiod(TssSourceperiod tssSourceperiod);
-    public int updateTssSourceperiodBatch(@Param("list") List<TssSourceperiodDto> tssSourceperiods);
+    public int updateTssSourceperiodBatch(@Param("list") List<TssSourceperiodDto> tssSourceperiods, @Param("tid") String tid);
 
     /**
      * 删除溯源周期

src/main/java/com/yunfeiyun/agmp/tss/mapper/TssTracecodeapplyMapper.java

@@ -23,7 +23,7 @@ public interface TssTracecodeapplyMapper {
      * @param tarcecodeapplyId 溯源码生成单主键
      * @return 溯源码生成单
      */
-    public TssTracecodeapply selectTssTracecodeapplyByTarcecodeapplyId(String tarcecodeapplyId, @Param("tid") String tid);
+    public TssTracecodeapply selectTssTracecodeapplyByTarcecodeapplyId(@Param("tarcecodeapplyId") String tarcecodeapplyId, @Param("tid") String tid);
 
     /**
      * 查询溯源码生成单列表

src/main/java/com/yunfeiyun/agmp/tss/service/impl/TssSourceinfoServiceImpl.java

@@ -379,7 +379,7 @@ public class TssSourceinfoServiceImpl implements ITssSourceinfoService {
                 BeanUtils.copyProperties(tssSourceperiod, dto);
                 updateList2.add(dto);
             }
-            tssSourceperiodMapper.updateTssSourceperiodBatch(updateList2);
+            tssSourceperiodMapper.updateTssSourceperiodBatch(updateList2, reqVo.getTid());
         }
         if (deleteListIds.size() > 0) {
             tssSourceperiodMapper.deleteTssSourceperiodBySourceperiodIds(deleteListIds.toArray(new String[deleteListIds.size()]),reqVo.getTid());

src/main/java/com/yunfeiyun/agmp/tss/util/TssTraceCodeTplQRCodeUtil.java

@@ -7,6 +7,6 @@ public class TssTraceCodeTplQRCodeUtil {
 
     public static String getQrCodeUrl(TssTracecodetplparam tssTracecodetplparam){
         // 目前全局固定
-        return SpringUtil.getProperty("BASE_URL")+"/tssh5/#/";
+        return SpringUtil.getProperty("BASE_URL")+"/tss/h5/#/";
     }
 }

src/main/resources/mapper/SpmOrderMapper.xml

@@ -220,11 +220,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         SpmOrder so
         LEFT JOIN WmsStock ws ON ws.stockId = so.stockId
-        LEFT JOIN WmsGoods wg on wg.goodsId = ws.goodsId
         LEFT JOIN WmsFinishgoods sfg ON sfg.goodsId = ws.goodsId
-        LEFT JOIN TssSourceinfo ts ON ts.sourceinfoId = sfg.sourceinfoId
-        LEFT JOIN (select * from SysRes where resBiztype = 'SOURCE_INFO_AVATAR') s ON s.resBusId = ts.sourceinfoId
-        LEFT JOIN (select * from SysDict where dicttypeCode = 'agm_mpp_product') d on dictValue = sfg.finishgoodscode
+        LEFT JOIN (select * from SysDict where dicttypeCode = 'agm_mpp_product' and tid = #{tid}) d on d.dictValue = sfg.finishgoodscode
         <where>
             so.tid = #{tid}
             <if test="extentQueryParam != null and extentQueryParam != ''" >and (d.dictName like CONCAT("%",#{extentQueryParam},"%") or so.orderNo like CONCAT("%",#{extentQueryParam},"%") or so.orderConsigneerealname like CONCAT("%",#{extentQueryParam},"%"))</if>

src/main/resources/mapper/TssSourceperiodMapper.xml

@@ -157,7 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="period.sourceperiodFmstaskrcdremark != null">sourceperiodFmstaskrcdremark = #{period.sourceperiodFmstaskrcdremark},</if>
                 <if test="period.sourceperiodFmstaskrcdmanagername != null">sourceperiodFmstaskrcdmanagername = #{period.sourceperiodFmstaskrcdmanagername},</if>
                 <if test="period.sourceperiodName != null">sourceperiodName = #{period.sourceperiodName},</if>
-                <if test="period.tid != null">tid = #{tid},</if>
+                <if test="period.tid != null">tid = #{tperiod.id},</if>
             </trim>
             where sourceperiodId = #{period.sourceperiodId} and tid = #{tid}
         </foreach>