1.增加盘点单查询接口,增加查询参数和返回结果实体类

feature-order-fix
x_z 2 years ago
parent e3f7321a5e
commit 4197d73c5c

@ -1,6 +1,8 @@
package com.glxp.api.admin.dao.inventory;
import com.glxp.api.admin.entity.inventory.InvCountOrder;
import com.glxp.api.admin.req.inventory.FilterInvCountOrderRequest;
import com.glxp.api.admin.res.inventory.InvCountOrderResponse;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -23,4 +25,11 @@ public interface InvCountOrderDao {
int updateBatch(List<InvCountOrder> list);
int batchInsert(@Param("list") List<InvCountOrder> list);
/***
*
* @param filterInvCountOrderRequest
* @return
*/
List<InvCountOrderResponse> selectList(FilterInvCountOrderRequest filterInvCountOrderRequest);
}

@ -0,0 +1,43 @@
package com.glxp.api.admin.entity.inventory;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.req.inventory.FilterInvCountOrderRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.inventory.InvCountOrderResponse;
import com.glxp.api.admin.service.inventory.InvCountOrderService;
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;
/**
*
*/
@Slf4j
@RestController
public class InvCountOrderController {
@Resource
private InvCountOrderService invCountOrderService;
/**
*
*
* @param filterInvCountOrderRequest
* @return
*/
@GetMapping("/invCount/order/filterList")
public BaseResponse filterList(FilterInvCountOrderRequest filterInvCountOrderRequest) {
List<InvCountOrderResponse> list = invCountOrderService.filterList(filterInvCountOrderRequest);
PageInfo<InvCountOrderResponse> pageInfo = new PageInfo<>(list);
PageSimpleResponse<InvCountOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(pageInfo.getList());
return ResultVOUtils.success(pageSimpleResponse);
}
}

@ -0,0 +1,29 @@
package com.glxp.api.admin.req.inventory;
import com.glxp.api.admin.req.ListPageRequest;
import lombok.Data;
@Data
public class FilterInvCountOrderRequest extends ListPageRequest {
/**
*
*/
private String invStorageCode;
/**
*
*/
private String invWarehouseCode;
/**
*
*/
private String invSpaceCode;
/**
* ID
*/
private String customerId;
}

@ -0,0 +1,27 @@
package com.glxp.api.admin.res.inventory;
import com.glxp.api.admin.entity.inventory.InvCountOrder;
import lombok.Data;
/**
*
*/
@Data
public class InvCountOrderResponse extends InvCountOrder {
/**
*
*/
private String invStorageName;
/**
*
*/
private String invSubStorageName;
/**
*
*/
private String invSpaceName;
}

@ -1,7 +1,21 @@
package com.glxp.api.admin.service.inventory;
import com.glxp.api.admin.req.inventory.FilterInvCountOrderRequest;
import com.glxp.api.admin.res.inventory.InvCountOrderResponse;
import java.util.List;
/**
* Service
*/
public interface InvCountOrderService {
/**
*
*
* @param filterInvCountOrderRequest
* @return
*/
List<InvCountOrderResponse> filterList(FilterInvCountOrderRequest filterInvCountOrderRequest);
}

@ -1,12 +1,34 @@
package com.glxp.api.admin.service.inventory.impl;
import com.github.pagehelper.PageHelper;
import com.glxp.api.admin.dao.inventory.InvCountOrderDao;
import com.glxp.api.admin.req.inventory.FilterInvCountOrderRequest;
import com.glxp.api.admin.res.inventory.InvCountOrderResponse;
import com.glxp.api.admin.service.inventory.InvCountOrderService;
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
@Transactional(rollbackFor = Exception.class)
public class InvCountOrderServiceImpl implements InvCountOrderService {
@Resource
private InvCountOrderDao invCountOrderDao;
@Override
public List<InvCountOrderResponse> filterList(FilterInvCountOrderRequest filterInvCountOrderRequest) {
if (null == filterInvCountOrderRequest) {
return Collections.emptyList();
}
if (null != filterInvCountOrderRequest.getPage() && null != filterInvCountOrderRequest.getLimit()) {
PageHelper.offsetPage((filterInvCountOrderRequest.getPage() - 1) * filterInvCountOrderRequest.getLimit(), filterInvCountOrderRequest.getLimit());
}
return invCountOrderDao.selectList(filterInvCountOrderRequest);
}
}

@ -1,8 +1,8 @@
server.port=9991
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.jdbc-url=jdbc:mysql://192.168.0.109:3306/udiwms_ph1?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.jdbc-url=jdbc:mysql://192.168.235.137:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.username=root
spring.datasource.password=123456
spring.datasource.password=root
spring.datasource.hikari.connection-timeout=60000
spring.datasource.hikari.maximum-pool-size=60
spring.datasource.hikari.minimum-idle=10
@ -14,7 +14,7 @@ UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df
UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test
SPMS_KEY=lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
spring.redis.database=8
spring.redis.host=127.0.0.1
spring.redis.host=192.168.235.137
spring.redis.port=6379
spring.redis.password=
spring.redis.jedis.pool.max-active=8

@ -262,12 +262,43 @@
updateTime, auditUser, auditTime, `status`, remark)
values
<foreach collection="list" item="item" separator=",">
(#{item.id,jdbcType=INTEGER}, #{item.orderid,jdbcType=VARCHAR}, #{item.invstoragecode,jdbcType=VARCHAR},
#{item.invwarehousecode,jdbcType=VARCHAR}, #{item.invspacecode,jdbcType=VARCHAR},
#{item.createuser,jdbcType=VARCHAR}, #{item.createtime,jdbcType=TIMESTAMP},
#{item.updatetime,jdbcType=TIMESTAMP},
#{item.audituser,jdbcType=VARCHAR}, #{item.audittime,jdbcType=TIMESTAMP}, #{item.status,jdbcType=BOOLEAN},
(#{item.id,jdbcType=INTEGER}, #{item.orderId,jdbcType=VARCHAR}, #{item.invStorageCode,jdbcType=VARCHAR},
#{item.invWarehouseCode,jdbcType=VARCHAR}, #{item.invSpaceCode,jdbcType=VARCHAR},
#{item.createUser,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP},
#{item.updateTime,jdbcType=TIMESTAMP},
#{item.auditUser,jdbcType=VARCHAR}, #{item.auditTime,jdbcType=TIMESTAMP}, #{item.status,jdbcType=BOOLEAN},
#{item.remark,jdbcType=VARCHAR})
</foreach>
</insert>
<select id="selectList" resultType="com.glxp.api.admin.res.inventory.InvCountOrderResponse">
select co.id,
co.orderId,
co.invStorageCode,
co.invWarehouseCode,
co.invSpaceCode,
co.createUser,
co.createTime,
co.updateTime,
co.auditUser,
co.auditTime,
co.status,
co.remark,
w.name as invStorageName,
ws.name as invSubStorageName
from inv_count_order co
left join inv_warehouse w on co.invStorageCode = w.code
left join inv_warehouse_sub ws on co.invWarehouseCode = ws.code
<where>
<if test="invStorageCode != null and invStorageCode != ''">
AND co.invStorageCode = #{invStorageCode}
</if>
<if test="invWarehouseCode != null and invWarehouseCode != ''">
AND co.invWarehouseCode = #{invWarehouseCode}
</if>
<if test="invSpaceCode != null and invSpaceCode != ''">
AND co.invSpaceCode = #{invSpaceCode}
</if>
</where>
</select>
</mapper>
Loading…
Cancel
Save