From cfeda7559dca6755e0098e23abe7238905ae0c25 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 13 Dec 2023 17:04:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E8=AE=BE=E5=A4=87=E7=BB=84=E7=BA=BF=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/wms/service/impl/BaseEquipmentServiceImpl.java    | 5 +++--
 .../src/main/resources/mapper/wms/BaseEquipmentMapper.xml    | 5 ++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java
index e699f36a..7f01eb2a 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java
@@ -139,8 +139,8 @@ public class BaseEquipmentServiceImpl implements IBaseEquipmentService {
 	@Override
 	@DS("#header.poolName")
 	public int insertBaseEquipment(BaseEquipment baseEquipment) {
-		Date createTime = DateUtils.getNowDate();
-		baseEquipment.setCreateTime(createTime);
+		baseEquipment.setCreateTime(DateUtils.getNowDate());
+		baseEquipment.setCreateBy(SecurityUtils.getUsername());
 		String 	equipmentTypeName = baseEquipmentMapper.getEquipmentTypeName(baseEquipment);
 		String workCenterName = baseEquipmentMapper.getWorkCenterName(baseEquipment);
 		baseEquipment.setWorkshopName(workCenterName);
@@ -245,6 +245,7 @@ public class BaseEquipmentServiceImpl implements IBaseEquipmentService {
 	public int updateBaseEquipment(BaseEquipment baseEquipment) {
 
 			baseEquipment.setUpdateTime(DateUtils.getNowDate());
+		    baseEquipment.setUpdateBy(SecurityUtils.getUsername());
 			String equipmentTypeName = baseEquipmentMapper.getEquipmentTypeName(baseEquipment);
 			String workCenterName = baseEquipmentMapper.getWorkCenterName(baseEquipment);
 			baseEquipment.setWorkshopName(workCenterName);
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml
index 6615e765..b17b1ead 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml
@@ -305,8 +305,8 @@
 			<if test="sapAsset != null">#{sapAsset},</if>
 			<if test="equipmentHead != null">#{equipmentHead},</if>
 			<if test="factoryCode != null">#{factoryCode},</if>
-			<if test="equipmentStatus != null">equipmentStatus,</if>
-			<if test="equipmentCategory != null">equipmentCategory,</if>
+			<if test="equipmentStatus != null">#{equipmentStatus},</if>
+			<if test="equipmentCategory != null">#{equipmentCategory},</if>
 		</trim>
 	</insert>
 
@@ -581,7 +581,6 @@
 		where equipment_id = #{equipmentId}
 	</update>
 
-
 	<select id="selectAuxiliaryEquipmentList" parameterType="com.op.wms.domain.EquBindAuxiliaryEquipment" resultType="BaseEquipment">
 		select
 		ebac.auxiliary_equipment_code AS equipmentCode,