Merge branch 'develp' of com_yunfei_saas/agmp-tss into master

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

@@ -18,10 +18,7 @@ import com.yunfeiyun.agmp.common.web.system.domain.SysRes;
 import com.yunfeiyun.agmp.common.web.system.service.ISysResService;
 import com.yunfeiyun.agmp.tss.domain.WmsWarehouse;
 import com.yunfeiyun.agmp.tss.domain.reqvo.*;
-import com.yunfeiyun.agmp.tss.domain.resvo.AgmTaskPickListResVo;
-import com.yunfeiyun.agmp.tss.domain.resvo.MppMaterialResVo;
-import com.yunfeiyun.agmp.tss.domain.resvo.WmsFinishgoodsListExportResVo;
-import com.yunfeiyun.agmp.tss.domain.resvo.WmsFinishgoodsListResVo;
+import com.yunfeiyun.agmp.tss.domain.resvo.*;
 import com.yunfeiyun.agmp.tss.mapper.SpmOrderMapper;
 import com.yunfeiyun.agmp.tss.service.IAgmTaskpickService;
 import com.yunfeiyun.agmp.tss.service.IMppMaterialService;
@@ -39,7 +36,10 @@ 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;
 
 /**
  * 溯源信息Controller
@@ -106,13 +106,25 @@ public class AgmTaskPickController extends BaseController
         startPage();
         reqVo.setTid(SecurityUtils.getTid());
         List<WmsFinishgoodsListResVo> list = agmTaskpickService.selectWmsFinishgoodsList(reqVo);
-        for (WmsFinishgoodsListResVo wmsFinishgoodsListResVo : list) {
+        Map<String,BigDecimal> spmOrderMap = new HashMap<>();
+        if(reqVo.isUsefulStock()){
+            List<String> stockIds = list.stream().map(WmsFinishgoodsListResVo::getStockId).collect(Collectors.toList());
+            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) {
                 wmsFinishgoodsListResVo.setSourceinfoAvatar(res.get(0).getResUrl());
             }
-
+            BigDecimal sendOrderAmount = spmOrderMap.get(wmsFinishgoodsListResVo.getStockId());
+            if(null != sendOrderAmount){
+                BigDecimal stockAmount = new BigDecimal(wmsFinishgoodsListResVo.getStockAmount()).subtract(sendOrderAmount);
+                wmsFinishgoodsListResVo.setStockAmount(stockAmount.compareTo(BigDecimal.ZERO)<0?"0":stockAmount.toString());
+            }
             //查询加工前产品编号
             if ("1".equals(wmsFinishgoodsListResVo.getFinishgoodsType())) {
                 MppMaterialReqVo reqVo1 = new MppMaterialReqVo();

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

@@ -233,6 +233,7 @@ public class SpmOrderController extends BaseController {
     @GetMapping("/city/stat")
     public TableDataInfo spmOrderCityStat(SelectCountOfScreenReqVo reqVo) {
         startPage();
+        reqVo.setTid(SecurityUtils.getTid());
         List<SpmOrderStatResVo> spmOrderStatResVos = spmOrderService.selectCountGroupByCity(reqVo);
         return getDataTable(spmOrderStatResVos);
     }

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

@@ -8,6 +8,7 @@ import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
 import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
 import com.yunfeiyun.agmp.common.enums.BusinessType;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
+import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.common.utils.poi.ExcelUtil;
 import com.yunfeiyun.agmp.tss.domain.TssScanrcd;
 import com.yunfeiyun.agmp.tss.domain.reqvo.SelectCountOfScreenReqVo;
@@ -44,8 +45,10 @@ public class TssScanrcdController extends BaseController {
     @PreAuthorize("@ss.hasPermi('tss:scanrcd:list')")
     @GetMapping("/list")
     public TableDataInfo list(TssScanrcdReqVo tssScanrcdReqVo) {
+        if(StringUtils.isEmpty(tssScanrcdReqVo.getTid())){
+            tssScanrcdReqVo.setTid(SecurityUtils.getTid());
+        }
         startPage();
-        tssScanrcdReqVo.setTid(SecurityUtils.getTid());
         List<TssScanrcdResVo> list = tssScanrcdService.selectTssScanrcdList(tssScanrcdReqVo);
         return getDataTable(list);
     }
@@ -120,6 +123,7 @@ public class TssScanrcdController extends BaseController {
     @PreAuthorize("@ss.hasPermi('fms:screen:scanrcd:province:city:stat')")
     @GetMapping("/province/city/stat")
     public AjaxResult scanrcdProvinceCityStat(SelectCountOfScreenReqVo reqVo) {
+        reqVo.setTid(SecurityUtils.getTid());
         List<TssScanrcdStatResVo> tssScanrcdStatResVos = tssScanrcdService.selectCountByProvince(reqVo);
         List<TssScanrcdStatResVo> tssScanrcdStatResVos1 = tssScanrcdService.selectCountByCity(reqVo);
         JSONArray jsonArray = new JSONArray();

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

@@ -185,7 +185,7 @@ public class TssSourceinfoController extends BaseController {
     @PreAuthorize("@ss.hasPermi('tss:sourceinfo:edit')")
     @Log(title = "溯源信息", businessType = BusinessType.UPDATE)
     @PutMapping("/edit")
-    public AjaxResult edit(@RequestBody AddTssSourceinfoReqVo reqVo) {
+    public AjaxResult edit(@RequestBody AddTssSourceinfoReqVo reqVo) throws Exception {
         reqVo.setTid(SecurityUtils.getTid());
         return tssSourceinfoService.updateTssSourceinfo(reqVo);
     }

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

@@ -6,6 +6,7 @@ import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
 import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
 import com.yunfeiyun.agmp.common.enums.BusinessType;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
+import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.common.utils.poi.ExcelUtil;
 import com.yunfeiyun.agmp.tss.domain.TssTracecodeapply;
 import com.yunfeiyun.agmp.tss.domain.reqvo.TssTracecodeapplyReqVo;
@@ -14,7 +15,6 @@ import com.yunfeiyun.agmp.tss.domain.resvo.TssTracecodeapplyManagerListResVo;
 import com.yunfeiyun.agmp.tss.service.ITssScanrcdService;
 import com.yunfeiyun.agmp.tss.service.ITssTracecodeapplyService;
 import com.yunfeiyun.agmp.tss.util.DataAuthUtil;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -148,8 +148,11 @@ public class TssTracecodeapplyController extends BaseController {
      * app扫溯源码查询页面，不做任何数据权限
      */
     @GetMapping("/app/query/source/info")
-    public AjaxResult appQuerySourceInfo(String tarcecodeapplyno,String tssSourceperiodId) {
-        return success(tssTracecodeapplyService.appQuerySourceInfo(tarcecodeapplyno,tssSourceperiodId,SecurityUtils.getTid()));
+    public AjaxResult appQuerySourceInfo(@RequestParam("tarcecodeapplyno") String tarcecodeapplyno,@RequestParam("tid") String tid,@RequestParam("tssSourceperiodId") String tssSourceperiodId) {
+        if(StringUtils.isEmpty(tid)){
+            tid = SecurityUtils.getTid();
+        }
+        return success(tssTracecodeapplyService.appQuerySourceInfo(tarcecodeapplyno,tssSourceperiodId,tid));
     }
     /**
      * app种子扫溯源码查询页面

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

@@ -8,11 +8,13 @@ import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
 import com.yunfeiyun.agmp.common.enums.BusinessType;
 import com.yunfeiyun.agmp.common.framework.manager.ResManager;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
+import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.common.utils.poi.ExcelUtil;
 import com.yunfeiyun.agmp.common.web.system.domain.SysRes;
 import com.yunfeiyun.agmp.common.web.system.service.ISysResService;
 import com.yunfeiyun.agmp.tss.domain.WmsSupplier;
 import com.yunfeiyun.agmp.tss.domain.reqvo.WmsSupplierAddReqVo;
+import com.yunfeiyun.agmp.tss.domain.resvo.WmsSupplierListResVo;
 import com.yunfeiyun.agmp.tss.service.IWmsSupplierService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -21,6 +23,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -46,8 +49,11 @@ public class WmsSupplierController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(WmsSupplier wmsSupplier) {
         startPage();
+        if(StringUtils.isNotEmpty(wmsSupplier.getSupplierTypeStr())){
+            wmsSupplier.setSupplierTypes(Arrays.asList(wmsSupplier.getSupplierTypeStr().split(",")));
+        }
         wmsSupplier.setTid(SecurityUtils.getTid());
-        List<WmsSupplier> list = wmsSupplierService.selectWmsSupplierList(wmsSupplier);
+        List<WmsSupplierListResVo> list = wmsSupplierService.selectWmsSupplierListResVoList(wmsSupplier);
         return getDataTable(list);
     }
 
@@ -59,8 +65,8 @@ public class WmsSupplierController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response,@RequestBody WmsSupplier wmsSupplier) {
         wmsSupplier.setTid(SecurityUtils.getTid());
-        List<WmsSupplier> list = wmsSupplierService.selectWmsSupplierList(wmsSupplier);
-        ExcelUtil<WmsSupplier> util = new ExcelUtil<WmsSupplier>(WmsSupplier.class);
+        List<WmsSupplierListResVo> list = wmsSupplierService.selectWmsSupplierListResVoList(wmsSupplier);
+        ExcelUtil<WmsSupplierListResVo> util = new ExcelUtil<>(WmsSupplierListResVo.class);
         util.exportExcel(response, list, "供应商数据");
     }
 

src/main/java/com/yunfeiyun/agmp/tss/domain/SpmOrder.java

@@ -36,7 +36,7 @@ public class SpmOrder extends BaseEntity {
 
     /** 出库登记单销售数量 */
     @Excel(name = "出库登记单销售数量")
-    private Long orderGoodscount;
+    private String orderGoodscount;
 
     /** 出库登记单订单生成时间 */
     @Excel(name = "出库登记单订单生成时间")

src/main/java/com/yunfeiyun/agmp/tss/domain/WmsSupplier.java

@@ -2,10 +2,10 @@ package com.yunfeiyun.agmp.tss.domain;
 
 import com.yunfeiyun.agmp.common.annotation.Excel;
 import com.yunfeiyun.agmp.common.core.domain.BaseEntity;
-import com.yunfeiyun.agmp.common.enums.DictTypeEnums;
-import com.yunfeiyun.agmp.common.utils.DictUtils;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 供应商对象 WmsSupplier
  * 
@@ -60,9 +60,10 @@ public class WmsSupplier extends BaseEntity {
 
     private String tid;
 
-    public String getSupplierTypeContent(){
-        return DictUtils.getDictLabel(DictTypeEnums.AGM_PROCESS_TYPE.getCode(), supplierType);
-    }
+    private List<String> supplierTypes;
+
+    private String supplierTypeStr;
+
 
 
 }

src/main/java/com/yunfeiyun/agmp/tss/domain/reqvo/AgmTaskPickListReqVo.java

@@ -49,6 +49,10 @@ public class AgmTaskPickListReqVo extends BaseEntity {
      * 是否有库存量,0否，1是
      */
     private String hasStock;
+    /**
+     * 是否展示可用库存
+     * */
+    private boolean  usefulStock;
 
     /**
      * 质检状态

src/main/java/com/yunfeiyun/agmp/tss/domain/resvo/SpmOrderNoSendAmountResVo.java

@@ -0,0 +1,11 @@
+package com.yunfeiyun.agmp.tss.domain.resvo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class SpmOrderNoSendAmountResVo {
+    private String stockId;
+    private BigDecimal orderGoodscount;
+}

src/main/java/com/yunfeiyun/agmp/tss/domain/resvo/SpmOrderOfScreenResVo.java

@@ -3,6 +3,8 @@ package com.yunfeiyun.agmp.tss.domain.resvo;
 import com.yunfeiyun.agmp.common.enums.SpmOrderStatus;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class SpmOrderOfScreenResVo {
 	/**订单金额*/
@@ -16,7 +18,7 @@ public class SpmOrderOfScreenResVo {
    /**农产品信息*/
    private String finishgoodscode;
    /**销售数量*/
-   private Integer orderGoodscount;
+   private BigDecimal orderGoodscount;
    /**货物单位*/
    private String goodsUnit;
    /**货物单位*/

src/main/java/com/yunfeiyun/agmp/tss/domain/resvo/SpmOrderOfTssStatResVo.java

@@ -3,6 +3,8 @@ package com.yunfeiyun.agmp.tss.domain.resvo;
 import com.yunfeiyun.agmp.common.enums.SpmOrderStatus;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class SpmOrderOfTssStatResVo {
    /**订单金额*/
@@ -16,7 +18,7 @@ public class SpmOrderOfTssStatResVo {
    /**农产品信息*/
    private String finishgoodscode;
    /**销售数量*/
-   private Integer orderGoodscount;
+   private BigDecimal orderGoodscount;
    /**货物单位*/
    private String goodsUnit;
    /**货物单位*/

src/main/java/com/yunfeiyun/agmp/tss/domain/resvo/SpmOrderResVo.java

@@ -21,7 +21,7 @@ public class SpmOrderResVo {
    private String finishgoodscode;
    /**销售数量*/
    @Excel(name = "销售数量")
-   private Integer orderGoodscount;
+   private BigDecimal orderGoodscount;
    /**订单金额*/
    @Excel(name = "订单金额")
    private BigDecimal orderPrice;

src/main/java/com/yunfeiyun/agmp/tss/domain/resvo/WmsSupplierListResVo.java

@@ -0,0 +1,13 @@
+package com.yunfeiyun.agmp.tss.domain.resvo;
+
+import com.yunfeiyun.agmp.common.enums.DictTypeEnums;
+import com.yunfeiyun.agmp.common.utils.DictUtils;
+import com.yunfeiyun.agmp.tss.domain.WmsSupplier;
+import lombok.Data;
+
+@Data
+public class WmsSupplierListResVo extends WmsSupplier {
+    public String getSupplierTypeContent(){
+        return DictUtils.getDictLabel(DictTypeEnums.AGM_PROCESS_TYPE.getCode(), super.getSupplierType());
+    }
+}

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

@@ -101,4 +101,6 @@ public interface SpmOrderMapper  {
     public Integer selectGoodsTypeCountOfTssTrace(SelectOfTssStatReqVo reqVo);
     /** 溯源统计页面使用：产品销售地（气泡图） */
     public List<SpmOrderStatResVo> selectMoneyGroupByCity(SelectOfTssStatReqVo reqVo);
+
+    List<SpmOrderNoSendAmountResVo> selectSpmOrderNoSendAmount(List<String> stockIds);
 }

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/mapper/WmsSupplierMapper.java

@@ -1,6 +1,7 @@
 package com.yunfeiyun.agmp.tss.mapper;
 
 import com.yunfeiyun.agmp.tss.domain.WmsSupplier;
+import com.yunfeiyun.agmp.tss.domain.resvo.WmsSupplierListResVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -59,5 +60,7 @@ public interface WmsSupplierMapper {
      * @param supplierIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteWmsSupplierBySupplierIds(@Param("supplierIds") String[] supplierIds, @Param("tid") String tid);
+    public int deleteWmsSupplierBySupplierIds(@Param("array") String[] supplierIds, @Param("tid") String tid);
+
+    List<WmsSupplierListResVo> selectWmsSupplierListResVoList(WmsSupplier wmsSupplier);
 }

src/main/java/com/yunfeiyun/agmp/tss/service/ITssSourceinfoService.java

@@ -47,7 +47,7 @@ public interface ITssSourceinfoService  {
      * @return 结果
      */
     public int updateTssSourceinfo(TssSourceinfo tssSourceinfo);
-    public AjaxResult updateTssSourceinfo(AddTssSourceinfoReqVo reqVo);
+    public AjaxResult updateTssSourceinfo(AddTssSourceinfoReqVo reqVo) throws Exception;
 
     /**
      * 批量删除溯源信息

src/main/java/com/yunfeiyun/agmp/tss/service/IWmsSupplierService.java

@@ -3,6 +3,7 @@ package com.yunfeiyun.agmp.tss.service;
 import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
 import com.yunfeiyun.agmp.tss.domain.WmsSupplier;
 import com.yunfeiyun.agmp.tss.domain.reqvo.WmsSupplierAddReqVo;
+import com.yunfeiyun.agmp.tss.domain.resvo.WmsSupplierListResVo;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -64,4 +65,6 @@ public interface IWmsSupplierService  {
     public int deleteWmsSupplierBySupplierId(String supplierId,String tid);
 
     public AjaxResult upload(MultipartFile file);
+
+    List<WmsSupplierListResVo> selectWmsSupplierListResVoList(WmsSupplier wmsSupplier);
 }

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

@@ -256,6 +256,9 @@ public class SpmOrderServiceImpl implements ISpmOrderService {
             if(!tssTracecodeapply.getStockId().equals(spmOrder.getStockId())){
                 throw new BizException(ErrorCode.TSS_TRACE_CODE_NO_MATCH_GOODS);
             }
+            if(StringUtils.isNotEmpty(tssTracecodeapply.getOrderId())){
+                throw new BizException(ErrorCode.INVALID_PARAMETER.getCode(),"溯源码已经被使用");
+            }
         }
         return tssTracecodeapplyMapper.matchSpmOrder(spmOrderMatchTraceCodeReqVo.getSpmOrderId(), spmOrderMatchTraceCodeReqVo.getTarcecodeapplyno(),spmOrderMatchTraceCodeReqVo.getTid()) == 1;
     }
@@ -307,7 +310,7 @@ public class SpmOrderServiceImpl implements ISpmOrderService {
         wmsChangeapplyitem.setChangeapplyitemType(wmsFinishgoodsStockResVo.getFinishgoodsType());
         wmsChangeapplyitem.setChangeapplyitemUnit(wmsFinishgoodsStockResVo.getGoodsUnit());
         wmsChangeapplyitem.setChangeapplyitemSpec(wmsFinishgoodsStockResVo.getGoodsSpec());
-        if (spmOrder.getOrderGoodscount() == 0) {
+        if (new BigDecimal(spmOrder.getOrderGoodscount()).compareTo(BigDecimal.ZERO) == 0) {
             throw new BizException(ErrorCode.WMS_STOCK_CANNOT_CHANGE_ZERO);
         }
         wmsChangeapplyitem.setChangeapplyitemNum(new BigDecimal(spmOrder.getOrderGoodscount()));

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

@@ -147,6 +147,7 @@ public class TssSourceinfoServiceImpl implements ITssSourceinfoService {
                     String[] resIds = tssSourceperiod.getPeriodResIds().split(",");
                     for (String resId : resIds) {
                         SysRes sysRes = new SysRes();
+                        sysRes.setTid(reqVo.getTid());
                         sysRes.setResId(resId);
                         sysRes.setResBusId(tssSourceperiod.getSourceperiodId());
                         sysResList.add(sysRes);
@@ -167,6 +168,7 @@ public class TssSourceinfoServiceImpl implements ITssSourceinfoService {
                         String[] resIds = sourceperiod.getPeriodResIds().split(",");
                         for (String resId : resIds) {
                             SysRes sysRes = new SysRes();
+                            sysRes.setTid(reqVo.getTid());
                             sysRes.setResId(resId);
                             sysRes.setResBusId(sourceperiod.getSourceperiodId());
                             sysResList.add(sysRes);
@@ -188,6 +190,7 @@ public class TssSourceinfoServiceImpl implements ITssSourceinfoService {
                     String[] resIds = tssSourceEnvironment.getEnvironmentResIds().split(",");
                     for (String resId : resIds) {
                         SysRes sysRes = new SysRes();
+                        sysRes.setTid(reqVo.getTid());
                         sysRes.setResId(resId);
                         sysRes.setResBusId(tssSourceEnvironment.getSourceEnvironmentId());
                         sysResList.add(sysRes);
@@ -227,7 +230,7 @@ public class TssSourceinfoServiceImpl implements ITssSourceinfoService {
 
     @Transactional
     @Override
-    public AjaxResult updateTssSourceinfo(AddTssSourceinfoReqVo reqVo) {
+    public AjaxResult updateTssSourceinfo(AddTssSourceinfoReqVo reqVo) throws Exception{
         TssSourceinfo tssSourceinfo = new TssSourceinfo();
         BeanUtils.copyProperties(reqVo, tssSourceinfo);
         tssSourceinfo.setSourceinfoModifier(SecurityUtils.getUserId());
@@ -239,6 +242,7 @@ public class TssSourceinfoServiceImpl implements ITssSourceinfoService {
         List<SysRes> resList = new ArrayList<>();
         List<String> resIdsDel = new ArrayList<>();
         SysRes sysResReq = new SysRes();
+        sysResReq.setTid(reqVo.getTid());
         sysResReq.setResBusId(sourceinfoId);
         sysResReq.setResBiztype(ResConstants.BizType.SOURCE_INFO_AVATAR.getKey());
         List<SysRes> sysResList = sysResMapper.selectSysResList(sysResReq);
@@ -258,10 +262,10 @@ public class TssSourceinfoServiceImpl implements ITssSourceinfoService {
         }
 
         /* 体检报告 */
-        resList(reqVo.getQualityResIds(), sourceinfoId, resList, resIdsDel, ResConstants.BizType.SOURCE_INFO_QUALITY.getKey(),reqVo.getTid());
+        resList(reqVo.getQualityResIds(), sourceinfoId, resList, resIdsDel, ResConstants.BizType.SOURCE_INFO_QUALITY.getKey(), reqVo.getTid());
 
         /* 崭新形象 */
-        resList(reqVo.getFigureResIds(), sourceinfoId, resList, resIdsDel, ResConstants.BizType.SOURCE_INFO_FIGURE.getKey(),reqVo.getTid());
+        resList(reqVo.getFigureResIds(), sourceinfoId, resList, resIdsDel, ResConstants.BizType.SOURCE_INFO_FIGURE.getKey(), reqVo.getTid());
 
         /*  查询原有数据，用于判断当次修改删除掉的记录  */
         List<TssSourceperiod> tssSourceperiods = reqVo.getTssSourceperiods();
@@ -286,6 +290,7 @@ public class TssSourceinfoServiceImpl implements ITssSourceinfoService {
                 deleteListIds.add(tssSourceperiod.getSourceperiodId());
                 //删除下面的图片
                 SysRes req = new SysRes();
+                req.setTid(reqVo.getTid());
                 req.setResBusId(tssSourceperiod.getSourceperiodId());
                 List<SysRes> resList1 = sysResMapper.selectSysResList(req);
                 for (SysRes sysRes : resList1) {
@@ -299,7 +304,6 @@ public class TssSourceinfoServiceImpl implements ITssSourceinfoService {
         for (TssSourceperiod tssSourceperiod : tssSourceperiods) {
             tssSourceperiod.setTid(reqVo.getTid());
             if (StringUtils.isEmpty(tssSourceperiod.getSourceperiodId())) {
-                tssSourceperiod.setTid(reqVo.getTid());
                 tssSourceperiod.setSourceperiodId(tssSourceperiod.getId());
                 tssSourceperiod.setSourceinfoId(sourceinfoId);
                 tssSourceperiod.setSourceperiodParentid("0");
@@ -307,7 +311,7 @@ public class TssSourceinfoServiceImpl implements ITssSourceinfoService {
                 addList.add(tssSourceperiod);
 
                 //处理图片
-                resList(tssSourceperiod.getPeriodResIds(), tssSourceperiod.getSourceperiodId(), resList, resIdsDel, ResConstants.BizType.SOURCE_INFO_PERIOD.getKey(),reqVo.getTid());
+                resList(tssSourceperiod.getPeriodResIds(), tssSourceperiod.getSourceperiodId(), resList, resIdsDel, ResConstants.BizType.SOURCE_INFO_PERIOD.getKey(), reqVo.getTid());
 
 
                 List<TssSourceperiod> tssSourceperiods1 = tssSourceperiod.getTssSourceperiods();
@@ -324,7 +328,6 @@ public class TssSourceinfoServiceImpl implements ITssSourceinfoService {
                         String[] resIds = sourceperiod.getPeriodResIds().split(",");
                         for (String resId : resIds) {
                             SysRes sysRes = new SysRes();
-                            sysRes.setTid(reqVo.getTid());
                             sysRes.setResId(resId);
                             sysRes.setResBusId(sourceperiod.getSourceperiodId());
                             resList.add(sysRes);
@@ -336,12 +339,13 @@ public class TssSourceinfoServiceImpl implements ITssSourceinfoService {
                 updateList.add(tssSourceperiod);
 
                 //处理图片
-                resList(tssSourceperiod.getPeriodResIds(), tssSourceperiod.getSourceperiodId(), resList, resIdsDel, ResConstants.BizType.SOURCE_INFO_PERIOD.getKey(),reqVo.getTid());
+                resList(tssSourceperiod.getPeriodResIds(), tssSourceperiod.getSourceperiodId(), resList, resIdsDel, ResConstants.BizType.SOURCE_INFO_PERIOD.getKey(), reqVo.getTid());
 
                 List<TssSourceperiod> tssSourceperiods1 = tssSourceperiod.getTssSourceperiods();
                 for (TssSourceperiod sourceperiod : tssSourceperiods1) {
                     sourceperiod.setTid(reqVo.getTid());
                     if (StringUtils.isEmpty(sourceperiod.getSourceperiodId())) {
+
                         sourceperiod.setSourceperiodId(sourceperiod.getId());
                         sourceperiod.setSourceperiodParentid(tssSourceperiod.getSourceperiodId());
                         sourceperiod.setSourceinfoId(sourceinfoId);
@@ -353,16 +357,14 @@ public class TssSourceinfoServiceImpl implements ITssSourceinfoService {
                             String[] resIds = sourceperiod.getPeriodResIds().split(",");
                             for (String resId : resIds) {
                                 SysRes sysRes = new SysRes();
-                                sysRes.setTid(reqVo.getTid());
                                 sysRes.setResId(resId);
                                 sysRes.setResBusId(sourceperiod.getSourceperiodId());
                                 resList.add(sysRes);
                             }
                         }
                     } else {
-
                         updateList.add(sourceperiod);
-                        resList(sourceperiod.getPeriodResIds(), sourceperiod.getSourceperiodId(), resList, resIdsDel, ResConstants.BizType.SOURCE_INFO_PERIOD.getKey(),reqVo.getTid());
+                        resList(sourceperiod.getPeriodResIds(), sourceperiod.getSourceperiodId(), resList, resIdsDel, ResConstants.BizType.SOURCE_INFO_PERIOD.getKey(), reqVo.getTid());
                     }
                 }
             }
@@ -379,15 +381,20 @@ 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());
+            tssSourceperiodMapper.deleteTssSourceperiodBySourceperiodIds(deleteListIds.toArray(new String[deleteListIds.size()]), reqVo.getTid());
         }
 
         //修改溯源相关信息
         List<String> resBusIds = this.updateTssSourceEnvironment(sourceinfoId,reqVo,resList,resIdsDel);
 
+        for (SysRes sysRes : resList) {
+            sysRes.setTid(reqVo.getTid());
+            sysResMapper.updateSysRes(sysRes);
+        }
+
         /*删除图片*/
         if (resIdsDel.size() > 0) {
             String[] array = resIdsDel.toArray(new String[resIdsDel.size()]);
@@ -399,11 +406,6 @@ public class TssSourceinfoServiceImpl implements ITssSourceinfoService {
             sysResMapper.deleteSysResbes(resBusIds.toArray(new String[resBusIds.size()]));
         }
 
-        for (SysRes sysRes : resList) {
-            sysRes.setTid(reqVo.getTid());
-            sysResMapper.updateSysRes(sysRes);
-        }
-
         return AjaxResult.success();
     }
 
@@ -438,8 +440,8 @@ public class TssSourceinfoServiceImpl implements ITssSourceinfoService {
             if(StringUtils.isNotBlank(tssSourceEnvironment.getSourceEnvironmentId())){
                 //根据修改前的业务id查询资源
                 SysRes selectSysRes = new SysRes();
-                selectSysRes.setResBusId(tssSourceEnvironment.getSourceEnvironmentId());
                 selectSysRes.setTid(reqVo.getTid());
+                selectSysRes.setResBusId(tssSourceEnvironment.getSourceEnvironmentId());
                 List<SysRes> selectSysResList = sysResMapper.selectSysResList(selectSysRes);
                 //如果查询不到数据，直接走新增
                 if(selectSysResList.size() > 0) {
@@ -447,7 +449,6 @@ public class TssSourceinfoServiceImpl implements ITssSourceinfoService {
                     if (StringUtils.isNotBlank(tssSourceEnvironment.getEnvironmentResIds())) {
                         for (SysRes map : selectSysResList) {
                             SysRes sysRes = new SysRes();
-                            sysRes.setTid(reqVo.getTid());
                             sysRes.setResId(map.getResId());
                             sysRes.setResBusId(sourceEnvironmentId);
                             resList.add(sysRes);
@@ -464,7 +465,6 @@ public class TssSourceinfoServiceImpl implements ITssSourceinfoService {
                         String[] resIds = tssSourceEnvironment.getEnvironmentResIds().split(",");
                         for (String resId : resIds) {
                             SysRes sysRes = new SysRes();
-                            sysRes.setTid(reqVo.getTid());
                             sysRes.setResId(resId);
                             sysRes.setResBusId(sourceEnvironmentId);
                             resList.add(sysRes);
@@ -478,7 +478,6 @@ public class TssSourceinfoServiceImpl implements ITssSourceinfoService {
                     for (String resId : resIds) {
                         SysRes sysRes = new SysRes();
                         sysRes.setResId(resId);
-                        sysRes.setTid(reqVo.getTid());
                         sysRes.setResBusId(sourceEnvironmentId);
                         resList.add(sysRes);
                     }
@@ -528,7 +527,6 @@ public class TssSourceinfoServiceImpl implements ITssSourceinfoService {
         if (!StringUtils.isEmpty(resBiztype)) {
             sysRes.setResBiztype(resBiztype);
         }
-        sysRes.setTid(tid);
         List<SysRes> sysResList2 = sysResMapper.selectSysResList(sysRes);
         List<String> resIdsOld = new ArrayList<>();
         for (SysRes res : sysResList2) {
@@ -553,7 +551,6 @@ public class TssSourceinfoServiceImpl implements ITssSourceinfoService {
         //新增的记录标识与业务标识
         for (String s : resIdsNew2) {
             SysRes sysRes2 = new SysRes();
-            sysRes2.setTid(tid);
             sysRes2.setResId(s);
             sysRes2.setResBusId(resBusId);
             resList.add(sysRes2);

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

@@ -24,6 +24,7 @@ import com.yunfeiyun.agmp.tss.service.ITssTracecodeapplyService;
 import com.yunfeiyun.agmp.tss.service.IWmsGoodsService;
 import com.yunfeiyun.agmp.tss.service.IWmsSupplierService;
 
+import com.yunfeiyun.agmp.tss.util.TssTraceCodeTplQRCodeUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -178,7 +179,7 @@ public class TssTracecodeapplyServiceImpl implements ITssTracecodeapplyService {
         Map<String,TssTracecodetplparam> paramMap = tssTracecodetplparams.stream().collect(Collectors.toMap(TssTracecodetplparam::getTplparamBustype,item->item));
         for(TssTraceCodeApplyResVo tssTraceCodeApplyResVo : resVoList){
 //            tssTraceCodeApplyResVo.setQRCodeUrl(paramMap.get(BusType.TRACING_QR_CODE.name()).getTplparamData() + "?tarcecodeapplyno="+paramMap.get(BusType.TRACING_NO.name()).getTplparamData() );
-            tssTraceCodeApplyResVo.setQRCodeUrl(paramMap.get(BusType.TRACING_QR_CODE.name()).getTplparamData() + "?no=" + tssTraceCodeApplyResVo.getTarcecodeapplyno()+"&id="+tssTracecodeapply.getTid());
+            tssTraceCodeApplyResVo.setQRCodeUrl(TssTraceCodeTplQRCodeUtil.getQrCodeUrl(paramMap.get(BusType.TRACING_QR_CODE.name())) + "?no=" + tssTraceCodeApplyResVo.getTarcecodeapplyno()+"&id="+tssTracecodeapply.getTid());
         }
         return resVoList;
     }

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

@@ -20,6 +20,7 @@ import com.yunfeiyun.agmp.tss.domain.resvo.TssTracecodeapplyExportResVo;
 import com.yunfeiyun.agmp.tss.domain.resvo.WmsFinishgoodsSourceInfo;
 import com.yunfeiyun.agmp.tss.mapper.*;
 import com.yunfeiyun.agmp.tss.service.ITssTracecodetplService;
+import com.yunfeiyun.agmp.tss.util.TssTraceCodeTplQRCodeUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.compress.archivers.zip.ParallelScatterZipCreator;
 import org.apache.commons.compress.archivers.zip.UnixStat;
@@ -264,7 +265,7 @@ public class TssTracecodetplServiceImpl implements ITssTracecodetplService {
         queryParam.setTid(tid);
         List<TssTracecodetplparam> params = tssTracecodetplparamMapper.selectTssTracecodetplparamList(queryParam);
         LinkedHashMap<String, TssTracecodetplparam> paramsMap = params.stream().collect(Collectors.toMap(TssTracecodetplparam::getTplparamBustype, ObjectUtil::clone, (a, b) -> b, LinkedHashMap::new));
-        String url = paramsMap.get(BusType.TRACING_QR_CODE.name()).getTplparamData() + "?id="+tid+"&no=";
+        String url = TssTraceCodeTplQRCodeUtil.getQrCodeUrl(paramsMap.get(BusType.TRACING_QR_CODE.name())) + "?id="+tid+"&no=";
         LinkedList<TssTracecodeapplyExportResVo> data = new LinkedList<>();
         for (TssTracecodeapply tssTracecodeapply : tssTracecodeapplies) {
             TssTracecodeapplyExportResVo tssTracecodeapplyExportResVo = new TssTracecodeapplyExportResVo();
@@ -340,7 +341,7 @@ public class TssTracecodetplServiceImpl implements ITssTracecodetplService {
         if (null != paramsMap.get(BusType.TRACING_QR_CODE.name())) {
             TssTracecodetplparam tracingQRCodeParam = new TssTracecodetplparam();
             BeanUtils.copyProperties(paramsMap.get(BusType.TRACING_QR_CODE.name()), tracingQRCodeParam);
-            tracingQRCodeParam.setTplparamData(tracingQRCodeParam.getTplparamData() + "?no=" + tssTracecodeapply.getTarcecodeapplyno()+"&id="+tssTracecodeapply.getTid());
+            tracingQRCodeParam.setTplparamData(TssTraceCodeTplQRCodeUtil.getQrCodeUrl(tracingQRCodeParam) + "?no=" + tssTracecodeapply.getTarcecodeapplyno()+"&id="+tssTracecodeapply.getTid());
             paramsMap.put(BusType.TRACING_QR_CODE.name(), tracingQRCodeParam);
         }
         if (null != paramsMap.get(BusType.TRACING_BARCODE.name())) {

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

@@ -12,6 +12,7 @@ import com.yunfeiyun.agmp.common.web.system.mapper.SysResMapper;
 import com.yunfeiyun.agmp.common.web.system.service.ISysResService;
 import com.yunfeiyun.agmp.tss.domain.WmsSupplier;
 import com.yunfeiyun.agmp.tss.domain.reqvo.WmsSupplierAddReqVo;
+import com.yunfeiyun.agmp.tss.domain.resvo.WmsSupplierListResVo;
 import com.yunfeiyun.agmp.tss.mapper.WmsSupplierMapper;
 import com.yunfeiyun.agmp.tss.service.IWmsSupplierService;
 import org.slf4j.Logger;
@@ -152,4 +153,9 @@ public class WmsSupplierServiceImpl implements IWmsSupplierService {
             return AjaxResult.error(ErrorCode.UPLOAD_FAIL.getCode());
         }
     }
+
+    @Override
+    public List<WmsSupplierListResVo> selectWmsSupplierListResVoList(WmsSupplier wmsSupplier) {
+        return wmsSupplierMapper.selectWmsSupplierListResVoList(wmsSupplier);
+    }
 }

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

@@ -0,0 +1,12 @@
+package com.yunfeiyun.agmp.tss.util;
+
+import cn.hutool.extra.spring.SpringUtil;
+import com.yunfeiyun.agmp.tss.domain.TssTracecodetplparam;
+
+public class TssTraceCodeTplQRCodeUtil {
+
+    public static String getQrCodeUrl(TssTracecodetplparam tssTracecodetplparam){
+        // 目前全局固定
+        return SpringUtil.getProperty("BASE_URL")+"/tss/h5/#/";
+    }
+}

src/main/resources/application-dev.yml

@@ -11,7 +11,7 @@ application:
   # 文件路径 示例（ Windows配置D:/yunfei/farmwork/uploadPath，Linux配置 /home/yunfei/farmwork/uploadPath）
   profile: /data/AGMP/tss
   # 获取ip地址开关
-  addressEnabled: false
+  addressEnabled: true
   # 验证码类型 math 数组计算 char 字符验证
   captchaType: math
   # 顶级菜单的父Id
@@ -282,3 +282,4 @@ map:
   gaode:
     api: http://restapi.amap.com
     key: 78ce288400f4fc6d9458989875c833c2
+BASE_URL: http://192.168.1.228:7000

src/main/resources/application-test.yml

@@ -11,7 +11,7 @@ application:
   # 文件路径 示例（ Windows配置D:/yunfei/farmwork/uploadPath，Linux配置 /home/yunfei/farmwork/uploadPath）
   profile: /data/AGMP/tss
   # 获取ip地址开关
-  addressEnabled: false
+  addressEnabled: true
   # 验证码类型 math 数组计算 char 字符验证
   captchaType: math
   # 顶级菜单的父Id
@@ -268,3 +268,4 @@ map:
   gaode:
     api: http://restapi.amap.com
     key: 78ce288400f4fc6d9458989875c833c2
+BASE_URL: http://192.168.1.231:7000

src/main/resources/mapper/AgmTaskpickMapper.xml

@@ -73,7 +73,7 @@
             <if test="goodsName != null and goodsName != ''">and (g.goodsName like concat('%', #{goodsName}, '%')
                 or fg.finishgoodNo like concat('%', #{goodsName}, '%')
                 or fg.finishgoodscode in
-                ( select dictCode from SysDict where dictName like #{goodsName} and dicttypeCode = 'agm_mpp_product' )
+                ( select dictCode from SysDict where dictName like #{goodsName} and dicttypeCode = 'agm_mpp_product' and tid = #{tid} )
                 )
             </if>
             <if test="finishgoodNo != null and finishgoodNo != ''">and fg.finishgoodNo = #{finishgoodNo}</if>

src/main/resources/mapper/FmsLandMapper.xml

@@ -13,6 +13,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="landManager"    column="landManager"    />
         <result property="landTel"    column="landTel"    />
         <result property="landLocation"    column="landLocation"    />
+        <result property="landLatitude" column="landLatitude"/>
+        <result property="landLongitude" column="landLongitude"/>
         <result property="landPreview"    column="landPreview"    />
         <result property="landRemark"    column="landRemark"    />
         <result property="resIds"    column="resIds"    />

src/main/resources/mapper/SpmOrderMapper.xml

@@ -173,6 +173,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </foreach>
             </if>
         </where>
+        order by so.orderStatus asc , so.orderNo desc
     </select>
 
     <select id="selectSpmOrderLogisticsInfoReqVo" parameterType="com.yunfeiyun.agmp.tss.domain.reqvo.SpmOrderLogisticsInfoReqVo" resultType="com.yunfeiyun.agmp.tss.domain.resvo.SpmOrderLogisticsInfoResVo">
@@ -191,7 +192,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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 dictValue = sfg.finishgoodscode
         LEFT JOIN SysCustomer sc ON sc.customerId = so.customerId
         <where>
             so.tid = #{tid}
@@ -208,7 +209,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </foreach>
             </if>
         </where>
+        group by so.orderId
         order by orderSenddate DESC
+
     </select>
 
     <select id="selectSpmOrderLogisticsSumInfo" parameterType="com.yunfeiyun.agmp.tss.domain.reqvo.SpmOrderLogisticsInfoReqVo" resultType="com.yunfeiyun.agmp.tss.domain.resvo.SpmOrderLogisticsSumInfoResVo">
@@ -217,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>
@@ -643,4 +643,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and so.tid = #{tid}
     </select>
 
+    <select id="selectSpmOrderNoSendAmount"  resultType="com.yunfeiyun.agmp.tss.domain.resvo.SpmOrderNoSendAmountResVo">
+        select sum(orderGoodscount) orderGoodscount,stockId from SpmOrder where stockId in
+        <foreach collection="list" open="(" separator="," close=")" item="item">
+            #{item}
+        </foreach>
+        and orderStatus = '0'
+        GROUP BY stockId
+    </select>
+
 </mapper>

src/main/resources/mapper/TssScanrcdMapper.xml

@@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN WmsFinishgoods wfg on wfg.goodsId = ws.goodsId
         LEFT JOIn SpmOrder so on so.orderId = ts.orderId
         LEFT JOIN TssTracecodeapply tca on tca.tarcecodeapplyId = ts.tarcecodeapplyId
-        LEFT JOIN (select * from SysDict where dicttypeCode = 'agm_mpp_product') d on d.dictValue = wfg.finishgoodscode
+        LEFT JOIN (select * from SysDict where dicttypeCode = 'agm_mpp_product' and tid = #{tid}) d on d.dictValue = wfg.finishgoodscode
         <where>
             ts.tid = #{tid}
             <if test="orderId != null  and orderId != ''"> and ts.orderId = #{orderId}</if>
@@ -60,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tarcecodeapplyno != null and tarcecodeapplyno !=''">and tca.tarcecodeapplyno = #{tarcecodeapplyno}</if>
             <if test="isReadNoOrderScanLog == false">and ts.orderId > '0'</if>
         </where>
+        group by ts.scanrcdId
     </select>
 
     <select id="selectCountOfTssScanrcd" parameterType="SelectCountOfScreenReqVo" resultType="Integer">

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 = #{period.tid},</if>
             </trim>
             where sourceperiodId = #{period.sourceperiodId} and tid = #{tid}
         </foreach>

src/main/resources/mapper/WmsFinishgoodsMapper.xml

@@ -187,6 +187,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ws.stockId = #{stockId}
         and ws.tid = #{tid}
 
+        limit 1
+
     </select>
     <select id="selectCount" parameterType="String" resultType="int">
         select count(1) from WmsFinishgoods where sourceinfoId = #{sourceinfoId} and tid = #{tid}

src/main/resources/mapper/WmsSupplierMapper.xml

@@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="supplierCreator"    column="supplierCreator"    />
         <result property="supplierCreateddate"    column="supplierCreateddate"    />
         <result property="supplierType" column="supplierType"/>
-        <result property="cusareaId" column="cusareaId"></result>
+        <result property="cusareaId" column="cusareaId"/>
         <result property="tid" column="tid"/>
     </resultMap>
 
@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="supplierRemark != null  and supplierRemark != ''"> and supplierRemark = #{supplierRemark}</if>
             <if test="supplierCreator != null  and supplierCreator != ''"> and supplierCreator = #{supplierCreator}</if>
             <if test="supplierCreateddate != null  and supplierCreateddate != ''"> and supplierCreateddate = #{supplierCreateddate}</if>
-            <if test="supplierType != null  and supplierType != ''"> and supplierType = #{supplierType}</if>
+            <if test="supplierType != null  and supplierType != ''"> and a.supplierType = #{supplierType}</if>
             <if test="cusareaId != null and cusareaId != ''">and cusareaId = #{cusareaId}</if>
         </where>
     </select>
@@ -102,4 +102,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
         and tid = #{tid}
     </delete>
+
+    <select id="selectWmsSupplierListResVoList"
+            resultType="com.yunfeiyun.agmp.tss.domain.resvo.WmsSupplierListResVo">
+        select supplierId, supplierName, supplierLinkman, supplierLinktel, supplierLinkaddress, supplierRemark, supplierCreator, supplierCreateddate,supplierType, b.resUrl as supplierPreview, b.resId as supplierQualificationResId, cusareaId from WmsSupplier a
+        LEFT JOIN SysRes b on b.resBusId = a.supplierId
+        <where>
+            a.tid = #{tid}
+            <if test="supplierName != null  and supplierName != ''"> and supplierName like concat('%', #{supplierName}, '%')</if>
+            <if test="supplierLinkman != null  and supplierLinkman != ''"> and supplierLinkman = #{supplierLinkman}</if>
+            <if test="supplierLinktel != null  and supplierLinktel != ''"> and supplierLinktel = #{supplierLinktel}</if>
+            <if test="supplierLinkaddress != null  and supplierLinkaddress != ''"> and supplierLinkaddress = #{supplierLinkaddress}</if>
+            <if test="supplierRemark != null  and supplierRemark != ''"> and supplierRemark = #{supplierRemark}</if>
+            <if test="supplierCreator != null  and supplierCreator != ''"> and supplierCreator = #{supplierCreator}</if>
+            <if test="supplierCreateddate != null  and supplierCreateddate != ''"> and supplierCreateddate = #{supplierCreateddate}</if>
+            <if test="supplierType != null  and supplierType != ''"> and a.supplierType = #{supplierType}</if>
+            <if test="cusareaId != null and cusareaId != ''">and cusareaId = #{cusareaId}</if>
+            <if test="supplierTypes != null and supplierTypes != ''">
+                and supplierType in
+                <foreach collection="supplierTypes" open="(" separator="," close=")" item="item">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
 </mapper>