Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

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());
             }
         }
@@ -107,7 +108,7 @@ public class GrainDeliveryRegistrationServiceImpl extends ServiceImpl<GrainDeliv
         List<GrainDeliveryRegistration> grainDeliveryRegistrationList = this.selectList(new EntityWrapper<GrainDeliveryRegistration>()
             .eq("common_id",commonId)
             .eq("delete_flag","0")
-            .orderBy("create_date"));
+            .orderBy("validity_date", false));
         if (!CollectionUtils.isEmpty(grainDeliveryRegistrationList)){
             for (GrainDeliveryRegistration grainDeliveryRegistration : grainDeliveryRegistrationList){
                 //查询送货信息
@@ -116,6 +117,7 @@ public class GrainDeliveryRegistrationServiceImpl extends ServiceImpl<GrainDeliv
                         .eq("delete_flag","0"));
                 if (!CollectionUtils.isEmpty(shippingInformations)) {
                     grainDeliveryRegistration.setShippingInformationList(shippingInformations);
+                    grainDeliveryRegistration.setCreateDate(shippingInformations.get(0).getCreateDate());
                 }
             }
         }

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

@@ -215,7 +215,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         WarehouseBaseInfo warehouseBaseInfo=warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
                 .eq("comp_id",qualityInspectionManagement.getCompId())
                 .eq("warehouse_name",qualityInspectionManagement.getWarehouseName()));
-        qualityInspectionManagement.setCodeUrl(qrCodeUtil.generateQRCodeImage(qualityInspectionManagement.getCompId()+"&"+qualityInspectionManagement.getQualityNo()+"&"+warehouseBaseInfo.getId(),800,800,"",qualityInspectionManagement.getCompId()));
+        qualityInspectionManagement.setCodeUrl(qrCodeUtil.generateQRCodeImage(qualityInspectionManagement.getCompId()+"&"+qualityInspectionManagement.getQualityNo()+"&"+warehouseBaseInfo.getId(),800,800,"",qualityInspectionManagement.getId()));
         //公司名
         if (commonCompany != null) {
             paymentManagement.setCompName(commonCompany.getCompName());

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 ;
@@ -136,7 +138,7 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
             if (weighingManagement!=null) {
                 qualityInspectionManagement.setWeighingManagement(weighingManagement);
             }
-            qualityInspectionManagement.setCodeUrl(qrCodeUtil.generateQRCodeImage(qualityInspectionManagement.getCompId()+"&"+qualityInspectionManagement.getQualityNo()+"&"+warehouseBaseInfo.getId(),800,800,"",qualityInspectionManagement.getCompId()));
+            qualityInspectionManagement.setCodeUrl(qrCodeUtil.generateQRCodeImage(qualityInspectionManagement.getCompId()+"&"+qualityInspectionManagement.getQualityNo()+"&"+warehouseBaseInfo.getId(),800,800,"",qualityInspectionManagement.getId()));
         }
         return qualityInspectionManagement;
     }
@@ -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);
                 }
             }

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

@@ -846,6 +846,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 contractManagementInfo.setContractNo(inOutWarehouseTask.getMoveTaskNo());
                 contractManagementInfo.setContractPrice(inOutWarehouseTask.getUnitPrice());
                 contractManagementInfo.setGrade(inOutWarehouseTask.getGrade());
+                contractManagementInfo.setSendWarehouse(inOutWarehouseTask.getSendWarehouse());
+                contractManagementInfo.setReceiveWarehouse(inOutWarehouseTask.getReceiveWarehouse());
                 contractManagementInfo.setInOutType("移库出库");
                 temp.add(contractManagementInfo);
             }

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

@@ -673,12 +673,12 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             stockPurchaseReceiptReport.setSettlementPrice(Double.valueOf(String.valueOf(warehouseInOutInfo.getCost())));
                             if(contractManagementInfo.getUnitContractPrice()!=null) {
                                 stockPurchaseReceiptReport.setAmountIngPayable(warehouseInOutInfo.getNetWeight() *
-                                        (contractManagementInfo.getUnitContractPrice() - Float.valueOf(warehouseInOutInfo.getDeductionAmount())));
+                                        (contractManagementInfo.getUnitContractPrice() - Float.valueOf(warehouseInOutInfo.getDeductionAmount()!=null?warehouseInOutInfo.getDeductionAmount():"")));
                             }
                             //随行就市
                             else {
                                 stockPurchaseReceiptReport.setAmountIngPayable(Double.valueOf(warehouseInOutInfo.getNetWeight() *
-                                        (warehouseInOutInfo.getCost() - Float.valueOf(warehouseInOutInfo.getDeductionAmount()))));
+                                        (warehouseInOutInfo.getCost() - Float.valueOf(warehouseInOutInfo.getDeductionAmount()!=null?warehouseInOutInfo.getDeductionAmount():""))));
                             }
                             stockPurchaseReceiptReport.setAmountEdPayable(0.0d);
                             stockPurchaseReceiptReport.setAmountNotPayable(stockPurchaseReceiptReport.getAmountIngPayable());

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

@@ -325,7 +325,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
             if (qualityInspectionManagement!=null) {
                 weighingManagement.setQualityInspectionManagement(qualityInspectionManagement);
             }
-            weighingManagement.setCodeUrl(qrCodeUtil.generateQRCodeImage(qualityInspectionManagement.getCompId()+"&"+qualityInspectionManagement.getQualityNo()+"&"+warehouseBaseInfo.getId(),800,800,"",qualityInspectionManagement.getCompId()));
+            weighingManagement.setCodeUrl(qrCodeUtil.generateQRCodeImage(qualityInspectionManagement.getCompId()+"&"+qualityInspectionManagement.getQualityNo()+"&"+warehouseBaseInfo.getId(),800,800,"",qualityInspectionManagement.getId()));
 
         }
         return weighingManagement;

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseBaseInfoMapper.xml

@@ -218,9 +218,9 @@
         w.gross_weight as grossWeight,
         w.tare as tare,
         '' as contractStatus,
-        w.net_weight as feedbackWeight,
+        0 as feedbackWeight,
         w.in_out_date as feedbackDate,
-        w.net_weight as settlementWeight,
+        0 as settlementWeight,
         '' as carFreight,
         '' as trainFreight,
         '' as shipFreight,

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WeighingManagementMapper.xml

@@ -37,6 +37,10 @@
         a.number,
         a.customer,
         a.customer_number_card as customerNumberCard,
+        a.customer_phone as customerPhone,
+        w.person_charge as person,
+        w.person_phone as personPhone,
+        w.id as warehouseId,
         a.type,
         a.contract_no as contractNo,
         a.car_number as carNumber,
@@ -61,6 +65,7 @@
         case when p.id is null then 1 when p.status !='待结算' or p.approve_status is null then 2 else 1 end as allow
         FROM weighing_management a
         left join payment_management p on p.relation_id = a.relation_id and p.comp_id = a.comp_id and p.delete_flag = 0
+        left join warehouse_base_info w on a.warehouse_name = w.warehouse_name and w.comp_id = a.comp_id and w.delete_flag = 0
         WHERE a.comp_id = #{compId}
         and a.delete_flag = '0'
         AND a.warehouse_name= #{warehouseName}