Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun

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

@@ -43,9 +43,6 @@ public class StockPurchaseReceiptReportController {
     public  String disAndRemark(@RequestBody ContractManagementInfo contractManagementInfo){
         return stockPurchaseReceiptReportService.disAndRemark(contractManagementInfo);
     }
-
-
-
     /**
      * 修改结算重量
      *

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

@@ -44,7 +44,6 @@ public interface IStockPurchaseReceiptReportService extends IService<StockPurcha
      * @param stockPurchaseReceiptReport
      */
     String payMoney(StockPurchaseReceiptReport stockPurchaseReceiptReport);
-
     /**
      * 合同编号下拉列表
      *

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

@@ -349,6 +349,9 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         c.add(Calendar.YEAR, 0);
         Date y = c.getTime();
         String year = now.format(y);
+        if(paymentManagement.getCompId() == null || paymentManagement.getCompId().isEmpty()){
+            paymentManagement.setCompId(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId());
+        }
         List<PaymentManagement> paymentManagementList = this.selectList(new EntityWrapper<PaymentManagement>()
         .eq("goods_name",paymentManagement.getGoodsName())
         .eq("customer_name",paymentManagement.getCustomerName())

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

@@ -5,6 +5,7 @@ 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.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.*;
@@ -211,6 +212,9 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
      */
     @Override
     public Integer settledCount(QualityInspectionManagement qualityInspectionManagement) {
+        if(qualityInspectionManagement.getCompId() == null || qualityInspectionManagement.getCompId().isEmpty()){
+            qualityInspectionManagement.setCompId(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId());
+        }
         Integer count=paymentManagementService.selectCount(new EntityWrapper<PaymentManagement>()
         .eq("comp_id",qualityInspectionManagement.getCompId())
         .eq("customer_name",qualityInspectionManagement.getCustomerName())

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

@@ -10,9 +10,9 @@ 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.StockPurchaseReceiptReport;
+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;
@@ -48,7 +48,8 @@ public class StockPurchaseReceiptReportServiceImpl extends ServiceImpl<StockPurc
     private ICommonRoleResourceService roleResourceService;
     @Autowired
     private IContractManagementInfoService contractManagementInfoService;
-
+    @Autowired
+    private IContractGoodsInfoService contractGoodsInfoService;
 
     /**
      * 采购入库统计
@@ -208,7 +209,11 @@ public class StockPurchaseReceiptReportServiceImpl extends ServiceImpl<StockPurc
                 .eq("contract_type", "2")
                 .eq("delete_flag", "0")
                 .orderBy("update_date", false));
+
         for (ContractManagementInfo contractManagementInfo : contractManagementInfoList) {
+            ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
+                    .eq("contract_id",contractManagementInfo.getId()));
+            contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
             Float money = 0.0f;
             //查现货采购入库报表
             List<StockPurchaseReceiptReport> stockPurchaseReceiptReportList = this.selectList(new EntityWrapper<StockPurchaseReceiptReport>()