zhangyuewww преди 2 години
родител
ревизия
056704580f

+ 4 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/CargoTitleDetails.java

@@ -125,6 +125,10 @@ public class CargoTitleDetails extends BaseModel<CargoTitleDetails> {
      * 未付粮款(元)
      * 未付粮款(元)
      */
      */
     private Double amountNotPayable;
     private Double amountNotPayable;
+    /**
+     * 附件地址
+     */
+    private String addressUrl;
     /**
     /**
      * 状态(1待接收 3已接收 5已拒收)
      * 状态(1待接收 3已接收 5已拒收)
      */
      */

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

@@ -226,7 +226,15 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
             //状态改为已称毛重
             //状态改为已称毛重
 //            qualityInspectionManagement.setStatus(StatusEnum.WEIGHED_GROSS_WEIGHT.getName());
 //            qualityInspectionManagement.setStatus(StatusEnum.WEIGHED_GROSS_WEIGHT.getName());
 //            qualityInspectionManagement.setStatusFlag(StatusEnum.WEIGHED_GROSS_WEIGHT.getFlag());
 //            qualityInspectionManagement.setStatusFlag(StatusEnum.WEIGHED_GROSS_WEIGHT.getFlag());
+            qualityInspectionManagement.setCarNumber(weighingManagement.getCarNumber());
             qualityInspectionManagementService.updateById(qualityInspectionManagement);
             qualityInspectionManagementService.updateById(qualityInspectionManagement);
+            if (qualityInspectionManagement.getWarehouseInOutId()!=null){
+                WarehouseInOutInfo warehouseInOutInfo=warehouseInOutInfoService.selectById(qualityInspectionManagement.getWarehouseInOutId());
+                if (warehouseInOutInfo!=null){
+                    warehouseInOutInfo.setCarNo(weighingManagement.getCarNumber());
+                    warehouseInOutInfoService.updateById(warehouseInOutInfo);
+                }
+            }
         }
         }
 //        if ("3".equals(weighingManagement.getManagementType())){
 //        if ("3".equals(weighingManagement.getManagementType())){
 //
 //
@@ -302,7 +310,15 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
             //状态改为已称皮重
             //状态改为已称皮重
 //            qualityInspectionManagement1.setStatus(StatusEnum.TARED.getName());
 //            qualityInspectionManagement1.setStatus(StatusEnum.TARED.getName());
 //            qualityInspectionManagement1.setStatusFlag(StatusEnum.TARED.getFlag());
 //            qualityInspectionManagement1.setStatusFlag(StatusEnum.TARED.getFlag());
+            qualityInspectionManagement1.setCarNumber(weighingManagement.getCarNumber());
             qualityInspectionManagementService.updateById(qualityInspectionManagement1);
             qualityInspectionManagementService.updateById(qualityInspectionManagement1);
+            if (qualityInspectionManagement1.getWarehouseInOutId()!=null){
+                WarehouseInOutInfo warehouseInOutInfo=warehouseInOutInfoService.selectById(qualityInspectionManagement1.getWarehouseInOutId());
+                if (warehouseInOutInfo!=null){
+                    warehouseInOutInfo.setCarNo(weighingManagement.getCarNumber());
+                    warehouseInOutInfoService.updateById(warehouseInOutInfo);
+                }
+            }
         }
         }
         //收购业务
         //收购业务
         if("1".equals(weighingManagement1.getManagementType())&&"3".equals(weighingManagement1.getServiceManagementType())){
         if("1".equals(weighingManagement1.getManagementType())&&"3".equals(weighingManagement1.getServiceManagementType())){

+ 1 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/CargoTitleDetailsMapper.xml

@@ -41,6 +41,7 @@
         warehouse_name as warehouseName,
         warehouse_name as warehouseName,
         transfer_flag as transferFlag,
         transfer_flag as transferFlag,
         agent,
         agent,
+        address_url as addressUrl,
         amount_ing_payable as amountIngPayable,
         amount_ing_payable as amountIngPayable,
         amount_ed_payable as amountEdPayable,
         amount_ed_payable as amountEdPayable,
         amount_not_payable as amountNotPayable,
         amount_not_payable as amountNotPayable,