调整实体类适配小板桥版本

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

@@ -6,14 +6,24 @@ 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.poi.ExcelUtil;
+import com.yunfeiyun.agmp.tss.domain.MppMaterial;
 import com.yunfeiyun.agmp.tss.domain.MppTask;
 import com.yunfeiyun.agmp.tss.domain.reqvo.AddMppTaskReqVo;
+import com.yunfeiyun.agmp.tss.domain.reqvo.AgmTaskPickListReqVo;
+import com.yunfeiyun.agmp.tss.domain.reqvo.MppMaterialReqVo;
+import com.yunfeiyun.agmp.tss.domain.resvo.MppMaterialResVo;
+import com.yunfeiyun.agmp.tss.domain.resvo.WmsFinishgoodsListResVo;
+import com.yunfeiyun.agmp.tss.service.IAgmTaskpickService;
+import com.yunfeiyun.agmp.tss.service.IMppMaterialService;
 import com.yunfeiyun.agmp.tss.service.IMppTaskService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,7 +38,10 @@ public class MppTaskController extends BaseController
 {
     @Autowired
     private IMppTaskService mppTaskService;
-
+    @Resource
+    private IAgmTaskpickService agmTaskpickService;
+    @Resource
+    private IMppMaterialService mppMaterialService;
     /**
      * 查询农产品生产任务列表
      */
@@ -70,8 +83,45 @@ public class MppTaskController extends BaseController
     @PreAuthorize("@ss.hasPermi('mpp:task:add')")
     @Log(title = "农产品生产任务", businessType = BusinessType.INSERT)
     @PostMapping("/add")
-    public AjaxResult add(@RequestBody AddMppTaskReqVo reqVo)
-    {
+    public AjaxResult add(@RequestBody AddMppTaskReqVo reqVo) {
+        return mppTaskService.insertMppTask(reqVo);
+    }
+    /**
+     * 新增农产品生产任务
+     */
+    @PreAuthorize("@ss.hasPermi('mpp:task:add')")
+    @Log(title = "农产品生产任务", businessType = BusinessType.INSERT)
+    @PostMapping("/add/batch")
+    public AjaxResult addBatch(@RequestBody AddMppTaskReqVo reqVo) {
+
+        AgmTaskPickListReqVo agmTaskPickListReqVo = new AgmTaskPickListReqVo();
+        agmTaskPickListReqVo.setFinishgoodsType("0");
+        agmTaskPickListReqVo.setGoodsName(reqVo.getGoodsName());
+        List<WmsFinishgoodsListResVo> list = agmTaskpickService.selectWmsFinishgoodsList(agmTaskPickListReqVo);
+        for (WmsFinishgoodsListResVo wmsFinishgoodsListResVo : list) {
+            //查询加工前产品编号
+            if ("1".equals(wmsFinishgoodsListResVo.getFinishgoodsType())) {
+                MppMaterialReqVo reqVo1 = new MppMaterialReqVo();
+                reqVo1.setFinishgoodsId(wmsFinishgoodsListResVo.getFinishgoodsId());
+                List<MppMaterialResVo> mppMaterialResVos = mppMaterialService.selectMppMaterialList(reqVo1);
+                String oldFinishgoodNos = "";
+                for (MppMaterialResVo mppMaterialResVo : mppMaterialResVos) {
+                    oldFinishgoodNos += mppMaterialResVo.getFinishgoodNo();
+                }
+                wmsFinishgoodsListResVo.setOldFinishgoodNos(oldFinishgoodNos);
+            }
+        }
+        List<MppMaterial> mppMaterials = new ArrayList<>();
+        for(WmsFinishgoodsListResVo wmsFinishgoodsListResVo : list){
+            MppMaterial mppMaterial = new MppMaterial();
+            mppMaterial.setStockId(wmsFinishgoodsListResVo.getStockId());
+            mppMaterial.setMaterialCostnum(new BigDecimal(wmsFinishgoodsListResVo.getStockAmount()));
+            if(mppMaterials.isEmpty()){
+                mppMaterial.setMaterialStatus("1");
+            }
+            mppMaterials.add(mppMaterial);
+        }
+        reqVo.setMppMaterials(mppMaterials);
         return mppTaskService.insertMppTask(reqVo);
     }
 

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

@@ -5,11 +5,8 @@ import com.yunfeiyun.agmp.tss.domain.reqvo.AddAgmTaskPickOutReqVo;
 import com.yunfeiyun.agmp.tss.domain.reqvo.AddAgmTaskPickReqVo;
 import com.yunfeiyun.agmp.tss.domain.reqvo.AgmTaskPickListReqVo;
 import com.yunfeiyun.agmp.tss.domain.reqvo.AppSeedOutAddReqVo;
-import com.yunfeiyun.agmp.tss.domain.resvo.AgmTaskPickListResVo;
-import com.yunfeiyun.agmp.tss.domain.resvo.AppSeedOutAddInfoResVo;
 import com.yunfeiyun.agmp.tss.domain.resvo.WmsFinishgoodsListResVo;
 
-
 import java.util.List;
 
 /**
@@ -20,6 +17,8 @@ import java.util.List;
  */
 public interface IAgmTaskpickService
 {
+
+    public List<WmsFinishgoodsListResVo> selectWmsFinishgoodsList(AgmTaskPickListReqVo reqVo);
     /**
      * 新增库存
      *

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

@@ -35,5 +35,4 @@ public interface IFmsTaskService
     public Map<String, Map<String, Object>> selectPayMonthByNj(SelectOfTssStatReqVo reqVo);
     /** 溯源统计页面使用：年度分析-每月（农资） */
     public Map<String, Map<String, Object>> selectPayMonthByNz(SelectOfTssStatReqVo reqVo);
-
 }

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

@@ -21,6 +21,7 @@ import com.yunfeiyun.agmp.tss.domain.dto.FmsTaskrcdListDto;
 import com.yunfeiyun.agmp.tss.domain.reqvo.*;
 import com.yunfeiyun.agmp.tss.domain.resvo.AgmTaskPickListResVo;
 import com.yunfeiyun.agmp.tss.domain.resvo.FmsTaskResVo;
+import com.yunfeiyun.agmp.tss.domain.resvo.WmsFinishgoodsListResVo;
 import com.yunfeiyun.agmp.tss.mapper.*;
 import com.yunfeiyun.agmp.tss.service.*;
 import org.slf4j.Logger;
@@ -105,6 +106,12 @@ public class AgmTaskpickServiceImpl implements IAgmTaskpickService
 
 
 
+
+    @Override
+    public List<WmsFinishgoodsListResVo> selectWmsFinishgoodsList(AgmTaskPickListReqVo reqVo) {
+        return agmTaskpickMapper.selectWmsFinishgoodsList(reqVo);
+    }
+
     @Transactional
     @Override
     public AjaxResult add(AddAgmTaskPickReqVo reqVo) {

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

@@ -1,12 +1,12 @@
 package com.yunfeiyun.agmp.tss.service.impl;
 
+import java.util.List;
+
 import com.yunfeiyun.agmp.tss.domain.FmsLandHouse;
 import com.yunfeiyun.agmp.tss.mapper.FmsLandHouseMapper;
 import com.yunfeiyun.agmp.tss.service.IFmsLandHouseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.util.List;
 /**
  * 仓库基地关联Service业务层处理
  * 

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

@@ -12,13 +12,13 @@ import com.yunfeiyun.agmp.common.web.system.mapper.SysResMapper;
 import com.yunfeiyun.agmp.tss.domain.TssSourceEnvironment;
 import com.yunfeiyun.agmp.tss.domain.TssSourceinfo;
 import com.yunfeiyun.agmp.tss.domain.TssSourceperiod;
-import com.yunfeiyun.agmp.tss.domain.dto.TssSourceperiodDto;
-import com.yunfeiyun.agmp.tss.domain.reqvo.AddTssSourceinfoReqVo;
 import com.yunfeiyun.agmp.tss.domain.reqvo.TssSourceinfoListReqVo;
-import com.yunfeiyun.agmp.tss.domain.resvo.TssSourceinfoListResVo;
 import com.yunfeiyun.agmp.tss.mapper.TssSourceEnvironmentMapper;
 import com.yunfeiyun.agmp.tss.mapper.TssSourceinfoMapper;
 import com.yunfeiyun.agmp.tss.mapper.TssSourceperiodMapper;
+import com.yunfeiyun.agmp.tss.domain.dto.TssSourceperiodDto;
+import com.yunfeiyun.agmp.tss.domain.reqvo.AddTssSourceinfoReqVo;
+import com.yunfeiyun.agmp.tss.domain.resvo.TssSourceinfoListResVo;
 import com.yunfeiyun.agmp.tss.service.ITssSourceinfoService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
@@ -65,7 +65,7 @@ public class TssSourceinfoServiceImpl implements ITssSourceinfoService
     /**
      * 查询溯源信息列表
      * 
-     * @param tssSourceinfo 溯源信息
+     * @param tssSourceinfoListReqVo 溯源信息
      * @return 溯源信息
      */
     @Override

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

@@ -1,5 +1,6 @@
 package com.yunfeiyun.agmp.tss.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.yunfeiyun.agmp.common.constant.ErrorCode;
 import com.yunfeiyun.agmp.common.exception.BizException;
 import com.yunfeiyun.agmp.common.utils.*;
@@ -376,7 +377,7 @@ public class TssTracecodetplServiceImpl implements ITssTracecodetplService {
         if (null != paramsMap.get(BusType.SUPPLIER_NAME.name())) {
             paramsMap.get(BusType.SUPPLIER_NAME.name()).setTplparamData(supplier.getSupplierName());
         }
-        if(StringUtils.isNotEmpty(supplier.getCusareaId())){
+        if(ObjectUtils.isNotNull(supplier)&&StringUtils.isNotEmpty(supplier.getCusareaId())){
             // 查询行政区划信息
             SysCusarea sysCusarea = sysCusareaService.selectSysCusareaByCusareaId(supplier.getCusareaId());
             // 行政区划