修改

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/controller/OrderFeesController.java

@@ -25,6 +25,7 @@ import javax.validation.Valid;
 
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.purchase.sales.entity.Order;
@@ -73,6 +74,8 @@ public class OrderFeesController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入orderFees")
 	public R<IPage<OrderFees>> list(OrderFees orderFees, Query query) {
+		orderFees.setIsDeleted(0);
+		orderFees.setTenantId(SecureUtil.getTenantId());
 		IPage<OrderFees> pages = orderFeesService.page(Condition.getPage(query), Condition.getQueryWrapper(orderFees));
 		return R.data(pages);
 	}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/controller/OrderFilesController.java

@@ -25,6 +25,7 @@ import javax.validation.Valid;
 
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
@@ -66,6 +67,8 @@ public class OrderFilesController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入orderFiles")
 	public R<IPage<OrderFiles>> list(OrderFiles orderFiles, Query query) {
+		orderFiles.setIsDeleted(0);
+		orderFiles.setTenantId(SecureUtil.getTenantId());
 		IPage<OrderFiles> pages = orderFilesService.page(Condition.getPage(query), Condition.getQueryWrapper(orderFiles));
 		return R.data(pages);
 	}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/controller/OrderFreightController.java

@@ -25,6 +25,7 @@ import javax.validation.Valid;
 
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
@@ -66,6 +67,7 @@ public class OrderFreightController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入orderFreight")
 	public R<IPage<OrderFreight>> list(OrderFreight orderFreight, Query query) {
+		orderFreight.setIsDeleted(0);
 		IPage<OrderFreight> pages = orderFreightService.page(Condition.getPage(query), Condition.getQueryWrapper(orderFreight));
 		return R.data(pages);
 	}
@@ -111,7 +113,7 @@ public class OrderFreightController extends BladeController {
 		return R.status(orderFreightService.saveOrUpdate(orderFreight));
 	}
 
-	
+
 	/**
 	 * 删除 运费明细表
 	 */
@@ -122,5 +124,5 @@ public class OrderFreightController extends BladeController {
 		return R.status(orderFreightService.removeByIds(Func.toLongList(ids)));
 	}
 
-	
+
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/controller/OrderItemsController.java

@@ -17,7 +17,11 @@
 package org.springblade.purchase.sales.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.trade.purchase.order.enums.OrderTypeEnum;
+import org.springblade.client.feign.IGoodsDescClient;
+import org.springblade.client.vo.GoodsDescVO;
 import org.springblade.core.excel.util.ExcelUtil;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import io.swagger.annotations.Api;
@@ -31,11 +35,15 @@ import javax.validation.Valid;
 
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.purchase.sales.entity.Order;
+import org.springblade.purchase.sales.entity.OrderParts;
 import org.springblade.purchase.sales.excel.DealerOrderItem;
 import org.springblade.purchase.sales.excel.OrderItemsExcel;
+import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.purchase.sales.entity.OrderItems;
@@ -60,6 +68,8 @@ import java.util.List;
 public class OrderItemsController extends BladeController {
 
 	private final IOrderItemsService orderItemsService;
+	private IUserClient iUserClient;//获取用户信息
+	private IGoodsDescClient goodsDescClient;//获取商品信息
 
 	/**
 	 * 详情
@@ -79,7 +89,40 @@ public class OrderItemsController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入orderItems")
 	public R<IPage<OrderItems>> list(OrderItems orderItems, Query query) {
+		orderItems.setIsDeleted(0);
+		orderItems.setTenantId(SecureUtil.getTenantId());
 		IPage<OrderItems> pages = orderItemsService.page(Condition.getPage(query), Condition.getQueryWrapper(orderItems));
+		if (CollectionUtils.isNotEmpty(pages.getRecords())){
+			pages.getRecords().forEach(item -> {
+
+					R<User> user1 = iUserClient.userInfoById(item.getUpdateUser());
+					if (user1.isSuccess() && user1.getData() != null) {
+						item.setUpdateUserName(user1.getData().getName());
+					}
+					R<User> user = iUserClient.userInfoById(item.getCreateUser());
+					if (user.isSuccess() && user.getData() != null) {
+						item.setCreateUserName(user.getData().getName());
+					}
+
+
+					if (item.getItemId() != null) {
+						//获取商品编码,名称,规格编码,规格型号
+						R<GoodsDescVO> goodsMessage = goodsDescClient.selectGoodsMessage(item.getItemId());
+						if (goodsMessage.isSuccess() && goodsMessage.getData() != null) {
+							item.setCode(goodsMessage.getData().getCode());
+							item.setCname(goodsMessage.getData().getCname());
+							item.setTypeno(goodsMessage.getData().getTypeno());
+							item.setSpecificationAndModel(goodsMessage.getData().getSpecificationAndModel());
+							item.setEname(goodsMessage.getData().getEname());
+							item.setBrandItem(goodsMessage.getData().getBrandItem());
+							item.setSize(goodsMessage.getData().getSize());
+							item.setSpecsOne(goodsMessage.getData().getSpecsOne());
+							item.setSpecsTwo(goodsMessage.getData().getSpecsTwo());
+
+						}
+					}
+				});
+		}
 		return R.data(pages);
 	}
 

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/controller/OrderModifyController.java

@@ -25,6 +25,7 @@ import javax.validation.Valid;
 
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
@@ -66,6 +67,8 @@ public class OrderModifyController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入orderModify")
 	public R<IPage<OrderModify>> list(OrderModify orderModify, Query query) {
+		orderModify.setIsDeleted(0);
+		orderModify.setTenantId(SecureUtil.getTenantId());
 		IPage<OrderModify> pages = orderModifyService.page(Condition.getPage(query), Condition.getQueryWrapper(orderModify));
 		return R.data(pages);
 	}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/controller/OrderPartsController.java

@@ -25,6 +25,7 @@ import javax.validation.Valid;
 
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
@@ -66,6 +67,8 @@ public class OrderPartsController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入orderParts")
 	public R<IPage<OrderParts>> list(OrderParts orderParts, Query query) {
+		orderParts.setIsDeleted(0);
+		orderParts.setTenantId(SecureUtil.getTenantId());
 		IPage<OrderParts> pages = orderPartsService.page(Condition.getPage(query), Condition.getQueryWrapper(orderParts));
 		return R.data(pages);
 	}
@@ -111,7 +114,7 @@ public class OrderPartsController extends BladeController {
 		return R.status(orderPartsService.saveOrUpdate(orderParts));
 	}
 
-	
+
 	/**
 	 * 删除 订单配件表 订单明细的子表
 	 */
@@ -122,5 +125,5 @@ public class OrderPartsController extends BladeController {
 		return R.status(orderPartsService.removeByIds(Func.toLongList(ids)));
 	}
 
-	
+
 }

blade-service/blade-school/src/main/java/org/springblade/school/service/impl/SalaryItemServiceImpl.java

@@ -218,9 +218,9 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salaryItem.setUpdateTime(new Date());
 				baseMapper.updateById(salaryItem);
 				message = ++ message;
+				//更新计算工资
+				this.countSalary(salaryItem);
 			}
-			//更新计算工资
-			this.countSalary(salaryItem);
 		}
 		//保存上传记录
 		this.saveAccessory(file,id);
@@ -265,9 +265,9 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salaryItem.setUpdateTime(new Date());
 				baseMapper.updateById(salaryItem);
 				message = ++ message;
+				//更新计算工资
+				this.countSalary(salaryItem);
 			}
-			//更新计算工资
-			this.countSalary(salaryItem);
 		}
 		//保存上传记录
 		this.saveAccessory(file,id);
@@ -312,9 +312,9 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salaryItem.setUpdateTime(new Date());
 				baseMapper.updateById(salaryItem);
 				message = ++ message;
+				//更新计算工资
+				this.countSalary(salaryItem);
 			}
-			//更新计算工资
-			this.countSalary(salaryItem);
 		}
 		//保存上传记录
 		this.saveAccessory(file,id);
@@ -359,9 +359,9 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salaryItem.setUpdateTime(new Date());
 				baseMapper.updateById(salaryItem);
 				message = ++ message;
+				//更新计算工资
+				this.countSalary(salaryItem);
 			}
-			//更新计算工资
-			this.countSalary(salaryItem);
 		}
 		//保存上传记录
 		this.saveAccessory(file,id);
@@ -406,9 +406,10 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salaryItem.setUpdateTime(new Date());
 				baseMapper.updateById(salaryItem);
 				message = ++ message;
+				//更新计算工资
+				this.countSalary(salaryItem);
 			}
-			//更新计算工资
-			this.countSalary(salaryItem);
+
 		}
 		//保存上传记录
 		this.saveAccessory(file,id);
@@ -453,9 +454,9 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salaryItem.setUpdateTime(new Date());
 				baseMapper.updateById(salaryItem);
 				message = ++ message;
+				//更新计算工资
+				this.countSalary(salaryItem);
 			}
-			//更新计算工资
-			this.countSalary(salaryItem);
 		}
 		//保存上传记录
 		this.saveAccessory(file,id);
@@ -499,9 +500,9 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salaryItem.setUpdateTime(new Date());
 				baseMapper.updateById(salaryItem);
 				message = ++ message;
+				//更新计算工资
+				this.countSalary(salaryItem);
 			}
-			//更新计算工资
-			this.countSalary(salaryItem);
 		}
 		//保存上传记录
 		this.saveAccessory(file,id);
@@ -545,9 +546,9 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salaryItem.setUpdateTime(new Date());
 				baseMapper.updateById(salaryItem);
 				message = ++ message;
+				//更新计算工资
+				this.countSalary(salaryItem);
 			}
-			//更新计算工资
-			this.countSalary(salaryItem);
 		}
 		//保存上传记录
 		this.saveAccessory(file,id);
@@ -591,9 +592,9 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salaryItem.setUpdateTime(new Date());
 				baseMapper.updateById(salaryItem);
 				message = ++ message;
+				//更新计算工资
+				this.countSalary(salaryItem);
 			}
-			//更新计算工资
-			this.countSalary(salaryItem);
 		}
 		//保存上传记录
 		this.saveAccessory(file,id);
@@ -637,9 +638,9 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salaryItem.setUpdateTime(new Date());
 				baseMapper.updateById(salaryItem);
 				message = ++ message;
+				//更新计算工资
+				this.countSalary(salaryItem);
 			}
-			//更新计算工资
-			this.countSalary(salaryItem);
 		}
 		//保存上传记录
 		this.saveAccessory(file,id);
@@ -683,9 +684,9 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salaryItem.setUpdateTime(new Date());
 				baseMapper.updateById(salaryItem);
 				message = ++ message;
+				//更新计算工资
+				this.countSalary(salaryItem);
 			}
-			//更新计算工资
-			this.countSalary(salaryItem);
 		}
 		//保存上传记录
 		this.saveAccessory(file,id);
@@ -729,9 +730,9 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salaryItem.setUpdateTime(new Date());
 				baseMapper.updateById(salaryItem);
 				message = ++ message;
+				//更新计算工资
+				this.countSalary(salaryItem);
 			}
-			//更新计算工资
-			this.countSalary(salaryItem);
 		}
 		//保存上传记录
 		this.saveAccessory(file,id);
@@ -775,9 +776,9 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salaryItem.setUpdateTime(new Date());
 				baseMapper.updateById(salaryItem);
 				message = ++ message;
+				//更新计算工资
+				this.countSalary(salaryItem);
 			}
-			//更新计算工资
-			this.countSalary(salaryItem);
 		}
 		//保存上传记录
 		this.saveAccessory(file,id);
@@ -821,9 +822,9 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salaryItem.setUpdateTime(new Date());
 				baseMapper.updateById(salaryItem);
 				message = ++ message;
+				//更新计算工资
+				this.countSalary(salaryItem);
 			}
-			//更新计算工资
-			this.countSalary(salaryItem);
 		}
 		//保存上传记录
 		this.saveAccessory(file,id);
@@ -867,9 +868,9 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salaryItem.setUpdateTime(new Date());
 				baseMapper.updateById(salaryItem);
 				message = ++ message;
+				//更新计算工资
+				this.countSalary(salaryItem);
 			}
-			//更新计算工资
-			this.countSalary(salaryItem);
 		}
 		//保存上传记录
 		this.saveAccessory(file,id);
@@ -913,9 +914,9 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salaryItem.setUpdateTime(new Date());
 				baseMapper.updateById(salaryItem);
 				message = ++ message;
+				//更新计算工资
+				this.countSalary(salaryItem);
 			}
-			//更新计算工资
-			this.countSalary(salaryItem);
 		}
 		//保存上传记录
 		this.saveAccessory(file,id);
@@ -959,9 +960,9 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salaryItem.setUpdateTime(new Date());
 				baseMapper.updateById(salaryItem);
 				message = ++ message;
+				//更新计算工资
+				this.countSalary(salaryItem);
 			}
-			//更新计算工资
-			this.countSalary(salaryItem);
 		}
 		//保存上传记录
 		this.saveAccessory(file,id);
@@ -1005,9 +1006,9 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salaryItem.setUpdateTime(new Date());
 				baseMapper.updateById(salaryItem);
 				message = ++ message;
+				//更新计算工资
+				this.countSalary(salaryItem);
 			}
-			//更新计算工资
-			this.countSalary(salaryItem);
 		}
 		//保存上传记录
 		this.saveAccessory(file,id);
@@ -1051,9 +1052,9 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salaryItem.setUpdateTime(new Date());
 				baseMapper.updateById(salaryItem);
 				message = ++ message;
+				//更新计算工资
+				this.countSalary(salaryItem);
 			}
-			//更新计算工资
-			this.countSalary(salaryItem);
 		}
 		//保存上传记录
 		this.saveAccessory(file,id);
@@ -1097,9 +1098,9 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salaryItem.setUpdateTime(new Date());
 				baseMapper.updateById(salaryItem);
 				message = ++ message;
+				//更新计算工资
+				this.countSalary(salaryItem);
 			}
-			//更新计算工资
-			this.countSalary(salaryItem);
 		}
 		//保存上传记录
 		this.saveAccessory(file,id);
@@ -1162,9 +1163,9 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salaryItem.setUpdateTime(new Date());
 				baseMapper.updateById(salaryItem);
 				message = ++ message;
+				//更新计算工资
+				this.countSalary(salaryItem);
 			}
-			//更新计算工资
-			this.countSalary(salaryItem);
 		}
 		//保存上传记录
 		this.saveAccessory(file,id);
@@ -1214,9 +1215,9 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salaryItem.setUpdateTime(new Date());
 				baseMapper.updateById(salaryItem);
 				message = ++ message;
+				//更新计算工资
+				this.countSalary(salaryItem);
 			}
-			//更新计算工资
-			this.countSalary(salaryItem);
 		}
 		//保存上传记录
 		this.saveAccessory(file,id);
@@ -1266,9 +1267,9 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salaryItem.setUpdateTime(new Date());
 				baseMapper.updateById(salaryItem);
 				message = ++ message;
+				//更新计算工资
+				this.countSalary(salaryItem);
 			}
-			//更新计算工资
-			this.countSalary(salaryItem);
 		}
 		//保存上传记录
 		this.saveAccessory(file,id);
@@ -1318,9 +1319,9 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salaryItem.setUpdateTime(new Date());
 				baseMapper.updateById(salaryItem);
 				message = ++ message;
+				//更新计算工资
+				this.countSalary(salaryItem);
 			}
-			//更新计算工资
-			this.countSalary(salaryItem);
 		}
 		//保存上传记录
 		this.saveAccessory(file,id);
@@ -1369,9 +1370,9 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salaryItem.setUpdateTime(new Date());
 				baseMapper.updateById(salaryItem);
 				message = ++ message;
+				//更新计算工资
+				this.countSalary(salaryItem);
 			}
-			//更新计算工资
-			this.countSalary(salaryItem);
 		}
 		//保存上传记录
 		this.saveAccessory(file,id);
@@ -1440,28 +1441,30 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 		// 8. 应发工资 = S153(基础工资)+Z153(工作量工资)+AB153(日常考核工资)+AK153(奖励工资)+AO153(职务津贴)+AR153(班主任津贴)+BG153(补贴项)-BO153(扣除项)+BQ153(保险个人)+BS153(公积金个人)
 		// 9. 实发工资 = BT153(应发工资) - BU153(个税)-BQ153(保险个人)-BS153(公积金个人)
 		SalaryItem item = baseMapper.selectById(salaryItem.getId());
-		item.setBasicsSalary(item.getSchoolAgeSalary().add(item.getCapitalIncrease()).add(item.getEducationSalary()).add(item.getRankSalary()).add(item.getSalaryBase()));//基础工资
-		item.setWorkloadSalary(item.getMomthWorkloadSalary().add(item.getVacationOvertimePay()).add(item.getCustomWorkloadSalary()));//工作量工资
-		item.setAwardSalary(item.getCustomAward().add(item.getCustomAwardOne()).add(item.getCustomAwardTwo()).add(item.getCustomAwardThree()).add(item.getCustomAwardFour()).add(item.getCustomAwardFive()).add(item.getCustomAwardSix()).add(item.getCustomAwardSeven()).add(item.getCustomAwardEight()).add(item.getCustomAwardNine()));//奖励工资
-		item.setDutyAllowances(item.getPrepareLessons().add(item.getLeadingCadreSubsidy()).add(item.getTeachingResearch()));//职务津贴
-		item.setClassTeacherSubsidy(item.getClassTeacherFee().add(item.getClasses()));//班主任津贴
-		//补贴项
-		item.setSubsidy(item.getSafetyFees().add(item.getMonthViceClassFee()).add(item.getClassMinister()).add(item.getWinningPrize()).add(item.getNewPostTrain()).add(item.getVacationOvertimePay())
-		.add(item.getCadreAllowanceReservation()).add(item.getYearDownPerformance()).add(item.getYearUpPerformance()).add(item.getOvertimeAtWeekend()).add(item.getMaternityLeaveSalary()).add(item.getWx()));
-		//扣除项
-		item.setDeductions(item.getDormitoryManagementFee().add(item.getLearningPower()).add(item.getTelephoneBill()).add(item.getInspectorFines()).add(item.getAttendance()).add(item.getChildbirthAllowance()).add(item.getAndroidIt()));
-		//应发工资  保险（个人部分）提取 字段值大于440 应付工资字段就不加保险（个人部分）否则就加上
-		if (item.getInsurancePersonage().compareTo(new BigDecimal(440)) > 0){
-			item.setSalary(item.getBasicsSalary().add(item.getWorkloadSalary()).add(item.getDailyAssessmentSalary()).add(item.getAwardSalary()).add(item.getDutyAllowances()).add(item.getClassTeacherSubsidy())
-				.add(item.getSubsidy()).subtract(item.getDeductions()).add(item.getInsurancePersonage()).add(item.getReservedFundsPersonage()));
-		}else {
-			item.setSalary(item.getBasicsSalary().add(item.getWorkloadSalary()).add(item.getDailyAssessmentSalary()).add(item.getAwardSalary()).add(item.getDutyAllowances()).add(item.getClassTeacherSubsidy())
-				.add(item.getSubsidy()).subtract(item.getDeductions()).add(item.getInsurancePersonage()).add(item.getReservedFundsPersonage()).add(item.getInsurancePersonage()));
-		}
+		if (item != null){
+			item.setBasicsSalary(item.getSchoolAgeSalary().add(item.getCapitalIncrease()).add(item.getEducationSalary()).add(item.getRankSalary()).add(item.getSalaryBase()));//基础工资
+			item.setWorkloadSalary(item.getMomthWorkloadSalary().add(item.getVacationOvertimePay()).add(item.getCustomWorkloadSalary()));//工作量工资
+			item.setAwardSalary(item.getCustomAward().add(item.getCustomAwardOne()).add(item.getCustomAwardTwo()).add(item.getCustomAwardThree()).add(item.getCustomAwardFour()).add(item.getCustomAwardFive()).add(item.getCustomAwardSix()).add(item.getCustomAwardSeven()).add(item.getCustomAwardEight()).add(item.getCustomAwardNine()));//奖励工资
+			item.setDutyAllowances(item.getPrepareLessons().add(item.getLeadingCadreSubsidy()).add(item.getTeachingResearch()));//职务津贴
+			item.setClassTeacherSubsidy(item.getClassTeacherFee().add(item.getClasses()));//班主任津贴
+			//补贴项
+			item.setSubsidy(item.getSafetyFees().add(item.getMonthViceClassFee()).add(item.getClassMinister()).add(item.getWinningPrize()).add(item.getNewPostTrain()).add(item.getVacationOvertimePay())
+				.add(item.getCadreAllowanceReservation()).add(item.getYearDownPerformance()).add(item.getYearUpPerformance()).add(item.getOvertimeAtWeekend()).add(item.getMaternityLeaveSalary()).add(item.getWx()));
+			//扣除项
+			item.setDeductions(item.getDormitoryManagementFee().add(item.getLearningPower()).add(item.getTelephoneBill()).add(item.getInspectorFines()).add(item.getAttendance()).add(item.getChildbirthAllowance()).add(item.getAndroidIt()));
+			//应发工资  保险（个人部分）提取 字段值大于440 应付工资字段就不加保险（个人部分）否则就加上
+			if (item.getInsurancePersonage().compareTo(new BigDecimal(440)) > 0){
+				item.setSalary(item.getBasicsSalary().add(item.getWorkloadSalary()).add(item.getDailyAssessmentSalary()).add(item.getAwardSalary()).add(item.getDutyAllowances()).add(item.getClassTeacherSubsidy())
+					.add(item.getSubsidy()).subtract(item.getDeductions()).add(item.getInsurancePersonage()).add(item.getReservedFundsPersonage()));
+			}else {
+				item.setSalary(item.getBasicsSalary().add(item.getWorkloadSalary()).add(item.getDailyAssessmentSalary()).add(item.getAwardSalary()).add(item.getDutyAllowances()).add(item.getClassTeacherSubsidy())
+					.add(item.getSubsidy()).subtract(item.getDeductions()).add(item.getInsurancePersonage()).add(item.getReservedFundsPersonage()).add(item.getInsurancePersonage()));
+			}
 
-		//实发工资
-		item.setFSalary(item.getSalary().subtract(item.getPersonageTaxes()).subtract(item.getInsurancePersonage()).subtract(item.getReservedFundsPersonage()));
-		baseMapper.updateById(item);
+			//实发工资
+			item.setFSalary(item.getSalary().subtract(item.getPersonageTaxes()).subtract(item.getInsurancePersonage()).subtract(item.getReservedFundsPersonage()));
+			baseMapper.updateById(item);
+		}
 	}
 	public void saveAccessory(MultipartFile file,Long pid){
 		SalaryAccessory salaryAccessory = new SalaryAccessory();

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/controller/PurchaseOrderController.java

@@ -34,6 +34,7 @@ import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
@@ -459,5 +460,48 @@ public class PurchaseOrderController extends BladeController {
 		}
 		return R.data(iPage);
 	}
+	/**
+	 * 分页 订单明细表
+	 */
+	@GetMapping("/orderItems/list")
+	@ApiOperationSupport(order = 12)
+	@ApiOperation(value = "分页", notes = "传入orderItems")
+	public R<IPage<OrderItems>> list(OrderItems orderItems, Query query) {
+		orderItems.setIsDeleted(0);
+		orderItems.setTenantId(SecureUtil.getTenantId());
+		IPage<OrderItems> pages = orderItemsService.page(Condition.getPage(query), Condition.getQueryWrapper(orderItems));
+		if (CollectionUtils.isNotEmpty(pages.getRecords())){
+			pages.getRecords().forEach(item -> {
+
+				R<User> user1 = userClient.userInfoById(item.getUpdateUser());
+				if (user1.isSuccess() && user1.getData() != null) {
+					item.setUpdateUserName(user1.getData().getName());
+				}
+				R<User> user = userClient.userInfoById(item.getCreateUser());
+				if (user.isSuccess() && user.getData() != null) {
+					item.setCreateUserName(user.getData().getName());
+				}
+
+
+				if (item.getItemId() != null) {
+					//获取商品编码,名称,规格编码,规格型号
+					R<GoodsDescVO> goodsMessage = goodsDescClient.selectGoodsMessage(item.getItemId());
+					if (goodsMessage.isSuccess() && goodsMessage.getData() != null) {
+						item.setCode(goodsMessage.getData().getCode());
+						item.setCname(goodsMessage.getData().getCname());
+						item.setTypeno(goodsMessage.getData().getTypeno());
+						item.setSpecificationAndModel(goodsMessage.getData().getSpecificationAndModel());
+						item.setEname(goodsMessage.getData().getEname());
+						item.setBrandItem(goodsMessage.getData().getBrandItem());
+						item.setSize(goodsMessage.getData().getSize());
+						item.setSpecsOne(goodsMessage.getData().getSpecsOne());
+						item.setSpecsTwo(goodsMessage.getData().getSpecsTwo());
+
+					}
+				}
+			});
+		}
+		return R.data(pages);
+	}
 
 }