zhangyuewww 2 anni fa
parent
commit
1300243669

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

@@ -66,6 +66,10 @@ public class SalesTransferInfo extends BaseModel<SalesTransferInfo> {
      * 新运输任务
      */
     private String tranTaskNew;
+    /**
+     * 车数
+     */
+    private Integer carCount;
     /**
      * 状态标识
      */

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

@@ -62,11 +62,13 @@ public class SalesTransferInfoServiceImpl extends ServiceImpl<SalesTransferInfoM
         //生成销售转移记录
         salesTransferInfo.setId(IdGenerator.generateUUID());
         List<WarehouseInOutInfo> warehouseInOutInfoList=salesTransferInfo.getWarehouseInOutInfoList();
+        Integer count=0;
         for (WarehouseInOutInfo warehouseInOutInfo:warehouseInOutInfoList){
             warehouseInOutInfo.setSalesTransferId(salesTransferInfo.getId());
             //更新出库记录销售转移状态 审核中
             warehouseInOutInfo.setSalesTransferStatus(StatusEnum.PURCHASE_REVIEWED.getName());
             if (warehouseInOutInfo.getCarId()!=null) {
+                count=count+1;
                 TranCarInfo tranCarInfo = tranCarInfoService.selectById(warehouseInOutInfo.getCarId());
                 tranCarInfo.setSalesTransferId(salesTransferInfo.getId());
                 TranTaskInfo tranTaskInfo=tranTaskInfoService.selectById(tranCarInfo.getInfoId());
@@ -76,6 +78,7 @@ public class SalesTransferInfoServiceImpl extends ServiceImpl<SalesTransferInfoM
             }
             //他运转到自运加车
             else if(warehouseInOutInfo.getCarId()==null&&salesTransferInfo.getTranTaskNew()!=null){
+                count=count+1;
                 TranCarInfo tranCarInfo = new TranCarInfo();
                 tranCarInfo.setId(IdGenerator.generateUUID());
                 tranCarInfo.setSalesTransferId(salesTransferInfo.getId());
@@ -91,6 +94,7 @@ public class SalesTransferInfoServiceImpl extends ServiceImpl<SalesTransferInfoM
             warehouseInOutInfoService.updateById(warehouseInOutInfo);
 
         }
+        salesTransferInfo.setCarCount(count);
         this.insert(salesTransferInfo);
         // 插入操作历史
         String staffName = this.billOperateHisService.getStaffAndName();