1

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

@@ -936,11 +936,15 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                         }
                     }
                 }
+                //查询销售出库报表
+                StockSaleReceiptReport stockSaleReceiptReport = stockSaleReceiptReportService.selectOne(new EntityWrapper<StockSaleReceiptReport>()
+                        .eq("warehouse_record_id",warehouseInOutInfo.getId())
+                        .eq("delete_flag","0"));
+                if(stockSaleReceiptReport != null){
+                    stockSaleReceiptReport.setDeleteFlag("1");
+                    stockSaleReceiptReportService.updateById(stockSaleReceiptReport);
+                }
             }
-        }
-        //移库出库
-        if(weighingManagement1 != null && "2".equals(weighingManagement1.getServiceManagementType()) && "移库出库".equals(weighingManagement1.getInOutType())){
-
             if(warehouseInOutInfo.getCarId() != null ){
                 //查询派车信息表
                 TranCarInfo tranCarInfo = tranCarInfoService.selectById(warehouseInOutInfo.getCarId());
@@ -952,39 +956,14 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                     //更新派车信息表
                     tranCarInfoService.updateById(tranCarInfo);
                 }
-            }
-        }
-        //销售出库
-        else if(weighingManagement1 != null && "2".equals(weighingManagement1.getServiceManagementType()) && "销售出库".equals(weighingManagement1.getInOutType())){
-
-            if(weighingManagement1.getWarehouseInOutId() != null){
-                if(warehouseInOutInfo != null){
-                    if(warehouseInOutInfo.getCarId() != null ){
-                        //查询派车信息表
-                        TranCarInfo tranCarInfo = tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
-                                .eq("car_no",warehouseInOutInfo.getCarNo())
-                                .eq("delete_flag","0"));
-                        if(tranCarInfo != null){
-                            tranCarInfo.setSubmit("1");
-                            //汽运状态改为已装车
-                            tranCarInfo.setStatus(StatusEnum.LOADED.getName());
-                            tranCarInfo.setStatusFlag(StatusEnum.LOADED.getFlag());
-                            //更新派车信息表
-                            tranCarInfoService.updateById(tranCarInfo);
-                        }
-                    }
-                    //查询销售出库报表
-                    StockSaleReceiptReport stockSaleReceiptReport = stockSaleReceiptReportService.selectOne(new EntityWrapper<StockSaleReceiptReport>()
-                            .eq("warehouse_record_id",warehouseInOutInfo.getId())
-                            .eq("delete_flag","0"));
-                    if(stockSaleReceiptReport != null){
-                        stockSaleReceiptReport.setDeleteFlag("1");
-                        stockSaleReceiptReportService.updateById(stockSaleReceiptReport);
-                    }
+                //查询汽运报表
+                TranSettlementReport tranSettlementReport=tranSettlementReportService.selectOne(new EntityWrapper<TranSettlementReport>()
+                .eq("car_id",warehouseInOutInfo.getCarId()));
+                if (tranSettlementReport!=null){
+                    tranSettlementReportService.deleteById(tranSettlementReport.getId());
                 }
             }
         }
-
         cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO,weighingManagement1.getCompId());
         cacheComponent.delPrefixKey(Const.ADMIN_WEIGHINGINFO_NUM,weighingManagement1.getCompId());
         return "OK";