1

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

@@ -274,6 +274,8 @@ public class PaymentManagement extends BaseModel<PaymentManagement> {
     private WeighingManagement weighingManagement;
     @TableField(exist = false)
     private List<PaymentManagement> paymentManagementList;
+    @TableField(exist = false)
+    private IdentityAuthenticationInfo identityAuthenticationInfo;
     /**
      * 公司名
      */

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

@@ -17,11 +17,8 @@ import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
 import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.PaymentManagementMapper;
-import com.yh.saas.plugin.yiliangyiyun.service.INewWorkflowService;
-import com.yh.saas.plugin.yiliangyiyun.service.IPaymentManagementService;
+import com.yh.saas.plugin.yiliangyiyun.service.*;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.yh.saas.plugin.yiliangyiyun.service.IQualityInspectionManagementService;
-import com.yh.saas.plugin.yiliangyiyun.service.IWeighingManagementService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -53,6 +50,9 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
     private IWeighingManagementService weighingManagementService;
     @Autowired
     private ICommonCompanyService commonCompanyService;
+    @Autowired
+    private IIdentityAuthenticationInfoService iIdentityAuthenticationInfoService;
+
 
     /**
      * 付款管理列表
@@ -127,6 +127,10 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
             paymentManagement.setCompName(commonCompany.getCompName());
             paymentManagement.setTaxRegistrationNo(commonCompany.getCompImo());
         }
+        IdentityAuthenticationInfo identityAuthenticationInfo=iIdentityAuthenticationInfoService.selectOne(new EntityWrapper<IdentityAuthenticationInfo>()
+        .eq("customer_name",paymentManagement.getCustomerName())
+        .eq("customer_type_flag","1"));
+        paymentManagement.setIdentityAuthenticationInfo(identityAuthenticationInfo);
         paymentManagement.setQualityInspectionManagement(qualityInspectionManagement);
         paymentManagement.setWeighingManagement(weighingManagement);
         return paymentManagement;
@@ -141,6 +145,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
     @Transactional(rollbackFor = Exception.class)
     public String editInfo(PaymentManagement paymentManagement) {
         PaymentManagement paymentManagement1=this.selectById(paymentManagement.getId());
+        paymentManagement.setAmountIngPayable(paymentManagement.getActualPayment());
         this.openAuditFlow(paymentManagement1);
         this.updateById(paymentManagement);
         return "OK";

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

@@ -171,7 +171,7 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
         boolean one=this.insert(qualityInspectionManagement);
         //成功返回ok
         if (one &&two ) {
-            return "OK";
+            return qualityInspectionManagement.getId();
         } else {
             return "NG";
         }