修复溯源bug

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

@@ -123,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/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/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;
     }

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) {
@@ -297,7 +302,7 @@ public class TssSourceinfoServiceImpl implements ITssSourceinfoService {
         List<TssSourceperiod> addList = new ArrayList<>();
         List<TssSourceperiod> updateList = new ArrayList<>();
         for (TssSourceperiod tssSourceperiod : tssSourceperiods) {
-            tssSourceperiod.setTid(reqVo.getTid());
+
             if (StringUtils.isEmpty(tssSourceperiod.getSourceperiodId())) {
                 tssSourceperiod.setTid(reqVo.getTid());
                 tssSourceperiod.setSourceperiodId(tssSourceperiod.getId());
@@ -307,7 +312,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 +329,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 +340,12 @@ 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.setTid(reqVo.getTid());
                         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());
                     }
                 }
             }
@@ -382,12 +384,17 @@ public class TssSourceinfoServiceImpl implements ITssSourceinfoService {
             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/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

@@ -192,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}

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>

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 = #{tperiod.id},</if>
+                <if test="period.tid != null">tid = #{period.tid},</if>
             </trim>
             where sourceperiodId = #{period.sourceperiodId} and tid = #{tid}
         </foreach>