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

1.添加库存养护记录接口

Browse Source
feature-order-fix
x_z 3 years ago
parent 1b47936969
commit 86367efddd
15 changed files with 479 additions and 26 deletions
Show Stats Download Patch File Download Diff File

5
api-admin/src/main/java/com/glxp/api/admin/constant/Constant.java
Unescape Escape View File

@ -22,6 +22,11 @@ public class Constant {
*/
public static final String COUNT_ORDER = "MP";
/**
* 养护记录前缀
*/
public static final String MA_ORDER = "MA";
public static final String dlThrProducts = "THR_DOWNLOAD_PRODUCTS";
public static final String dlThrInvProducts = "THR_DOWNLOAD_INV_PRODUCTS";
public static final String dlThrOrders = "THR_DOWNLOAD_ORDERS";

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

@ -1,8 +1,25 @@
package com.glxp.api.admin.controller.inventory;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.entity.inventory.InvMaintenanceOrderEntity;
import com.glxp.api.admin.req.inventory.FilterInvMAOrderRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.inventory.InvMAOrderResponse;
import com.glxp.api.admin.service.inventory.InvMAOrderService;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
/**
* 库存养护记录接口
*/
@ -11,6 +28,109 @@ import org.springframework.web.bind.annotation.RestController;
public class InvMAOrderController {
@Resource
private InvMAOrderService invMAOrderService;
/**
* 查询养护记录列表
*
* @param filterInvMAOrderRequest
* @return
*/
@GetMapping("/inv/MA/order/filterList")
public BaseResponse filterList(FilterInvMAOrderRequest filterInvMAOrderRequest) {
List<InvMAOrderResponse> list = invMAOrderService.filterList(filterInvMAOrderRequest);
PageInfo<InvMAOrderResponse> pageInfo = new PageInfo<>(list);
PageSimpleResponse<InvMAOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(pageInfo.getList());
return ResultVOUtils.success(pageSimpleResponse);
}
/**
* 添加养护记录
*
* @param invMaintenanceOrder
* @param bindingResult
* @return
*/
@PostMapping("/inv/MA/order/addOrder")
public BaseResponse addOrder(@RequestBody InvMaintenanceOrderEntity invMaintenanceOrder, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
return invMAOrderService.addOrder(invMaintenanceOrder);
}
/**
* 更新养护记录
*
* @param invMaintenanceOrder
* @param bindingResult
* @return
*/
@PostMapping("/inv/MA/order/update")
public BaseResponse update(@RequestBody InvMaintenanceOrderEntity invMaintenanceOrder, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (null == invMaintenanceOrder || StrUtil.isBlank(invMaintenanceOrder.getOrderId())) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数不能为空！");
}
return invMAOrderService.update(invMaintenanceOrder);
}
/**
* 提交审核
*
* @param orderId
* @return
*/
@PostMapping("/inv/MA/order/submitAudit")
public BaseResponse submitAudit(@RequestBody FilterInvMAOrderRequest filterInvMAOrderRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (null == filterInvMAOrderRequest || null == filterInvMAOrderRequest.getId()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数不能为空");
}
return invMAOrderService.submitAudit(filterInvMAOrderRequest.getId());
}
/**
* 更新养护记录状态
*
* @param filterInvMAOrderRequest
* @param bindingResult
* @return
*/
@PostMapping("/inv/MA/order/updateStatus")
public BaseResponse updateStatus(@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()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数不能为空！");
}
return invMAOrderService.updateStatus(filterInvMAOrderRequest.getId(), filterInvMAOrderRequest.getStatus());
}
/**
* 删除养护记录
*
* @param filterInvMAOrderRequest
* @param bindingResult
* @return
*/
@PostMapping("/inv/MA/order/delete")
public BaseResponse delete(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()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数不能为空！");
}
return invMAOrderService.delete(filterInvMAOrderRequest.getId());
}
}

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

@ -1,8 +1,19 @@
package com.glxp.api.admin.controller.inventory;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.req.inventory.FilterInvMAOrderDetailRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.inventory.InvMAOrderDetailResponse;
import com.glxp.api.admin.service.inventory.InvMAOrderDetailService;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
/**
* 库存养护记录详情接口
*/
@ -10,7 +21,24 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
public class InvMAOrderDetailController {
@Resource
private InvMAOrderDetailService invMAOrderDetailService;
/**
* 查询养护记录详情
*
* @param filterInvMAOrderDetailRequest
* @return
*/
@GetMapping("/inv/MA/order/detail/filterList")
public BaseResponse filterList(FilterInvMAOrderDetailRequest filterInvMAOrderDetailRequest) {
List<InvMAOrderDetailResponse> list = invMAOrderDetailService.filterList(filterInvMAOrderDetailRequest);
PageInfo<InvMAOrderDetailResponse> pageInfo = new PageInfo<>(list);
PageSimpleResponse<InvMAOrderDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(pageInfo.getList());
return ResultVOUtils.success();
}
}

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

@ -1,6 +1,11 @@
package com.glxp.api.admin.dao.inventory;
import com.glxp.api.admin.entity.inventory.InvMaintenanceOrderEntity;
import com.glxp.api.admin.req.inventory.FilterInvMAOrderRequest;
import com.glxp.api.admin.res.inventory.InvMAOrderResponse;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface InvMaintenanceOrderDao {
@ -15,4 +20,14 @@ public interface InvMaintenanceOrderDao {
int updateByPrimaryKeySelective(InvMaintenanceOrderEntity record);
int updateByPrimaryKey(InvMaintenanceOrderEntity record);
List<InvMAOrderResponse> filterList(FilterInvMAOrderRequest filterInvMAOrderRequest);
/**
* 根据养护记录ID查询数据
*
* @param orderId
* @return
*/
InvMaintenanceOrderEntity selectByOrderId(@Param("orderId") String orderId);
}

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

@ -1,6 +1,7 @@
package com.glxp.api.admin.dao.inventory;
import com.glxp.api.admin.entity.inventory.InvMaintenanceOrderDetailEntity;
import org.apache.ibatis.annotations.Param;
public interface InvMaintenanceOrderDetailDao {
@ -15,4 +16,19 @@ public interface InvMaintenanceOrderDetailDao {
int updateByPrimaryKeySelective(InvMaintenanceOrderDetailEntity record);
int updateByPrimaryKey(InvMaintenanceOrderDetailEntity record);
/**
* 根据养护记录ID删除详情
*
* @param orderId
*/
void deleteByOrderId(@Param("orderId") String orderId);
/**
* 统计养护产品详情数量
*
* @param orderId
* @return
*/
Long countByOrderId(@Param("orderId") String orderId);
}

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

@ -51,14 +51,14 @@ public class InvMaintenanceOrderDetailEntity {
private Integer count;
/**
* 养护状态
* 养护状态 0：未养护 1：已养护
*/
private Boolean maintenanceStatus;
private Integer maintenanceStatus;
/**
* 设备状态
* 设备状态 0：异常 1：正常
*/
private Boolean deviceStatus;
private Integer deviceStatus;
/**
* 备注

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

@ -28,7 +28,7 @@ public class InvMaintenanceOrderEntity {
/**
* 状态 0：草稿 1：未审核 2：已完成
*/
private Boolean status;
private Integer status;
/**
* 养护日期

27
api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvMAOrderDetailRequest.java
Unescape Escape View File

@ -0,0 +1,27 @@
package com.glxp.api.admin.req.inventory;
import com.glxp.api.admin.req.ListPageRequest;
import lombok.Data;
/**
* 查询
*/
@Data
public class FilterInvMAOrderDetailRequest extends ListPageRequest {
/**
* 养护记录ID
*/
public String orderIdFk;
/**
* 养护状态 0：未养护 1：已养护
*/
public Integer maintenanceStatus;
/**
* 设备状态 0：异常 1：正常
*/
private Integer deviceStatus;
}

13
api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvMAOrderDetailService.java
Unescape Escape View File

@ -1,7 +1,20 @@
package com.glxp.api.admin.service.inventory;
import com.glxp.api.admin.req.inventory.FilterInvMAOrderDetailRequest;
import com.glxp.api.admin.res.inventory.InvMAOrderDetailResponse;
import java.util.List;
/**
* 库存养护记录详情Service
*/
public interface InvMAOrderDetailService {
/**
* 查询养护记录详情
*
* @param filterInvMAOrderDetailRequest
* @return
*/
List<InvMAOrderDetailResponse> filterList(FilterInvMAOrderDetailRequest filterInvMAOrderDetailRequest);
}

57
api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvMAOrderService.java
Unescape Escape View File

@ -1,7 +1,64 @@
package com.glxp.api.admin.service.inventory;
import com.glxp.api.admin.entity.inventory.InvMaintenanceOrderEntity;
import com.glxp.api.admin.req.inventory.FilterInvMAOrderRequest;
import com.glxp.api.admin.res.inventory.InvMAOrderResponse;
import com.glxp.api.common.res.BaseResponse;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 库存养护记录Service
*/
public interface InvMAOrderService {
/**
* 查询养护记录列表
*
* @param filterInvMAOrderRequest
* @return
*/
List<InvMAOrderResponse> filterList(FilterInvMAOrderRequest filterInvMAOrderRequest);
/**
* 添加养护记录
*
* @param invMaintenanceOrder
* @return
*/
BaseResponse addOrder(InvMaintenanceOrderEntity invMaintenanceOrder);
/**
* 更新养护记录
*
* @param invMaintenanceOrder
* @return
*/
BaseResponse update(InvMaintenanceOrderEntity invMaintenanceOrder);
/**
* 养护记录提交审核
*
* @param id
* @return
*/
BaseResponse submitAudit(Integer id);
/**
* 更新养护记录状态
*
* @param id
* @param status
* @return
*/
BaseResponse updateStatus(Integer id, Integer status);
/**
* 删除养护记录
*
* @param id
* @return
*/
BaseResponse delete(@Param("id") Integer id);
}

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

@ -1,12 +1,16 @@
package com.glxp.api.admin.service.inventory.impl;
import com.glxp.api.admin.dao.inventory.InvMaintenanceOrderDetailDao;
import com.glxp.api.admin.req.inventory.FilterInvMAOrderDetailRequest;
import com.glxp.api.admin.res.inventory.InvMAOrderDetailResponse;
import com.glxp.api.admin.service.inventory.InvMAOrderDetailService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
@Slf4j
@Service
@ -16,7 +20,11 @@ public class InvMAOrderDetailServiceImpl implements InvMAOrderDetailService {
@Resource
private InvMaintenanceOrderDetailDao invMAOrderDetailDao;
@Override
public List<InvMAOrderDetailResponse> filterList(FilterInvMAOrderDetailRequest filterInvMAOrderDetailRequest) {
if (null == filterInvMAOrderDetailRequest) {
return Collections.emptyList();
}
return null;
}
}

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

@ -1,12 +1,30 @@
package com.glxp.api.admin.service.inventory.impl;
import cn.hutool.core.bean.BeanUtil;
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.Constant;
import com.glxp.api.admin.dao.inventory.InvMaintenanceOrderDao;
import com.glxp.api.admin.dao.inventory.InvMaintenanceOrderDetailDao;
import com.glxp.api.admin.entity.inventory.InvMaintenanceOrderEntity;
import com.glxp.api.admin.req.inventory.FilterInvMAOrderRequest;
import com.glxp.api.admin.res.inventory.InvMAOrderResponse;
import com.glxp.api.admin.service.auth.CustomerService;
import com.glxp.api.admin.service.inventory.InvMAOrderService;
import com.glxp.api.admin.util.GennerOrderUtils;
import com.glxp.api.admin.util.OrderNoTypeBean;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
@Slf4j
@Service
@ -15,6 +33,98 @@ public class InvMAOrderServiceImpl implements InvMAOrderService {
@Resource
private InvMaintenanceOrderDao invMAOrderDao;
@Resource
private GennerOrderUtils gennerOrderUtils;
@Resource
private CustomerService customerService;
@Resource
private InvMaintenanceOrderDetailDao invMAOrderDetailDao;
@Override
public List<InvMAOrderResponse> filterList(FilterInvMAOrderRequest filterInvMAOrderRequest) {
if (null == filterInvMAOrderRequest) {
return Collections.emptyList();
}
if (null != filterInvMAOrderRequest.getPage() && null != filterInvMAOrderRequest.getLimit()) {
PageHelper.offsetPage((filterInvMAOrderRequest.getPage() - 1) * filterInvMAOrderRequest.getLimit(), filterInvMAOrderRequest.getLimit());
}
return invMAOrderDao.filterList(filterInvMAOrderRequest);
}
@Override
public BaseResponse addOrder(InvMaintenanceOrderEntity invMaintenanceOrder) {
if (null == invMaintenanceOrder || StrUtil.isBlank(invMaintenanceOrder.getInvWarehouseCode())) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数不能为空！");
}
//生成养护记录
//生成单据号
invMaintenanceOrder.setOrderId(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.MA_ORDER, "yyyyMMdd")));
//创建时间
invMaintenanceOrder.setCreateTime(DateUtil.date().toString(DatePattern.NORM_DATETIME_PATTERN));
//创建人
String createUser = customerService.getUserBean().getUserName();
invMaintenanceOrder.setCreateUser(createUser);
//设置状态为草稿
invMaintenanceOrder.setStatus(0);
invMAOrderDao.insert(invMaintenanceOrder);
return ResultVOUtils.success(invMaintenanceOrder.getOrderId());
}
@Override
public BaseResponse update(InvMaintenanceOrderEntity invMaintenanceOrder) {
//查找此单据是否存在
InvMaintenanceOrderEntity maintenanceOrder = invMAOrderDao.selectByOrderId(invMaintenanceOrder.getOrderId());
if (null == maintenanceOrder) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "此单据不存在！");
}
//复制新数据
BeanUtil.copyProperties(invMaintenanceOrder, maintenanceOrder, "id", "createTime", "createUser");
invMAOrderDao.updateByPrimaryKey(maintenanceOrder);
return ResultVOUtils.success("更新成功");
}
@Override
public BaseResponse submitAudit(Integer id) {
InvMaintenanceOrderEntity maintenanceOrder = invMAOrderDao.selectByPrimaryKey(id);
if (null == maintenanceOrder) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "此记录不存在！");
}
if (maintenanceOrder.getStatus() != 0) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "此记录已提交审核，请勿重复提交！");
}
//查询此养护记录是否添加详情
Long count = invMAOrderDetailDao.countByOrderId(maintenanceOrder.getOrderId());
if (count == 0) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "请添加养护产品！");
}
maintenanceOrder.setStatus(1);
maintenanceOrder.setUpdateTime(DateUtil.date().toString(DatePattern.NORM_DATETIME_PATTERN));
return ResultVOUtils.success("提交成功");
}
@Override
public BaseResponse updateStatus(Integer id, Integer status) {
InvMaintenanceOrderEntity maintenanceOrder = invMAOrderDao.selectByPrimaryKey(id);
if (null == maintenanceOrder || maintenanceOrder.getStatus() != 1) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
maintenanceOrder.setStatus(status);
maintenanceOrder.setUpdateTime(DateUtil.date().toString(DatePattern.NORM_DATETIME_PATTERN));
invMAOrderDao.updateByPrimaryKey(maintenanceOrder);
return ResultVOUtils.success("更新成功");
}
@Override
public BaseResponse delete(Integer id) {
InvMaintenanceOrderEntity maintenanceOrder = invMAOrderDao.selectByPrimaryKey(id);
if (null == maintenanceOrder) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "此记录不存在！");
}
//删除养护记录和详情
invMAOrderDao.selectByPrimaryKey(id);
invMAOrderDetailDao.deleteByOrderId(maintenanceOrder.getOrderId());
return ResultVOUtils.success("删除成功");
}
}

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

@ -6,7 +6,7 @@
<result column="orderId" jdbcType="VARCHAR" property="orderId"/>
<result column="invWarehouseCode" jdbcType="VARCHAR" property="invWarehouseCode"/>
<result column="invSpaceCode" jdbcType="VARCHAR" property="invSpaceCode"/>
<result column="status" jdbcType="BOOLEAN" property="status"/>
<result column="status" jdbcType="INTEGER" property="status"/>
<result column="createTime" jdbcType="VARCHAR" property="createTime"/>
<result column="updateTime" jdbcType="VARCHAR" property="updateTime"/>
<result column="auditTime" jdbcType="VARCHAR" property="auditTime"/>
@ -49,7 +49,7 @@
auditTime, `createUser`, auditUser,
remark)
values (#{orderId,jdbcType=VARCHAR}, #{invWarehouseCode,jdbcType=VARCHAR}, #{invSpaceCode,jdbcType=VARCHAR},
#{status,jdbcType=BOOLEAN}, #{createTime,jdbcType=VARCHAR}, #{updateTime,jdbcType=VARCHAR},
#{status,jdbcType=INTEGER}, #{createTime,jdbcType=VARCHAR}, #{updateTime,jdbcType=VARCHAR},
#{auditTime,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{auditUser,jdbcType=VARCHAR},
#{remark,jdbcType=VARCHAR})
</insert>
@ -100,7 +100,7 @@
#{invSpaceCode,jdbcType=VARCHAR},
</if>
<if test="status != null">
#{status,jdbcType=BOOLEAN},
#{status,jdbcType=INTEGER},
</if>
<if test="createTime != null">
#{createTime,jdbcType=VARCHAR},
@ -137,7 +137,7 @@
invSpaceCode = #{invSpaceCode,jdbcType=VARCHAR},
</if>
<if test="status != null">
`status` = #{status,jdbcType=BOOLEAN},
`status` = #{status,jdbcType=INTEGER},
</if>
<if test="createTime != null">
createTime = #{createTime,jdbcType=VARCHAR},
@ -166,7 +166,7 @@
set orderId = #{orderId,jdbcType=VARCHAR},
invWarehouseCode = #{invWarehouseCode,jdbcType=VARCHAR},
invSpaceCode = #{invSpaceCode,jdbcType=VARCHAR},
`status` = #{status,jdbcType=BOOLEAN},
`status` = #{status,jdbcType=INTEGER},
createTime = #{createTime,jdbcType=VARCHAR},
updateTime = #{updateTime,jdbcType=VARCHAR},
auditTime = #{auditTime,jdbcType=VARCHAR},
@ -176,4 +176,46 @@
where id = #{id,jdbcType=INTEGER}
</update>
<select id="filterList" resultType="com.glxp.api.admin.res.inventory.InvMAOrderResponse">
select ma.id,
ma.orderId,
ma.invWarehouseCode,
ma.invSpaceCode,
ma.status,
ma.createTime,
ma.updateTime,
ma.auditTime,
ma.createUser,
ma.auditUser,
ma.remark,
inv_warehouse_sub.name invWarehouseName,
inv_space.name invSpaceName
from inv_maintenance_order ma
left join inv_warehouse_sub on ma.invWarehouseCode = inv_warehouse_sub.code
left join inv_space on ma.invSpaceCode = inv_space.code
<where>
<if test="id != null">
AND id = #{id}
</if>
<if test="orderId != null and orderId != ''">
AND orderId = #{orderId}
</if>
<if test="invWarehouseCode != null and invWarehouseCode != ''">
AND invWarehouseCode = #{invWarehouseCode}
</if>
<if test="invSpaceCode != null and invSpaceCode != ''">
AND invSpaceCode = #{invSpaceCode}
</if>
<if test="status != null">
AND status = #{status}
</if>
</where>
</select>
<select id="selectByOrderId" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from inv_maintenance_order
where orderId = #{orderId}
</select>
</mapper>

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

@ -11,8 +11,8 @@
<result column="produceDate" jdbcType="VARCHAR" property="produceDate"/>
<result column="expireDate" jdbcType="VARCHAR" property="expireDate"/>
<result column="count" jdbcType="INTEGER" property="count"/>
<result column="maintenanceStatus" jdbcType="BOOLEAN" property="maintenanceStatus"/>
<result column="deviceStatus" jdbcType="BOOLEAN" property="deviceStatus"/>
<result column="maintenanceStatus" jdbcType="INTEGER" property="maintenanceStatus"/>
<result column="deviceStatus" jdbcType="INTEGER" property="deviceStatus"/>
<result column="remark" jdbcType="VARCHAR" property="remark"/>
</resultMap>
@ -52,8 +52,8 @@
deviceStatus, remark)
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=BOOLEAN},
#{deviceStatus,jdbcType=BOOLEAN}, #{remark,jdbcType=VARCHAR})
#{expireDate,jdbcType=VARCHAR}, #{count,jdbcType=INTEGER}, #{maintenanceStatus,jdbcType=INTEGER},
#{deviceStatus,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id"
@ -120,10 +120,10 @@
#{count,jdbcType=INTEGER},
</if>
<if test="maintenanceStatus != null">
#{maintenanceStatus,jdbcType=BOOLEAN},
#{maintenanceStatus,jdbcType=INTEGER},
</if>
<if test="deviceStatus != null">
#{deviceStatus,jdbcType=BOOLEAN},
#{deviceStatus,jdbcType=INTEGER},
</if>
<if test="remark != null">
#{remark,jdbcType=VARCHAR},
@ -160,10 +160,10 @@
`count` = #{count,jdbcType=INTEGER},
</if>
<if test="maintenanceStatus != null">
maintenanceStatus = #{maintenanceStatus,jdbcType=BOOLEAN},
maintenanceStatus = #{maintenanceStatus,jdbcType=INTEGER},
</if>
<if test="deviceStatus != null">
deviceStatus = #{deviceStatus,jdbcType=BOOLEAN},
deviceStatus = #{deviceStatus,jdbcType=INTEGER},
</if>
<if test="remark != null">
remark = #{remark,jdbcType=VARCHAR},
@ -182,9 +182,21 @@
produceDate = #{produceDate,jdbcType=VARCHAR},
expireDate = #{expireDate,jdbcType=VARCHAR},
`count` = #{count,jdbcType=INTEGER},
maintenanceStatus = #{maintenanceStatus,jdbcType=BOOLEAN},
deviceStatus = #{deviceStatus,jdbcType=BOOLEAN},
maintenanceStatus = #{maintenanceStatus,jdbcType=INTEGER},
deviceStatus = #{deviceStatus,jdbcType=INTEGER},
remark = #{remark,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER}
</update>
<delete id="deleteByOrderId">
delete
from inv_maintenance_order_detail
where orderIdFk = #{orderId}
</delete>
<select id="countByOrderId" resultType="java.lang.Long">
select count(*)
from inv_maintenance_order_detail
where orderIdFk = #{orderId}
</select>
</mapper>

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

@ -28,10 +28,10 @@ CREATE TABLE `inv_maintenance_order_detail` (
`produceDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产日期',
`expireDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '失效日期',
`count` int NULL DEFAULT NULL COMMENT '养护数量',
`maintenanceStatus` tinyint(1) NULL DEFAULT NULL COMMENT '养护状态',
`deviceStatus` tinyint(1) NULL DEFAULT NULL COMMENT '设备状态',
`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 '备注',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '养护单据详情表' ROW_FORMAT = Dynamic;
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '养护单据详情表' ROW_FORMAT = Dynamic;
SET FOREIGN_KEY_CHECKS = 1;
Write Preview
Loading…
Cancel
Save