UDI
/
udiwms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.库存养护详情添加养护时间和更新时间字段

Browse Source 
2.修复库存养护功能bug
feature-order-fix
x_z 3 years ago
parent bd4ae76e61
commit 9905450be6
7 changed files with 104 additions and 8 deletions
Show Stats Download Patch File Download Diff File

4
api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvMAOrderController.java
Unescape Escape View File

@ -122,11 +122,11 @@ public class InvMAOrderController {
* @return
*/
@PostMapping("/inv/MA/order/delete")
public BaseResponse delete(FilterInvMAOrderRequest filterInvMAOrderRequest, BindingResult bindingResult) {
public BaseResponse delete(@RequestBody FilterInvMAOrderRequest filterInvMAOrderRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (null == filterInvMAOrderRequest || null == filterInvMAOrderRequest.getId() || null == filterInvMAOrderRequest.getStatus()) {
if (null == filterInvMAOrderRequest || null == filterInvMAOrderRequest.getId()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数不能为空！");
}
return invMAOrderService.delete(filterInvMAOrderRequest.getId());

26
api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceOrderDetailDao.java
Unescape Escape View File

@ -52,4 +52,30 @@ public interface InvMaintenanceOrderDetailDao {
* @return
*/
InvMaintenanceOrderDetailEntity selectByOrderIdAndCode(@Param("orderIdFk") String orderIdFk, @Param("code") String code);
/**
* 查询养护记录详情
*
* @param orderId
* @return
*/
List<InvMaintenanceOrderDetailEntity> selectByOrderId(@Param("orderId") String orderId);
/**
* 更新养护记录详情时间
*
* @param id 养护记录详情ID
* @param createTime 养护时间
* @param updateTime 更新时间
* @return
*/
int updateTime(@Param("id") Integer id, @Param("createTime") String createTime, @Param("updateTime") String updateTime);
/**
* 查询库存养护记录详情ID集合
*
* @param orderId
* @return
*/
List<Integer> selectDetailIds(@Param("orderId") String orderId);
}

10
api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvMaintenanceOrderDetailEntity.java
Unescape Escape View File

@ -64,4 +64,14 @@ public class InvMaintenanceOrderDetailEntity {
* 备注
*/
private String remark;
/**
* 养护时间
*/
private String createTime;
/**
* 更新时间
*/
private String updateTime;
}

6
api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderDetailServiceImpl.java
Unescape Escape View File

@ -1,6 +1,8 @@
package com.glxp.api.admin.service.inventory.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageHelper;
import com.glxp.api.admin.constant.ConstantType;
@ -66,6 +68,7 @@ public class InvMAOrderDetailServiceImpl implements InvMAOrderDetailService {
if (null != maintenanceOrderDetailEntity) {
if (StrUtil.isBlank(udi.getSerialNo()) || (StrUtil.isBlank(udi.getBatchNo()) && StrUtil.isBlank(udi.getSerialNo()))) {
maintenanceOrderDetailEntity.setCount(maintenanceOrderDetailEntity.getCount() + 1);
maintenanceOrderDetailEntity.setUpdateTime(DateUtil.date().toString(DatePattern.NORM_DATETIME_PATTERN));
invMAOrderDetailDao.updateByPrimaryKey(maintenanceOrderDetailEntity);
} else {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "条码重复！");
@ -97,6 +100,7 @@ public class InvMAOrderDetailServiceImpl implements InvMAOrderDetailService {
if (null != invMaintenanceExplanation) {
invMaintenanceOrderDetailEntity.setRemark(invMaintenanceExplanation.getText());
}
invMaintenanceOrderDetailEntity.setCreateTime(DateUtil.date().toString(DatePattern.NORM_DATETIME_PATTERN));
invMAOrderDetailDao.insert(invMaintenanceOrderDetailEntity);
} else {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "当前仓库中不存在此产品，无法进行养护！");
@ -175,6 +179,7 @@ public class InvMAOrderDetailServiceImpl implements InvMAOrderDetailService {
maOrderDetail.setCount(codeMap.get(code));
maOrderDetail.setMaintenanceStatus(0);
maOrderDetail.setDeviceStatus(1);
maOrderDetail.setCreateTime(DateUtil.date().toString(DatePattern.NORM_DATETIME_PATTERN));
if (null != invMaintenanceExplanation) {
maOrderDetail.setRemark(invMaintenanceExplanation.getText());
}
@ -187,6 +192,7 @@ public class InvMAOrderDetailServiceImpl implements InvMAOrderDetailService {
@Override
public BaseResponse update(InvMaintenanceOrderDetailEntity invMaintenanceOrderDetailEntity) {
invMaintenanceOrderDetailEntity.setUpdateTime(DateUtil.date().toString(DatePattern.NORM_DATETIME_PATTERN));
invMAOrderDetailDao.updateByPrimaryKey(invMaintenanceOrderDetailEntity);
return ResultVOUtils.success("更新成功！");
}

3
api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderServiceImpl.java
Unescape Escape View File

@ -111,6 +111,7 @@ public class InvMAOrderServiceImpl implements InvMAOrderService {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
maintenanceOrder.setStatus(status);
maintenanceOrder.setAuditTime(DateUtil.date().toString(DatePattern.NORM_DATETIME_PATTERN));
maintenanceOrder.setUpdateTime(DateUtil.date().toString(DatePattern.NORM_DATETIME_PATTERN));
invMAOrderDao.updateByPrimaryKey(maintenanceOrder);
return ResultVOUtils.success("更新成功");
@ -123,7 +124,7 @@ public class InvMAOrderServiceImpl implements InvMAOrderService {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "此记录不存在！");
}
//删除养护记录和详情
invMAOrderDao.selectByPrimaryKey(id);
invMAOrderDao.deleteByPrimaryKey(id);
invMAOrderDetailDao.deleteByOrderId(maintenanceOrder.getOrderId());
return ResultVOUtils.success("删除成功");
}

59
api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDetailDao.xml
Unescape Escape View File

@ -14,6 +14,8 @@
<result column="maintenanceStatus" jdbcType="INTEGER" property="maintenanceStatus"/>
<result column="deviceStatus" jdbcType="INTEGER" property="deviceStatus"/>
<result column="remark" jdbcType="VARCHAR" property="remark"/>
<result column="createTime" jdbcType="VARCHAR" property="createTime"/>
<result column="updateTime" jdbcType="VARCHAR" property="updateTime"/>
</resultMap>
<sql id="Base_Column_List">
@ -28,7 +30,9 @@
`count`,
maintenanceStatus,
deviceStatus,
remark
remark,
createTime,
updateTime
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@ -49,11 +53,12 @@
insert into inv_maintenance_order_detail (orderIdFk, code, productId,
nameCode, batchNo, produceDate,
expireDate, `count`, maintenanceStatus,
deviceStatus, remark)
deviceStatus, remark, createTime, updateTime)
values (#{orderIdFk,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, #{productId,jdbcType=VARCHAR},
#{nameCode,jdbcType=VARCHAR}, #{batchNo,jdbcType=VARCHAR}, #{produceDate,jdbcType=VARCHAR},
#{expireDate,jdbcType=VARCHAR}, #{count,jdbcType=INTEGER}, #{maintenanceStatus,jdbcType=INTEGER},
#{deviceStatus,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR})
#{deviceStatus,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR},
#{updateTime,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id"
@ -93,6 +98,12 @@
<if test="remark != null">
remark,
</if>
<if test="createTime != null">
createTime,
</if>
<if test="updateTime != null">
updateTime,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="orderIdFk != null">
@ -128,6 +139,12 @@
<if test="remark != null">
#{remark,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
#{createTime,jdbcType=VARCHAR},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=VARCHAR},
</if>
</trim>
</insert>
@ -168,6 +185,12 @@
<if test="remark != null">
remark = #{remark,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
createTime = #{createTime,jdbcType=VARCHAR},
</if>
<if test="updateTime != null">
updateTime = #{updateTime,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
@ -184,7 +207,9 @@
`count` = #{count,jdbcType=INTEGER},
maintenanceStatus = #{maintenanceStatus,jdbcType=INTEGER},
deviceStatus = #{deviceStatus,jdbcType=INTEGER},
remark = #{remark,jdbcType=VARCHAR}
remark = #{remark,jdbcType=VARCHAR},
createTime = #{createTime,jdbcType=VARCHAR},
updateTime = #{updateTime,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER}
</update>
@ -213,6 +238,8 @@
mad.maintenanceStatus,
mad.deviceStatus,
mad.remark,
mad.createTime,
mad.updateTime,
basic_products.cpmctymc productName,
ip.ggxh,
basic_products.zczbhhzbapzbh,
@ -239,4 +266,28 @@
where orderIdFk = #{orderIdFk}
and code = #{code}
</select>
<select id="selectByOrderId" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from inv_maintenance_order_detail
WHERE orderIdFk = #{orderId}
</select>
<update id="updateTime">
update inv_maintenance_order_detail
<set>
<if test="createTime != null and createTime != ''">
createTime = #{createTime,jdbcType=VARCHAR},
</if>
<if test="updateTime != null and updateTime != ''">
updateTime = #{updateTime,jdbcType=VARCHAR},
</if>
</set>
where id = #{id}
</update>
<select id="selectDetailIds" resultType="java.lang.Integer">
select id from inv_maintenance_order_detail where orderIdFk = #{orderId}
</select>
</mapper>

4
scripts/库存养护功能表.sql
Unescape Escape View File

@ -30,8 +30,10 @@ CREATE TABLE `inv_maintenance_order_detail` (
`maintenanceStatus` tinyint(1) NULL DEFAULT NULL COMMENT '养护状态 0：未养护 1：已养护',
`deviceStatus` tinyint(1) NULL DEFAULT NULL COMMENT '设备状态 0：异常 1：正常',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
`createTime` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '养护时间',
`updateTime` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '养护单据详情表' ROW_FORMAT = Dynamic;
) ENGINE = InnoDB AUTO_INCREMENT = 46 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '养护单据详情表' ROW_FORMAT = Dynamic;
# 养护说明表
DROP TABLE IF EXISTS `inv_maintenance_explanation`;

Write Preview
Loading…
Cancel
Save