打印表数据

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

@@ -167,6 +167,21 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
      */
     @TableField(exist = false)
     private String warehouseId;
+    /**
+     * 公司名
+     */
+    @TableField(exist = false)
+    private String compName;
+    /**
+     * 仓库负责人
+     */
+    @TableField(exist = false)
+    private String person;
+    /**
+     * 仓库负责人电话
+     */
+    @TableField(exist = false)
+    private String personPhone;
 
 
     @Override

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

@@ -191,6 +191,21 @@ public class WeighingManagement extends BaseModel<WeighingManagement> {
      */
     @TableField(exist = false)
     private String searchType;
+    /**
+     * 公司名
+     */
+    @TableField(exist = false)
+    private String compName;
+    /**
+     * 仓库负责人
+     */
+    @TableField(exist = false)
+    private String person;
+    /**
+     * 仓库负责人电话
+     */
+    @TableField(exist = false)
+    private String personPhone;
 
 
     @Override

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

@@ -3,15 +3,19 @@ package com.yh.saas.plugin.yiliangyiyun.service.impl;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
+import com.winsea.svc.base.base.entity.CommonCompany;
+import com.winsea.svc.base.base.service.ICommonCompanyService;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.PurchasePrice;
 import com.yh.saas.plugin.yiliangyiyun.entity.QualityInspectionManagement;
+import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseBaseInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.WeighingManagement;
 import com.yh.saas.plugin.yiliangyiyun.mapper.QualityInspectionManagementMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IPurchasePriceService;
 import com.yh.saas.plugin.yiliangyiyun.service.IQualityInspectionManagementService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseBaseInfoService;
 import com.yh.saas.plugin.yiliangyiyun.service.IWeighingManagementService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -34,6 +38,10 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
     private IWeighingManagementService weighingManagementService;
     @Autowired
     private IPurchasePriceService purchasePriceService;
+    @Autowired
+    private ICommonCompanyService commonCompanyService;
+    @Autowired
+    private IWarehouseBaseInfoService warehouseBaseInfoService;
     /**
      * 质检管理列表
      * @param qualityInspectionManagement
@@ -83,6 +91,22 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
     public QualityInspectionManagement getQualityInspection(String id) {
         //查询质检管理信息
         QualityInspectionManagement qualityInspectionManagement = this.selectById(id);
+        if (qualityInspectionManagement!=null){
+            CommonCompany commonCompany=commonCompanyService.selectOne(new EntityWrapper<CommonCompany>()
+            .eq("comp_id",qualityInspectionManagement.getCompId()));
+            //公司名
+            if (commonCompany!=null){
+                qualityInspectionManagement.setCompName(commonCompany.getCompName());
+            }
+            WarehouseBaseInfo warehouseBaseInfo=warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
+                    .eq("comp_id",qualityInspectionManagement.getCompId())
+            .eq("warehouse_name",qualityInspectionManagement.getWarehouseName()));
+            if (warehouseBaseInfo!=null){
+                //仓库负责人,电话
+                qualityInspectionManagement.setPerson(warehouseBaseInfo.getPersonCharge());
+                qualityInspectionManagement.setPersonPhone(warehouseBaseInfo.getPersonPhone());
+            }
+        }
         return qualityInspectionManagement;
     }
     /**

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

@@ -3,16 +3,21 @@ package com.yh.saas.plugin.yiliangyiyun.service.impl;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
+import com.winsea.svc.base.base.entity.CommonCompany;
+import com.winsea.svc.base.base.service.ICommonCompanyService;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.PaymentManagement;
 import com.yh.saas.plugin.yiliangyiyun.entity.QualityInspectionManagement;
+import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseBaseInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.WeighingManagement;
 import com.yh.saas.plugin.yiliangyiyun.mapper.WeighingManagementMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IPaymentManagementService;
 import com.yh.saas.plugin.yiliangyiyun.service.IQualityInspectionManagementService;
+import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseBaseInfoService;
 import com.yh.saas.plugin.yiliangyiyun.service.IWeighingManagementService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -36,6 +41,10 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
     private IPaymentManagementService paymentManagementService;
     @Autowired
     private IQualityInspectionManagementService qualityInspectionManagementService;
+    @Autowired
+    private ICommonCompanyService commonCompanyService;
+    @Autowired
+    private IWarehouseBaseInfoService warehouseBaseInfoService;
     /**
      * 检斤管理列表
      * @param weighingManagement
@@ -55,6 +64,24 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         // 查询销售订单总数
         Integer dataCount = baseMapper.getCountByCondition(pageView);
         List<WeighingManagement> dataList = baseMapper.getListByCondition(pageView);
+        if (CollectionUtils.isNotEmpty(dataList)){
+            for (WeighingManagement weighingManagement1:dataList){
+                CommonCompany commonCompany=commonCompanyService.selectOne(new EntityWrapper<CommonCompany>()
+                        .eq("comp_id",weighingManagement1.getCompId()));
+                //公司名
+                if (commonCompany!=null){
+                    weighingManagement1.setCompName(commonCompany.getCompName());
+                }
+                WarehouseBaseInfo warehouseBaseInfo=warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
+                        .eq("comp_id",weighingManagement1.getCompId())
+                        .eq("warehouse_name",weighingManagement1.getWarehouseName()));
+                if (warehouseBaseInfo!=null){
+                    //仓库负责人,电话
+                    weighingManagement1.setPerson(warehouseBaseInfo.getPersonCharge());
+                    weighingManagement1.setPersonPhone(warehouseBaseInfo.getPersonPhone());
+                }
+            }
+        }
         Page<WeighingManagement> page = new Page<>();
         page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
         page.setTotal(dataCount == null ? 0 : dataCount);