修改

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/InOutWarehouseTaskController.java

@@ -119,5 +119,13 @@ public class InOutWarehouseTaskController {
     public String checkOrUpdateInOutTask(@RequestBody InOutWarehouseTask inOutWarehouseTask) {
         return inOutWarehouseTaskService.checkOrUpdateInOutTask(inOutWarehouseTask);
     }
+    /**
+     * 查看
+     */
+    @GetMapping("/getTask")
+    public InOutWarehouseTask getTask(@RequestParam String id) {
+        return inOutWarehouseTaskService.getTask(id);
+    }
+
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/StockPurchaseReceiptReport.java

@@ -154,6 +154,11 @@ public class StockPurchaseReceiptReport extends BaseModel<StockPurchaseReceiptRe
 
     @TableField(exist = false)
     private String taskId;
+    /**
+     * 磅单
+     */
+    @TableField(exist = false)
+    private String poundImg;
 
     /**
      *补货结转对象

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/StockSaleReceiptReport.java

@@ -160,6 +160,11 @@ public class StockSaleReceiptReport extends BaseModel<StockSaleReceiptReport> {
 
     @TableField(exist = false)
     private List<StockSaleReceiptReport> stockSaleReceiptReportList;
+    /**
+     * 磅单
+     */
+    @TableField(exist = false)
+    private String poundImg;
 
 
     @Override

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IInOutWarehouseTaskService.java

@@ -79,4 +79,10 @@ public interface IInOutWarehouseTaskService extends IService<InOutWarehouseTask>
      * @return
      */
     String checkOrUpdateInOutTask(InOutWarehouseTask inOutWarehouseTask);
+    /**
+     * 根据ID查看任务
+     * @param id
+     * @return
+     */
+    InOutWarehouseTask getTask(String id);
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/InOutWarehouseTaskServiceImpl.java

@@ -390,4 +390,15 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
         this.updateById(inOutWarehouseTask);
         return inOutWarehouseTask.getId();
     }
+
+    /**
+     * 查看
+     * @param id
+     * @return
+     */
+    @Override
+    public InOutWarehouseTask getTask(String id) {
+        InOutWarehouseTask inOutWarehouseTask=this.selectById(id);
+        return inOutWarehouseTask;
+    }
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/StockPurchaseReceiptReportServiceImpl.java

@@ -12,10 +12,7 @@ import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.mapper.StockPurchaseReceiptReportMapper;
-import com.yh.saas.plugin.yiliangyiyun.service.IContractGoodsInfoService;
-import com.yh.saas.plugin.yiliangyiyun.service.IContractManagementInfoService;
-import com.yh.saas.plugin.yiliangyiyun.service.INewWorkflowService;
-import com.yh.saas.plugin.yiliangyiyun.service.IStockPurchaseReceiptReportService;
+import com.yh.saas.plugin.yiliangyiyun.service.*;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,6 +47,8 @@ public class StockPurchaseReceiptReportServiceImpl extends ServiceImpl<StockPurc
     private IContractManagementInfoService contractManagementInfoService;
     @Autowired
     private IContractGoodsInfoService contractGoodsInfoService;
+    @Autowired
+    private IWarehouseInOutInfoService warehouseInOutInfoService;
 
     /**
      * 采购入库统计
@@ -86,8 +85,13 @@ public class StockPurchaseReceiptReportServiceImpl extends ServiceImpl<StockPurc
         Integer dataCount = baseMapper.getCountByCondition(pageView);
         List<StockPurchaseReceiptReport> dataList = baseMapper.getListByCondition(pageView);
         if (!CollectionUtils.isEmpty(dataList)) {
-            dataList.forEach(purchaseReceiptReport1 -> {
-
+            for (StockPurchaseReceiptReport purchaseReceiptReport1:dataList){
+                WarehouseInOutInfo warehouseInOutInfo=warehouseInOutInfoService.selectOne(new EntityWrapper<WarehouseInOutInfo>()
+                .eq("contract_no",purchaseReceiptReport1.getContractNo())
+                .eq("car_no",purchaseReceiptReport1.getCarNo()).eq("warehouse_name",purchaseReceiptReport1.getWarehouseName()));
+                if (warehouseInOutInfo!=null){
+                    purchaseReceiptReport1.setPoundImg(warehouseInOutInfo.getAddressUrl());
+                }
                 String taskId = "";
                 // 只有待审核状态才有taskId
                 if (StringUtils.isNotBlank(purchaseReceiptReport1.getWorkflowId())) {
@@ -95,8 +99,7 @@ public class StockPurchaseReceiptReportServiceImpl extends ServiceImpl<StockPurc
                     taskId = jsonObject.getString("taskId");
                     purchaseReceiptReport1.setTaskId(taskId);
                 }
-            });
-
+            }
         }
         Page<StockPurchaseReceiptReport> page = new Page<>();
         page.setRecords(dataList == null ? Lists.newArrayList() : dataList);

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/StockSaleReceiptReportServiceImpl.java

@@ -10,14 +10,13 @@ import com.winsea.svc.base.base.service.ICommonRoleResourceService;
 import com.winsea.svc.base.security.entity.User;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
-import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.SalesDeliveryReport;
-import com.yh.saas.plugin.yiliangyiyun.entity.StockSaleReceiptReport;
+import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.mapper.StockSaleReceiptReportMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IContractManagementInfoService;
 import com.yh.saas.plugin.yiliangyiyun.service.INewWorkflowService;
 import com.yh.saas.plugin.yiliangyiyun.service.IStockSaleReceiptReportService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseInOutInfoService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -47,6 +46,8 @@ public class StockSaleReceiptReportServiceImpl extends ServiceImpl<StockSaleRece
     private ICommonRoleResourceService roleResourceService;
     @Autowired
     private IContractManagementInfoService contractManagementInfoService;
+    @Autowired
+    private IWarehouseInOutInfoService warehouseInOutInfoService;
 
     /**
      * 销售出库统计
@@ -83,8 +84,14 @@ public class StockSaleReceiptReportServiceImpl extends ServiceImpl<StockSaleRece
         Integer dataCount = baseMapper.getCountByCondition(pageView);
         List<StockSaleReceiptReport> dataList = baseMapper.getListByCondition(pageView);
         if (!CollectionUtils.isEmpty(dataList)) {
-            dataList.forEach(saleReceiptReport1 -> {
-
+            for (StockSaleReceiptReport saleReceiptReport1:dataList){
+                WarehouseInOutInfo warehouseInOutInfo=warehouseInOutInfoService.selectOne(new EntityWrapper<WarehouseInOutInfo>()
+                        .eq("contract_no",saleReceiptReport1.getContractNo())
+                        .eq("car_no",saleReceiptReport1.getCarNo())
+                        .eq("warehouse_name",saleReceiptReport1.getWarehouseName()));
+                if (warehouseInOutInfo!=null){
+                    saleReceiptReport1.setPoundImg(warehouseInOutInfo.getAddressUrl());
+                }
                 String taskId = "";
                 // 只有待审核状态才有taskId
                 if (StringUtils.isNotBlank(saleReceiptReport1.getWorkflowId())) {
@@ -92,8 +99,7 @@ public class StockSaleReceiptReportServiceImpl extends ServiceImpl<StockSaleRece
                     taskId = jsonObject.getString("taskId");
                     saleReceiptReport1.setTaskId(taskId);
                 }
-            });
-
+            }
         }
         Page<StockSaleReceiptReport> page = new Page<>();
         page.setRecords(dataList == null ? Lists.newArrayList() : dataList);