zhangyuewww 3 years ago
parent
commit
674668a13d

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

@@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.entity.QualityInspectionManagement;
+import com.yh.saas.plugin.yiliangyiyun.entity.WeighingManagement;
 import com.yh.saas.plugin.yiliangyiyun.mapper.QualityInspectionManagementMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IQualityInspectionManagementService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.yh.saas.plugin.yiliangyiyun.service.IWeighingManagementService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -23,6 +26,8 @@ import java.util.Map;
  */
 @Service
 public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityInspectionManagementMapper, QualityInspectionManagement> implements IQualityInspectionManagementService {
+    @Autowired
+    private IWeighingManagementService weighingManagementService;
     /**
      * 质检管理列表
      * @param qualityInspectionManagement
@@ -95,7 +100,21 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
      */
     @Override
     public String addQualityInspection(QualityInspectionManagement qualityInspectionManagement) {
+        String relationId=IdGenerator.generateUUID();
         qualityInspectionManagement.setId(IdGenerator.generateUUID());
+        qualityInspectionManagement.setRelationId(relationId);
+        //生成检斤信息
+        WeighingManagement weighingManagement=new WeighingManagement();
+        weighingManagement.setId(IdGenerator.generateUUID());
+        weighingManagement.setRelationId(relationId);
+        weighingManagement.setNumber(qualityInspectionManagement.getQualityNo());
+        weighingManagement.setCustomer(qualityInspectionManagement.getCustomerName());
+        weighingManagement.setCarNumber(qualityInspectionManagement.getCarNumber());
+        weighingManagement.setCompId(qualityInspectionManagement.getCompId());
+        weighingManagement.setGoodsName(qualityInspectionManagement.getGoodsName());
+        weighingManagement.setBinNumber(qualityInspectionManagement.getBinNumber());
+        weighingManagement.setStorageNumber(qualityInspectionManagement.getStorageTagNo());
+        weighingManagementService.insert(weighingManagement);
         boolean one=this.insert(qualityInspectionManagement);
         //成功返回ok
         if (one ) {

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

@@ -1,12 +1,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.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.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.IWeighingManagementService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -25,6 +32,10 @@ import java.util.Map;
 @Service
 public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagementMapper, WeighingManagement> implements IWeighingManagementService {
 
+    @Autowired
+    private IPaymentManagementService paymentManagementService;
+    @Autowired
+    private IQualityInspectionManagementService qualityInspectionManagementService;
     /**
      * 检斤管理列表
      * @param weighingManagement
@@ -78,9 +89,37 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String editTare(WeighingManagement weighingManagement) {
+        WeighingManagement weighingManagement1=this.selectById(weighingManagement.getId());
         //状态改为已称皮重
         weighingManagement.setStatus(StatusEnum.TARED.getName());
         weighingManagement.setStatusFlag(StatusEnum.TARED.getFlag());
+        //查关联的付款信息
+        PaymentManagement paymentManagement=paymentManagementService.selectOne(new EntityWrapper<PaymentManagement>()
+        .eq("relation_id",weighingManagement1.getRelationId()));
+        if (paymentManagement==null){
+            //生成付款信息
+            PaymentManagement paymentManagement1=new PaymentManagement();
+            paymentManagement1.setId(IdGenerator.generateUUID());
+            paymentManagement1.setRelationId(weighingManagement1.getRelationId());
+            paymentManagement1.setCompId(weighingManagement1.getCompId());
+            paymentManagement1.setPaymentNo(weighingManagement1.getNumber());
+            paymentManagement1.setCustomerName(weighingManagement1.getCustomer());
+            paymentManagement1.setCarNo(weighingManagement1.getCarNumber());
+            paymentManagement1.setGoodsName(weighingManagement1.getGoodsName());
+            paymentManagement1.setNetWeight(weighingManagement1.getNetWeight());
+            //质检信息
+            QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
+                    .eq("relation_id", weighingManagement1.getRelationId()));
+            if (qualityInspectionManagement!=null){
+                paymentManagement1.setTidalGrainPrice(qualityInspectionManagement.getTidalGrainPrice());
+            }
+            paymentManagementService.insert(paymentManagement1);
+        }
+        else {
+            paymentManagement.setNetWeight(weighingManagement.getNetWeight());
+            paymentManagementService.updateById(paymentManagement);
+        }
+        //生成付款管理信息
         boolean one = this.updateById(weighingManagement);
         if (one) {
             return "OK";