修改

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

@@ -241,7 +241,11 @@ public class PaymentManagement extends BaseModel<PaymentManagement> {
      */
     @TableField(exist = false)
     private String compName;
-
+    /**
+     * 税务登记号
+     */
+    @TableField(exist = false)
+    private String taxRegistrationNo;
 
     @Override
     protected Serializable pkVal() {

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

@@ -227,6 +227,11 @@ public class WeighingManagement extends BaseModel<WeighingManagement> {
      */
     @TableField(exist = false)
     private String warehouseId;
+    /**
+     *质检对象
+     */
+    @TableField(exist = false)
+    private QualityInspectionManagement qualityInspectionManagement;
 
 
     @Override

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

@@ -121,10 +121,11 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         WeighingManagement weighingManagement = weighingManagementService.selectOne(new EntityWrapper<WeighingManagement>()
                 .eq("relation_id", paymentManagement.getRelationId()));
         CommonCompany commonCompany=commonCompanyService.selectOne(new EntityWrapper<CommonCompany>()
-                .eq("comp_id",qualityInspectionManagement.getCompId()));
+                .eq("comp_id",paymentManagement.getCompId()));
         //公司名
         if (commonCompany!=null){
             paymentManagement.setCompName(commonCompany.getCompName());
+            paymentManagement.setTaxRegistrationNo(commonCompany.getCompImo());
         }
         paymentManagement.setQualityInspectionManagement(qualityInspectionManagement);
         paymentManagement.setWeighingManagement(weighingManagement);

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

@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -145,6 +146,7 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
         String relationId=IdGenerator.generateUUID();
         qualityInspectionManagement.setId(IdGenerator.generateUUID());
         qualityInspectionManagement.setRelationId(relationId);
+        qualityInspectionManagement.setQualityDate(new Date());
         //状态为已质检
         qualityInspectionManagement.setStatus(StatusEnum.INSPECTED.getName());
         qualityInspectionManagement.setStatusFlag(StatusEnum.INSPECTED.getFlag());

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

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -97,6 +98,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         //状态改为已称毛重
         weighingManagement.setStatus(StatusEnum.WEIGHED_GROSS_WEIGHT.getName());
         weighingManagement.setStatusFlag(StatusEnum.WEIGHED_GROSS_WEIGHT.getFlag());
+        weighingManagement.setGrossDate(new Date());
         //质检信息
         QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
                 .eq("relation_id", weighingManagement.getRelationId()));
@@ -126,6 +128,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         //状态改为已称皮重
         weighingManagement.setStatus(StatusEnum.TARED.getName());
         weighingManagement.setStatusFlag(StatusEnum.TARED.getFlag());
+        weighingManagement.setTareDate(new Date());
         //质检信息
         QualityInspectionManagement qualityInspectionManagement1 = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
                 .eq("relation_id", weighingManagement1.getRelationId()));
@@ -219,6 +222,12 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                 weighingManagement.setPerson(warehouseBaseInfo.getPersonCharge());
                 weighingManagement.setPersonPhone(warehouseBaseInfo.getPersonPhone());
             }
+            //质检信息
+            QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
+                    .eq("relation_id", weighingManagement.getRelationId()));
+            if (qualityInspectionManagement!=null) {
+                weighingManagement.setQualityInspectionManagement(qualityInspectionManagement);
+            }
         }
         return weighingManagement;
     }