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

bug修改，上架摆货修改

Browse Source
master
anthonywj 3 years ago
parent 6322a3bd03
commit 4b08aa2a4e
9 changed files with 126 additions and 19 deletions
Show Stats Download Patch File Download Diff File

10
src/main/java/com/glxp/api/controller/auth/SysUserController.java
Unescape Escape View File

@ -272,7 +272,10 @@ public class SysUserController extends BaseController {
List<DeptUserEntity> deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust);
if (deptUserEntities == null) {
deptCodeList.add(1L);
authUserSaveRequest.setDepts(deptCodeList);
if (CollUtil.isEmpty(authUserSaveRequest.getDepts()))
authUserSaveRequest.setDepts(deptCodeList);
else
authUserSaveRequest.getDepts().addAll(deptCodeList);
} else {
Boolean checkDeptId = false;
for (DeptUserEntity deptUserEntity : deptUserEntities) {
@ -284,7 +287,10 @@ public class SysUserController extends BaseController {
}
if (checkDeptId == false) {
deptCodeList.add(1L);
authUserSaveRequest.setDepts(deptCodeList);
if (CollUtil.isEmpty(authUserSaveRequest.getDepts()))
authUserSaveRequest.setDepts(deptCodeList);
else
authUserSaveRequest.getDepts().addAll(deptCodeList);
}
}

15
src/main/java/com/glxp/api/controller/inv/InvPlaceController.java
Unescape Escape View File

@ -55,6 +55,21 @@ public class InvPlaceController {
return invPlaceService.bindInvSpace(bindInvSpaceRequest);
}
/**
* 更换货位接口
*
* @param bindInvSpaceRequest
* @return
*/
@PostMapping("/spms/inv/product/changeInvSpace")
public BaseResponse changeInvSpace(@RequestBody @Valid BindInvSpaceRequest bindInvSpaceRequest) {
if (null == bindInvSpaceRequest) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
return invPlaceService.bindInvSpace(bindInvSpaceRequest);
}
/**
* 校验库存详情绑定货位信息
*

2
src/main/java/com/glxp/api/entity/system/SyncDataBustypeEntity.java
Unescape Escape View File

@ -13,7 +13,7 @@ import lombok.Data;
@TableName(value = "sync_data_bustypes")
public class SyncDataBustypeEntity {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
private Long id;
@TableField(value = "`action`")
private String action;
@TableField(value = "`name`")

3
src/main/java/com/glxp/api/res/inv/BindInvSpaceRequest.java
Unescape Escape View File

@ -50,4 +50,7 @@ public class BindInvSpaceRequest {
*/
private String orderId;
private String changeSpaceCode;
}

9
src/main/java/com/glxp/api/service/inv/InvPlaceService.java
Unescape Escape View File

@ -29,6 +29,15 @@ public interface InvPlaceService {
*/
BaseResponse bindInvSpace(BindInvSpaceRequest bindInvSpaceRequest);
/**
* 更换货位
*
* @param bindInvSpaceRequest
*/
BaseResponse changeInvSpace(BindInvSpaceRequest bindInvSpaceRequest);
/**
* 校验库存详情绑定货位信息
*

73
src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java
Unescape Escape View File

@ -138,6 +138,79 @@ public class InvPlaceServiceImpl implements InvPlaceService {
}
}
@Override
public BaseResponse changeInvSpace(BindInvSpaceRequest bindInvSpaceRequest) {
//查询仓库的部门ID
String deptCode = invWarehouseDao.selectParentIdByCode(bindInvSpaceRequest.getInvCode());
InvWarehouseEntity invWarehouseEntity = invWarehouseDao.filterGroupInvSubAndcode(bindInvSpaceRequest.getInvCode());
List<InvProductDetailEntity> list = new ArrayList<>();
if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) {
List<InvPreInProductDetailEntity> invPreInProductDetailEntities = invPreInProductDetailDao.selectList(new QueryWrapper<InvPreInProductDetailEntity>()
.select("id", "code", "relId", "batchNo")
.eq("deptCode", deptCode)
.eq("invCode", bindInvSpaceRequest.getInvCode())
.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode())
.in("code", bindInvSpaceRequest.getCodeArray())
);
for (InvPreInProductDetailEntity invPreInProductDetailEntity : invPreInProductDetailEntities) {
InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity();
BeanCopyUtils.copy(invPreInProductDetailEntity, invProductDetailEntity);
list.add(invProductDetailEntity);
}
} else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) {
List<InvPreProductDetailEntity> invPreProductDetailEntities = invPreProductDetailDao.selectList(new QueryWrapper<InvPreProductDetailEntity>()
.select("id", "code", "relId", "batchNo")
.eq("deptCode", deptCode)
.eq("invCode", bindInvSpaceRequest.getInvCode())
.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode())
.in("code", bindInvSpaceRequest.getCodeArray())
);
for (InvPreProductDetailEntity invPreInProductDetailEntity : invPreProductDetailEntities) {
InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity();
BeanCopyUtils.copy(invPreInProductDetailEntity, invProductDetailEntity);
list.add(invProductDetailEntity);
}
} else {
list = invProductDetailDao.selectList(new QueryWrapper<InvProductDetailEntity>()
.select("id", "code", "relId", "batchNo")
.eq("deptCode", deptCode)
.eq("invCode", bindInvSpaceRequest.getInvCode())
.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode())
.in("code", bindInvSpaceRequest.getCodeArray())
);
}
if (CollUtil.isNotEmpty(list)) {
List<Integer> ids = list.stream().map(InvProductDetailEntity::getId).collect(Collectors.toList());
log.info("本次更换货位的库存详情数量为：{} 条", ids.size());
if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) {
invPreInProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getChangeSpaceCode());
} else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) {
invPreProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getChangeSpaceCode());
} else {
invProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getChangeSpaceCode());
}
//添加物资上架记录
AddInvPlaceOrderRequest addInvPlaceOrderRequest = new AddInvPlaceOrderRequest();
addInvPlaceOrderRequest.setType(bindInvSpaceRequest.getType());
addInvPlaceOrderRequest.setOrderId(bindInvSpaceRequest.getOrderId());
addInvPlaceOrderRequest.setCodeList(list);
addInvPlaceOrderRequest.setInvCode(bindInvSpaceRequest.getInvCode());
addInvPlaceOrderRequest.setInvSpaceCode(bindInvSpaceRequest.getInvSpaceCode());
invPlaceOrderService.addInvPlaceOrder(addInvPlaceOrderRequest);
return ResultVOUtils.success("绑定成功！本次绑定货位的库存详情数量为：" + ids.size() + "条");
} else {
log.info("绑定货位列表查询无数据");
return ResultVOUtils.error(500, "绑定货位列表查询无数据");
}
}
@Override
public BaseResponse checkCodeSpace(BindInvSpaceRequest bindInvSpaceRequest) {
//查询仓库的部门ID

4
src/main/resources/mybatis/mapper/auth/DeptUserDao.xml
Unescape Escape View File

@ -98,8 +98,8 @@
</delete>
<insert id="insertBatch" keyProperty="id" parameterType="java.util.List">
insert INTO auth_dept_user
<insert id="insertBatch" parameterType="java.util.List">
replace INTO auth_dept_user
(deptId, userId)
values
<foreach collection="list" item="item" index="index"

26
src/main/resources/mybatis/mapper/system/SyncDataChangeBustypesDao.xml
Unescape Escape View File

@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.api.dao.system.SyncDataChangeBustypesDao">
<resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SyncDataChangeBustypesEntity">
<!--@mbg.generated-->
<!--@Table sync_data_change_bustypes-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="action" jdbcType="VARCHAR" property="action" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="outChange" jdbcType="TINYINT" property="outChange" />
<result column="orderStatus" jdbcType="TINYINT" property="orderStatus" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, `action`, `name`, outChange, orderStatus
</sql>
<resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SyncDataChangeBustypesEntity">
<!--@mbg.generated-->
<!--@Table sync_data_change_bustypes-->
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="action" jdbcType="VARCHAR" property="action"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
<result column="outChange" jdbcType="TINYINT" property="outChange"/>
<result column="orderStatus" jdbcType="TINYINT" property="orderStatus"/>
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, `action`, `name`, outChange, orderStatus
</sql>
</mapper>

1
src/main/resources/schemas/schema_v2.1.sql
Unescape Escape View File

@ -389,3 +389,4 @@ CALL Pro_Temp_ColumnWork('auth_dept_user', 'userId', 'bigint', 2);
CALL Pro_Temp_ColumnWork('auth_dept_user', 'deptId', 'bigint', 2);
CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'Id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('sup_cert', 'filePath', 'text', 2);
CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'id', 'bigint', 2);

Write Preview
Loading…
Cancel
Save