基础信息管理 设备组线调整

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);

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,