2023年8月15日16:09:10

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

@@ -818,6 +818,12 @@ public class OrderItems implements Serializable {
 	@TableField(exist = false)
 	private String storageName;
 
+	/**
+	 * 原订单数量
+	 */
+	@ApiModelProperty(value = "原订单数量")
+	private BigDecimal primaryQuantiy;
+
 
 
 }

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

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.purchase.sales.maintenance.mapper.MaintenanceMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="maintenanceResultMap" type="org.springblade.purchase.sales.maintenance.entity.Maintenance">
-        <id column="id" property="id"/>
-        <result column="sys_no" property="sysNo"/>
-        <result column="device_id" property="deviceId"/>
-        <result column="device_name" property="deviceName"/>
-        <result column="corp_id" property="corpId"/>
-        <result column="corp_name" property="corpName"/>
-        <result column="corp_tel" property="corpTel"/>
-        <result column="device_address" property="deviceAddress"/>
-        <result column="fault_describe" property="faultDescribe"/>
-        <result column="maintenance_worker_id" property="maintenanceWorkerId"/>
-        <result column="maintenance_worker_name" property="maintenanceWorkerName"/>
-        <result column="maintenance_worker_tel" property="maintenanceWorkerTel"/>
-        <result column="maintenance_amount" property="maintenanceAmount"/>
-        <result column="repair_report_date" property="repairReportDate"/>
-        <result column="dispatching_workers" property="dispatchingWorkers"/>
-        <result column="complete_date" property="completeDate"/>
-        <result column="tonglian _payment amount" property="tonglian Payment amount"/>
-        <result column="payment status" property="payment status"/>
-        <result column="settlement amount" property="settlement amount"/>
-        <result column="remarks" property="remarks"/>
-        <result column="update_user" property="updateUser"/>
-        <result column="create_user" property="createUser"/>
-        <result column="create_time" property="createTime"/>
-        <result column="update_time" property="updateTime"/>
-        <result column="status" property="status"/>
-        <result column="is_deleted" property="isDeleted"/>
-        <result column="create_user_name" property="createUserName"/>
-        <result column="update_user_name" property="updateUserName"/>
-    </resultMap>
-
-
-    <select id="selectMaintenancePage" resultMap="maintenanceResultMap">
-        select * from business_maintenance where is_deleted = 0
-    </select>
-
-</mapper>

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

@@ -1041,6 +1041,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						items.setCreateUser(SecureUtil.getUserId());
 						items.setUpdateTime(null);
 						items.setUpdateUser(null);
+						items.setPrimaryQuantiy(items.getOrderQuantity());
 						orderItemsService.save(items);
 					});
 					// 计算主表总金额