1

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

@@ -281,6 +281,11 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
     private WeighingManagement weighingManagement;
     @TableField(exist = false)
     private String codeUrl;
+    /**
+     * identityId
+     */
+    @TableField(exist = false)
+    private String identityId;
     @Override
     protected Serializable pkVal() {
         return this.id;

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

@@ -2,16 +2,20 @@ package com.yh.saas.plugin.yiliangyiyun.entity;
 
 import com.baomidou.mybatisplus.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
+import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.annotations.Version;
 
 import com.baomidou.mybatisplus.enums.IdType;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yh.saas.common.support.entity.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -62,10 +66,21 @@ public class ShippingInformation extends BaseModel<ShippingInformation> {
      * 车牌号
      */
     private String carNo;
+    /**
+     * 未提交过的车牌号
+     */
+    private String notCarNo;
     /**
      * 身份证号码
      */
     private String customerNumberCard;
+    /**
+     * 有效期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @TableField(exist = false)
+    private Date validityDate;
 
 
     @Override

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

@@ -71,6 +71,7 @@ public class GrainDeliveryRegistrationServiceImpl extends ServiceImpl<GrainDeliv
                 shippingInformation.setCompId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
                 shippingInformation.setGrainId(grainDeliveryRegistration.getId());
                 shippingInformation.setShipperPhone(identityAuthenticationInfo.getCustomerPhone());
+                shippingInformation.setNotCarNo(shippingInformation.getCarNo());
                 shippingInformation.setCustomerNumberCard(identityAuthenticationInfo.getCustomerNumberCard());
             }
         }

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

@@ -42,6 +42,8 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
     @Autowired
     private IPaymentManagementService paymentManagementService;
     @Autowired
+    private IShippingInformationService shippingInformationService;
+    @Autowired
     private ICommonStaffService staffService;
     @Autowired
     private QRCodeUtil qrCodeUtil ;
@@ -222,6 +224,29 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
         weighingManagement.setStatus(StatusEnum.INSPECTED.getName());
         weighingManagement.setStatusFlag(StatusEnum.INSPECTED.getFlag());
         weighingManagement.setStorageNumber(qualityInspectionManagement.getStorageTagNo());
+        //送粮登记的id
+        if(qualityInspectionManagement.getIdentityId()!=null){
+            ShippingInformation shippingInformation=shippingInformationService.selectById(qualityInspectionManagement.getIdentityId());
+            if (shippingInformation!=null){
+                if (shippingInformation.getNotCarNo().contains(qualityInspectionManagement.getCarNumber())) {
+                    String newStr = "";
+                    String[] arr = shippingInformation.getNotCarNo().split(",");
+                    List<String> list = Arrays.asList(arr);
+                    List<String> arrList = new ArrayList<>(list);
+                    arrList.remove(qualityInspectionManagement.getCarNumber());
+                    String[] strings = new String[arrList.size()];
+                    String[] newArray = arrList.toArray(strings);
+                    for (int i = 0; i < newArray.length; i++) {
+                        newStr += newArray[i] + ",";
+                    }
+                    if (!"".equals(newStr)) {
+                        newStr = newStr.substring(0, newStr.length() - 1);
+                    }
+                    shippingInformation.setNotCarNo(newStr);
+                    shippingInformationService.updateById(shippingInformation);
+                }
+            }
+        }
         boolean two=weighingManagementService.insert(weighingManagement);
         boolean one=this.insert(qualityInspectionManagement);
         //成功返回ok

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

@@ -43,7 +43,7 @@ public class ShippingInformationServiceImpl extends ServiceImpl<ShippingInformat
             for(GrainDeliveryRegistration grainDeliveryRegistration:grainDeliveryRegistrationList){
                 ShippingInformation shippingInformation=this.selectOne(new EntityWrapper<ShippingInformation>()
                 .eq("grain_id",grainDeliveryRegistration.getId()));
-                String[] carNo = shippingInformation.getCarNo().split(",");
+                String[] carNo = shippingInformation.getNotCarNo().split(",");
                 for (int i = 0; i < carNo.length; i++) {
                     ShippingInformation tmp = new ShippingInformation();
                     tmp.setCarNo(carNo[i]);
@@ -52,6 +52,7 @@ public class ShippingInformationServiceImpl extends ServiceImpl<ShippingInformat
                     tmp.setShipperPhone(shippingInformation.getShipperPhone());
                     tmp.setSupplier(shippingInformation.getSupplier());
                     tmp.setCustomerNumberCard(shippingInformation.getCustomerNumberCard());
+                    tmp.setValidityDate(grainDeliveryRegistration.getValidityDate());
                     shippingInformationList.add(tmp);
                 }
             }