修复溯源码以及订单相关接口bug

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

@@ -9,12 +9,14 @@ import com.yunfeiyun.agmp.common.enums.SpmOrderStatus;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.common.utils.poi.ExcelUtil;
 import com.yunfeiyun.agmp.tss.domain.SpmOrder;
+import com.yunfeiyun.agmp.tss.domain.reqvo.SelectCountOfScreenReqVo;
 import com.yunfeiyun.agmp.tss.domain.reqvo.SpmOrderListReqVo;
 import com.yunfeiyun.agmp.tss.domain.reqvo.SpmOrderLogisticsInfoReqVo;
 import com.yunfeiyun.agmp.tss.domain.reqvo.SpmOrderMatchTraceCodeReqVo;
 import com.yunfeiyun.agmp.tss.domain.resvo.SpmOrderLogisticsInfoResVo;
 import com.yunfeiyun.agmp.tss.domain.resvo.SpmOrderLogisticsSumInfoResVo;
 import com.yunfeiyun.agmp.tss.domain.resvo.SpmOrderResVo;
+import com.yunfeiyun.agmp.tss.domain.resvo.SpmOrderStatResVo;
 import com.yunfeiyun.agmp.tss.service.ISpmOrderService;
 import com.yunfeiyun.agmp.tss.util.DataAuthUtil;
 import com.yunfeiyun.agmp.tss.util.ExportUtil;
@@ -227,8 +229,13 @@ public class SpmOrderController extends BaseController {
             return error();
         }
     }
-
-
+    @PreAuthorize("@ss.hasPermi('fms:screen:spm:order:city:stat')")
+    @GetMapping("/city/stat")
+    public TableDataInfo spmOrderCityStat(SelectCountOfScreenReqVo reqVo) {
+        startPage();
+        List<SpmOrderStatResVo> spmOrderStatResVos = spmOrderService.selectCountGroupByCity(reqVo);
+        return getDataTable(spmOrderStatResVos);
+    }
 
 
 }

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

@@ -1,5 +1,7 @@
 package com.yunfeiyun.agmp.tss.controller;
 
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.yunfeiyun.agmp.common.annotation.Log;
 import com.yunfeiyun.agmp.common.core.controller.BaseController;
 import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
@@ -8,9 +10,11 @@ import com.yunfeiyun.agmp.common.enums.BusinessType;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.common.utils.poi.ExcelUtil;
 import com.yunfeiyun.agmp.tss.domain.TssScanrcd;
+import com.yunfeiyun.agmp.tss.domain.reqvo.SelectCountOfScreenReqVo;
 import com.yunfeiyun.agmp.tss.domain.reqvo.TssScanrcdReqVo;
 import com.yunfeiyun.agmp.tss.domain.resvo.TssScanrcdExportResVo;
 import com.yunfeiyun.agmp.tss.domain.resvo.TssScanrcdResVo;
+import com.yunfeiyun.agmp.tss.domain.resvo.TssScanrcdStatResVo;
 import com.yunfeiyun.agmp.tss.service.ITssScanrcdService;
 import com.yunfeiyun.agmp.tss.util.ExportUtil;
 import org.springframework.beans.BeanUtils;
@@ -109,4 +113,27 @@ public class TssScanrcdController extends BaseController {
     public AjaxResult remove(@PathVariable String[] scanrcdIds) {
         return toAjax(tssScanrcdService.deleteTssScanrcdByScanrcdIds(scanrcdIds,SecurityUtils.getTid()));
     }
+
+    /**
+     * 溯源大屏省市扫码数统计查询
+     */
+    @PreAuthorize("@ss.hasPermi('fms:screen:scanrcd:province:city:stat')")
+    @GetMapping("/province/city/stat")
+    public AjaxResult scanrcdProvinceCityStat(SelectCountOfScreenReqVo reqVo) {
+        List<TssScanrcdStatResVo> tssScanrcdStatResVos = tssScanrcdService.selectCountByProvince(reqVo);
+        List<TssScanrcdStatResVo> tssScanrcdStatResVos1 = tssScanrcdService.selectCountByCity(reqVo);
+        JSONArray jsonArray = new JSONArray();
+        for (TssScanrcdStatResVo tssScanrcdStatResVo : tssScanrcdStatResVos) {
+            JSONObject jsonObject = JSONObject.from(tssScanrcdStatResVo);
+            JSONArray array = new JSONArray();
+            for (TssScanrcdStatResVo scanrcdStatResVo : tssScanrcdStatResVos1) {
+                if (tssScanrcdStatResVo.getScanrcdProvince().equals(scanrcdStatResVo.getScanrcdProvince())) {
+                    array.add(scanrcdStatResVo);
+                }
+            }
+            jsonObject.put("citys", array);
+            jsonArray.add(jsonObject);
+        }
+        return AjaxResult.success(jsonArray);
+    }
 }

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

@@ -289,6 +289,7 @@ public class MppTaskServiceImpl implements IMppTaskService {
 
     public WmsChange generateWmsChange(WmsStock wmsStock, WmsChangeapply wmsChangeapply, String changeWay, BigDecimal changeNum, BigDecimal changeOldnum, String tid) {
         WmsChange wmsChange = new WmsChange();
+        wmsChange.setTid(tid);
         wmsChange.setChangeapplyId(wmsChangeapply.getChangeapplyId());
         wmsChange.setChangeId(wmsChange.getId());
         wmsChange.setStockId(wmsStock.getStockId());

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

@@ -221,20 +221,6 @@ public class SpmOrderServiceImpl implements ISpmOrderService {
         if(!SpmOrderStatus.NO_SEND.getCode().equals(order.getOrderStatus())){
             throw new BizException(ErrorCode.SPM_ORDER_SALE_SEND_STATUS_ERROR);
         }
-        /* 出库预警删除 TssTracecodeapply tssTracecodeapply = new TssTracecodeapply();
-        tssTracecodeapply.setOrderId(order.getOrderId());
-        List<TssTracecodeapply> tssTracecodeapplies = tssTracecodeapplyMapper.selectTssTracecodeapplyList(tssTracecodeapply);
-        if(tssTracecodeapplies.isEmpty()){
-            WmsFinishgoodsStockResVo wmsFinishgoodsStockResVo = wmsFinishgoodsMapper.selectWmsFinishgoodsStockResVoByStockId(order.getStockId());
-            String warnRemark = "订单编号:" +
-                    order.getOrderNo() +
-                    "中的产品 " +
-                    wmsFinishgoodsStockResVo.getFinishgoodNo() +
-                    " " +
-                    wmsFinishgoodsStockResVo.getGoodsName() +
-                    " 未经赋码进行了销售，此销售产品将不能进行溯源";
-            tssWarnService.genWarn("", warnRemark, TssWarnEnum.TssWarnType.UNASSIGNED_CODE, TssWarnEnum.TssWarnClass.SALES_PROCESS);
-        }*/
         // 检测库存是否足够
         WmsStock wmsStock = wmsStockMapper.selectWmsStockByStockId(order.getStockId(),order.getTid());
         if(wmsStock.getStockAmount().compareTo(new BigDecimal(order.getOrderGoodscount())) < 0){
@@ -297,6 +283,7 @@ public class SpmOrderServiceImpl implements ISpmOrderService {
         wmsChangeapply.setChangeapplyAuditdate(wmsChangeapply.getChangeapplyApplydate());
         wmsChangeapply.setChangeapplyAuditor(wmsChangeapply.getChangeapplyApplyer());
         wmsChangeapply.setChangeapplyRemark(spmOrder.getOrderRemark());
+        wmsChangeapply.setTid(spmOrder.getTid());
         wmsChangeapply.setChangeapplyInoutdate(spmOrder.getOrderCreateddate());
         return wmsChangeapply;
     }
@@ -315,6 +302,7 @@ public class SpmOrderServiceImpl implements ISpmOrderService {
         wmsChangeapplyitem.setChangeapplyId(wmsChangeapply.getChangeapplyId());
         wmsChangeapplyitem.setWarehouseId(wmsStock.getWarehouseId());
         wmsChangeapplyitem.setGoodsId(wmsFinishgoodsStockResVo.getGoodsId());
+        wmsChangeapplyitem.setTid(spmOrder.getTid());
         wmsChangeapplyitem.setChangeapplyitemName(wmsFinishgoodsStockResVo.getGoodsName());
         wmsChangeapplyitem.setChangeapplyitemType(wmsFinishgoodsStockResVo.getFinishgoodsType());
         wmsChangeapplyitem.setChangeapplyitemUnit(wmsFinishgoodsStockResVo.getGoodsUnit());
@@ -347,6 +335,7 @@ public class SpmOrderServiceImpl implements ISpmOrderService {
         wmsChange.setChangeAuditor(SecurityUtils.getUserId());
         wmsChange.setChangeAuditeddate(DateUtils.dateTimeNow());
         wmsChange.setChangeRemark(spmOrder.getOrderRemark());
+        wmsChange.setTid(spmOrder.getTid());
         return wmsChange;
     }
 

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

@@ -88,12 +88,12 @@ public class TssTracecodetplServiceImpl implements ITssTracecodetplService {
      */
     @Override
     public TssTracecodetpl selectTssTracecodetplByTracecodetplId(String tracecodetplId, String tid) {
-        return tssTracecodetplMapper.selectTssTracecodetplByTracecodetplId(tracecodetplId,tid);
+        return tssTracecodetplMapper.selectTssTracecodetplByTracecodetplId(tracecodetplId, tid);
     }
 
     @Override
-    public List<TssTracecodetpl> selectTssTracecodetplByTracecodetplIds(List<String> tracecodetplId,String tid) {
-        return tssTracecodetplMapper.selectTssTracecodetplByTracecodetplIds(tracecodetplId,tid);
+    public List<TssTracecodetpl> selectTssTracecodetplByTracecodetplIds(List<String> tracecodetplId, String tid) {
+        return tssTracecodetplMapper.selectTssTracecodetplByTracecodetplIds(tracecodetplId, tid);
     }
 
     /**
@@ -137,7 +137,7 @@ public class TssTracecodetplServiceImpl implements ITssTracecodetplService {
      */
     @Override
     public int deleteTssTracecodetplByTracecodetplIds(String[] tracecodetplIds, String tid) {
-        return tssTracecodetplMapper.deleteTssTracecodetplByTracecodetplIds(tracecodetplIds,tid);
+        return tssTracecodetplMapper.deleteTssTracecodetplByTracecodetplIds(tracecodetplIds, tid);
     }
 
     /**
@@ -148,7 +148,7 @@ public class TssTracecodetplServiceImpl implements ITssTracecodetplService {
      */
     @Override
     public int deleteTssTracecodetplByTracecodetplId(String tracecodetplId, String tid) {
-        return tssTracecodetplMapper.deleteTssTracecodetplByTracecodetplId(tracecodetplId,tid);
+        return tssTracecodetplMapper.deleteTssTracecodetplByTracecodetplId(tracecodetplId, tid);
     }
 
     @Override
@@ -189,13 +189,13 @@ public class TssTracecodetplServiceImpl implements ITssTracecodetplService {
         tssTracecodetplMapper.updateTssTracecodetpl(tssTracecodetpl);
         if (StringUtils.isNotEmpty(tssTracecodetplEditReqVo.getBackground())) {
             // 更新背景图
-            tssTracecodetplparamMapper.updateTssTracecodetplparamBusInfo(BusType.BACKGROUND.toString(), tssTracecodetpl.getTracecodetplId(), tssTracecodetplEditReqVo.getBackground(),tssTracecodetplEditReqVo.getTid());
+            tssTracecodetplparamMapper.updateTssTracecodetplparamBusInfo(BusType.BACKGROUND.toString(), tssTracecodetpl.getTracecodetplId(), tssTracecodetplEditReqVo.getBackground(), tssTracecodetplEditReqVo.getTid());
         }
         if (StringUtils.isNotEmpty(tssTracecodetplEditReqVo.getLogo())) {
             // 更新Logo
-            tssTracecodetplparamMapper.updateTssTracecodetplparamBusInfo(BusType.LOGO.toString(), tssTracecodetpl.getTracecodetplId(), tssTracecodetplEditReqVo.getLogo(),tssTracecodetplEditReqVo.getTid());
+            tssTracecodetplparamMapper.updateTssTracecodetplparamBusInfo(BusType.LOGO.toString(), tssTracecodetpl.getTracecodetplId(), tssTracecodetplEditReqVo.getLogo(), tssTracecodetplEditReqVo.getTid());
         }
-        if(null != tssTracecodetplEditReqVo.getTssTracecodetplparam()){
+        if (null != tssTracecodetplEditReqVo.getTssTracecodetplparam()) {
             // 更新二维码
             tssTracecodetplparamMapper.updateTssTracecodetplparam(tssTracecodetplEditReqVo.getTssTracecodetplparam());
         }
@@ -210,7 +210,7 @@ public class TssTracecodetplServiceImpl implements ITssTracecodetplService {
         String userId = SecurityUtils.getUserId();
         while (list.size() < tssTraceCodeGenerateReqVo.getNum()) {
             TssTracecodeapply tssTracecodeapply = new TssTracecodeapply();
-            tssTracecodeapply.setTid(tssTracecodeapply.getTid());
+            tssTracecodeapply.setTid(tssTraceCodeGenerateReqVo.getTid());
             tssTracecodeapply.setTarcecodeapplyId(tssTracecodeapply.getId());
             tssTracecodeapply.setTarcecodeapplyBatchno(batchNo);
             tssTracecodeapply.setTarcecodeapplyno(noGenerator.getSourceNo(SecurityUtils.getTid()));
@@ -232,18 +232,18 @@ public class TssTracecodetplServiceImpl implements ITssTracecodetplService {
         tssTracecodeapplyQuery.setTarcecodeapplyBatchno(tarcecodeapplyBatchno);
         tssTracecodeapplyQuery.setTid(tid);
         List<TssTracecodeapply> tssTracecodeapplies = tssTracecodeapplyMapper.selectTssTracecodeapplyList(tssTracecodeapplyQuery);
-        return drawGraphAndDowmLand(tssTracecodeapplies,tid);
+        return drawGraphAndDowmLand(tssTracecodeapplies, tid);
     }
 
 
     @Override
     public ResponseEntity<InputStreamResource> downLand(String[] tarcecodeapplynos, String tid) throws Exception {
         // 查询溯源码申请单-》通过指定生成单号
-        List<TssTracecodeapply> tssTracecodeapplies = tssTracecodeapplyMapper.selectTssTracecodeapplyListByTarcecodeapplynos(tarcecodeapplynos,tid);
+        List<TssTracecodeapply> tssTracecodeapplies = tssTracecodeapplyMapper.selectTssTracecodeapplyListByTarcecodeapplynos(tarcecodeapplynos, tid);
         if (tssTracecodeapplies.isEmpty()) {
             throw new BizException(ErrorCode.TSS_TRACE_APPLY_NOT_EXIST);
         }
-        return drawGraphAndDowmLand(tssTracecodeapplies,tid);
+        return drawGraphAndDowmLand(tssTracecodeapplies, tid);
     }
 
     @Override
@@ -257,7 +257,7 @@ public class TssTracecodetplServiceImpl implements ITssTracecodetplService {
             throw new BizException(ErrorCode.TSS_TRACE_APPLY_NOT_EXIST);
         }
         // 查询溯源码模板-》每一批的溯源码模板相同，通过申请单中的模板标识
-        TssTracecodetpl tssTracecodetpl = tssTracecodetplMapper.selectTssTracecodetplByTracecodetplId(tssTracecodeapplies.get(0).getTracecodetplId(),tid);
+        TssTracecodetpl tssTracecodetpl = tssTracecodetplMapper.selectTssTracecodetplByTracecodetplId(tssTracecodeapplies.get(0).getTracecodetplId(), tid);
         // 查询溯源码模板参数
         TssTracecodetplparam queryParam = new TssTracecodetplparam();
         queryParam.setTracecodetplId(tssTracecodetpl.getTracecodetplId());
@@ -278,16 +278,16 @@ public class TssTracecodetplServiceImpl implements ITssTracecodetplService {
     }
 
 
-    public ResponseEntity<InputStreamResource> drawGraphAndDowmLand(List<TssTracecodeapply> tssTracecodeapplies,String tid) throws Exception {
+    public ResponseEntity<InputStreamResource> drawGraphAndDowmLand(List<TssTracecodeapply> tssTracecodeapplies, String tid) throws Exception {
         // 查询溯源码模板-》每一批的溯源码模板相同，通过申请单中的模板标识
-        TssTracecodetpl tssTracecodetpl = tssTracecodetplMapper.selectTssTracecodetplByTracecodetplId(tssTracecodeapplies.get(0).getTracecodetplId(),tid);
+        TssTracecodetpl tssTracecodetpl = tssTracecodetplMapper.selectTssTracecodetplByTracecodetplId(tssTracecodeapplies.get(0).getTracecodetplId(), tid);
         // 查询溯源码模板参数
         TssTracecodetplparam queryParam = new TssTracecodetplparam();
         queryParam.setTracecodetplId(tssTracecodetpl.getTracecodetplId());
         queryParam.setTid(tid);
         List<TssTracecodetplparam> params = tssTracecodetplparamMapper.selectTssTracecodetplparamList(queryParam);
         // 此处封装统一参数
-        LinkedHashMap<String, TssTracecodetplparam> commonParamsMap = packageParamMap(params, tssTracecodeapplies,tid);
+        LinkedHashMap<String, TssTracecodetplparam> commonParamsMap = packageParamMap(params, tssTracecodeapplies, tid);
         // 转为map,方便替换参数，提升效率
         // 准备要绘制的多个图片数据
         List<CompletableFuture<byte[]>> completableFutureList = new LinkedList<>();
@@ -333,21 +333,21 @@ public class TssTracecodetplServiceImpl implements ITssTracecodetplService {
         // 由于采用了多线程生成，所以要对模版map中的value值进行克隆，避免出现脏读的问题
         if (null != paramsMap.get(BusType.TRACING_NO.name())) {
             TssTracecodetplparam tracingNoParam = new TssTracecodetplparam();
-            BeanUtils.copyProperties(paramsMap.get(BusType.TRACING_NO.name()),tracingNoParam);
+            BeanUtils.copyProperties(paramsMap.get(BusType.TRACING_NO.name()), tracingNoParam);
             tracingNoParam.setTplparamData(tssTracecodeapply.getTarcecodeapplyno());
-            paramsMap.put(BusType.TRACING_NO.name(),tracingNoParam);
+            paramsMap.put(BusType.TRACING_NO.name(), tracingNoParam);
         }
         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()+"?tarcecodeapplyno="+ tssTracecodeapply.getTarcecodeapplyno());
-            paramsMap.put(BusType.TRACING_QR_CODE.name(),tracingQRCodeParam);
+            BeanUtils.copyProperties(paramsMap.get(BusType.TRACING_QR_CODE.name()), tracingQRCodeParam);
+            tracingQRCodeParam.setTplparamData(tracingQRCodeParam.getTplparamData() + "?tarcecodeapplyno=" + tssTracecodeapply.getTarcecodeapplyno());
+            paramsMap.put(BusType.TRACING_QR_CODE.name(), tracingQRCodeParam);
         }
         if (null != paramsMap.get(BusType.TRACING_BARCODE.name())) {
             TssTracecodetplparam tracingQRCodeParam = new TssTracecodetplparam();
-            BeanUtils.copyProperties(paramsMap.get(BusType.TRACING_BARCODE.name()),tracingQRCodeParam);
+            BeanUtils.copyProperties(paramsMap.get(BusType.TRACING_BARCODE.name()), tracingQRCodeParam);
             tracingQRCodeParam.setTplparamData(tssTracecodeapply.getTarcecodeapplyno());
-            paramsMap.put(BusType.TRACING_BARCODE.name(),tracingQRCodeParam);
+            paramsMap.put(BusType.TRACING_BARCODE.name(), tracingQRCodeParam);
         }
         // 转化为画板参数
         List<GraphicsCanvasItem> graphicsCanvasItemList = paramsMap.values().stream().map(TssTracecodetplparam::transToGraphicsCanvasItem).collect(Collectors.toList());
@@ -356,14 +356,13 @@ public class TssTracecodetplServiceImpl implements ITssTracecodetplService {
         return baos.toByteArray();
     }
 
-    private LinkedHashMap<String, TssTracecodetplparam> packageParamMap(List<TssTracecodetplparam> params, List<TssTracecodeapply> tssTracecodeapplies,String tid) throws Exception {
-        WmsFinishgoodsSourceInfo wmsFinishgoodsSourceInfo = wmsFinishgoodsMapper.selectWmsFinishgoodsSourceInfo(tssTracecodeapplies.get(0).getStockId(),tid);
+    private LinkedHashMap<String, TssTracecodetplparam> packageParamMap(List<TssTracecodetplparam> params, List<TssTracecodeapply> tssTracecodeapplies, String tid) throws Exception {
+        WmsFinishgoodsSourceInfo wmsFinishgoodsSourceInfo = wmsFinishgoodsMapper.selectWmsFinishgoodsSourceInfo(tssTracecodeapplies.get(0).getStockId(), tid);
         //查询供货商信息
-        WmsSupplier supplier = wmsSupplierMapper.selectWmsSupplierBySupplierId(wmsFinishgoodsSourceInfo.getSupplierId(),tid);
+        WmsSupplier supplier = wmsSupplierMapper.selectWmsSupplierBySupplierId(wmsFinishgoodsSourceInfo.getSupplierId(), tid);
         // 查询质检信息
-        MppQualitycheck mppQualitycheck = mppQualitycheckMapper.selectMppQualitycheckByFinishgoodsId(wmsFinishgoodsSourceInfo.getFinishgoodsId(),tid);
-        // 查询质检企业信息
-        WmsSupplier checkCompany = wmsSupplierMapper.selectWmsSupplierBySupplierId(mppQualitycheck.getQualitycheckOrg(),tid);
+        MppQualitycheck mppQualitycheck = mppQualitycheckMapper.selectMppQualitycheckByFinishgoodsId(wmsFinishgoodsSourceInfo.getFinishgoodsId(), tid);
+
         LinkedHashMap<String, TssTracecodetplparam> paramsMap = params.stream().collect(Collectors.toMap(TssTracecodetplparam::getTplparamBustype, item -> item, (a, b) -> b, LinkedHashMap::new));
 
         // 替换产品名称
@@ -382,11 +381,12 @@ public class TssTracecodetplServiceImpl implements ITssTracecodetplService {
         if (null != paramsMap.get(BusType.GOODS_LEVEL.name())) {
             paramsMap.get(BusType.GOODS_LEVEL.name()).setTplparamData(DictUtils.getDictLabel("sys_product_seed", wmsFinishgoodsSourceInfo.getFinishgoodsLevel()));
         }
-        // 替换供应商名称
-        if (null != paramsMap.get(BusType.SUPPLIER_NAME.name())) {
-            paramsMap.get(BusType.SUPPLIER_NAME.name()).setTplparamData(supplier.getSupplierName());
-        }
-        if(ObjectUtils.isNotNull(supplier)&&StringUtils.isNotEmpty(supplier.getCusareaId())){
+
+        if (ObjectUtils.isNotNull(supplier) && StringUtils.isNotEmpty(supplier.getCusareaId())) {
+            // 替换供应商名称
+            if (null != paramsMap.get(BusType.SUPPLIER_NAME.name())) {
+                paramsMap.get(BusType.SUPPLIER_NAME.name()).setTplparamData(supplier.getSupplierName());
+            }
             // 查询行政区划信息
             SysCusarea sysCusarea = sysCusareaService.selectSysCusareaByCusareaId(supplier.getCusareaId());
             // 行政区划
@@ -403,7 +403,11 @@ public class TssTracecodetplServiceImpl implements ITssTracecodetplService {
         }
         // 替换质检企业信息
         if (null != paramsMap.get(BusType.QUALITY_COMPANY.name())) {
-            paramsMap.get(BusType.QUALITY_COMPANY.name()).setTplparamData(checkCompany.getSupplierName());
+            if(null != mppQualitycheck){
+                // 查询质检企业信息
+                WmsSupplier checkCompany = wmsSupplierMapper.selectWmsSupplierBySupplierId(mppQualitycheck.getQualitycheckOrg(), tid);
+                paramsMap.get(BusType.QUALITY_COMPANY.name()).setTplparamData(checkCompany.getSupplierName());
+            }
         }
         return paramsMap;
     }

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

@@ -184,6 +184,7 @@ public class WmsStockServiceImpl implements IWmsStockService {
         List<WmsChange> wmsChanges = new ArrayList<>();
         // 遍历接口入参
         for (WmsStockBatchChangeReqVoItem wmsStockBatchChangeReqVoItem : wmsStockBatchChangeReqVo.getWmsStockBatchChangeReqVoItemList()) {
+            wmsStockBatchChangeReqVoItem.setTid(wmsStockBatchChangeReqVo.getTid());
             // 获取库存
             WmsStock wmsStock = wmsStockMap.get(wmsStockBatchChangeReqVoItem.getStockId());
             // 生成变动申请物件信息

src/main/resources/mapper/SpmOrderMapper.xml

@@ -260,7 +260,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         so.orderConsigneeprovince,
         so.orderConsigneecity,
         so.orderConsigneedistrict,
-        ws.warehouseId
+        ws.warehouseId,
+        so.tid
         from
         SpmOrder so
         LEFT JOIN

src/main/resources/mapper/WmsStockMapper.xml

@@ -145,7 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="item.stockRemark != null">stockRemark = #{item.stockRemark},</if>
             <if test="item.tid != null">tid = #{item.tid},</if>
         </trim>
-        where stockId = #{item.stockId} and tid = #{tid} ;
+        where stockId = #{item.stockId} and tid = #{item.tid} ;
         </foreach>
     </update>