学校、达沃特需求修改

Signed-off-by: sunhz <mpcoo@foxmail.com>

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/Order.java

@@ -18,6 +18,7 @@ package org.springblade.purchase.sales.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -817,4 +818,27 @@ public class Order implements Serializable {
 	@ApiModelProperty(value = "大尺寸比例")
 	private String largeScale;
 
+	/**
+	 * 生成采购
+	 */
+	@ApiModelProperty(value = "生成采购")
+	private Integer createPurchase;
+	/**
+	 * 生成采购时间
+	 */
+	@ApiModelProperty(value = "生成采购时间")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date createPurchaseTime;
+	/**
+	 * 生成收发货
+	 */
+	@ApiModelProperty(value = "生成收发货")
+	private Integer createReceiving;
+	/**
+	 * 生成收发货
+	 */
+	@ApiModelProperty(value = "生成收发货")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date createReceivingTime;
+
 }

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/entity/Order.java

@@ -710,4 +710,16 @@ public class Order extends OrderBase {
 	@TableField(exist = false)
 	private List<OrderItems> itemsList;
 
+	/**
+	 * 生成收发货
+	 */
+	@ApiModelProperty(value = "生成收发货")
+	private Integer createReceiving;
+	/**
+	 * 生成收发货
+	 */
+	@ApiModelProperty(value = "生成收发货")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date createReceivingTime;
+
 }

blade-service/blade-client/src/main/java/org/springblade/client/school/excel/SchoolTeacherExcel.java

@@ -71,7 +71,7 @@ public class SchoolTeacherExcel implements Serializable {
 	/**
 	 * 是否班主任
 	 */
-	@ExcelProperty(value = "正版/副班")
+	@ExcelProperty(value = "正班/副班")
 	private String doubleTeachers;
 	/**
 	 * 职务

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryServiceImpl.java

@@ -489,7 +489,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 
 		Long storageId = select.getStorageId();
 		//收货凭证
-		/*if ("681169".equals(select.getTenantId())) {
+		if ("681169".equals(select.getTenantId())) {
 			//todo
 			try {
 				String accountName = select.getBelongCompany();
@@ -500,7 +500,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			} catch (Exception exception) {
 				throw new SecurityException(exception.getMessage());
 			}
-		}*/
+		}
 
 
 		if (select.getDeliveryStatus() == null || "已收货".equals(select.getDeliveryStatus())) {

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderMapper.xml

@@ -458,7 +458,7 @@ FROM
 	LEFT JOIN business_order_items item ON bo.id = item.pid
 WHERE
 	bo.is_deleted = '0'
-	AND bo.`status` = '3'
+	AND bo.`status` != '0'
 	AND bo.settlment_amount = '0.00'
 	AND item.is_deleted = '0'
 	AND bo.tenant_id = #{tenantId}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -363,6 +363,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		//获取订单费用明细数据
 		List<OrderFees> orderFeesList = orderFeesService.getOrderFees(order);
 		orderMessage.setOrderFeesList(orderFeesList);
+
+		Order temp = new Order();
+		temp.setId(order.getId());
+		temp.setCreateReceiving(1);
+		temp.setCreateReceivingTime(new Date());
+		baseMapper.updateById(temp);
 		return orderMessage;
 	}
 
@@ -492,6 +498,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				}
 			});
 		}
+
+		Order temp = new Order();
+		temp.setId(order.getId());
+		temp.setCreatePurchase(1);
+		temp.setCreatePurchaseTime(new Date());
+		baseMapper.updateById(temp);
 		return R.data(order);
 	}
 

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

@@ -1974,7 +1974,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			//补贴项
 			item.setSubsidy(item.getWx().add(item.getMaternityLeaveSalary()).add(item.getOvertimeAtWeekend()).add(item.getYearUpPerformance()).add(item.getYearDownPerformance()).add(item.getCadreAllowanceReservation()).add(item.getVacationOvertimePay()).add(item.getNewPostTrain()).add(item.getWinningPrize()).add(item.getClassMinister()).add(item.getMonthViceClassFee()).add(item.getSafetyFees()).add(item.getReserveReplacement()));
 			//扣除项
-			item.setDeductions(item.getAttendance().add(item.getInspectorFines()).add(item.getTelephoneBill()).add(item.getLearningPower()).add(item.getDormitoryManagementFee()).add(item.getChildbirthAllowance()).add(item.getRibbon()).add(item.getRibbonOne()).add(item.getRibbonTwo()).add(item.getRibbonThree()).add(item.getRibbonFour()).add(item.getRibbonFive()).add(item.getRibbonSix()).add(item.getRibbonSeven()).add(item.getRibbonEight()).add(item.getRibbonNine()));
+			item.setDeductions(item.getAttendance().add(item.getInspectorFines()).add(item.getTelephoneBill()).add(item.getLearningPower()).add(item.getDormitoryManagementFee()).add(item.getChildbirthAllowance()).add(item.getPauseNoPay()).add(item.getRibbonOne()).add(item.getRibbonTwo()).add(item.getRibbonThree()).add(item.getRibbonFour()).add(item.getRibbonFive()).add(item.getRibbonSix()).add(item.getRibbonSeven()).add(item.getRibbonEight()).add(item.getRibbonNine()));
 			//日常考核工资
 			item.setDailyAssessmentSalary(item.getDailyAssessmentSalary().subtract(item.getVirtualDailyAssessmentCriteria()));
 			//应发工资  保险（个人部分）提取 字段值大于440 应付工资字段就不加保险（个人部分）否则就加上