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

Merge branch 'master' into test

Browse Source
master
anthonywj 2 years ago
parent a24dd0f1d8 3d53838777
commit 03c4bba4ec
19 changed files with 54 additions and 61 deletions
Show Stats Download Patch File Download Diff File

3
src/main/java/com/glxp/api/constant/ConstantStatus.java
Unescape Escape View File

@ -70,11 +70,12 @@ public class ConstantStatus {
/**
* 单据创建类型 2.新增扫码单据，1、新增业务单据，3、正常单据处理
* 单据创建类型 2.新增扫码单据，1、新增业务单据，3、正常单据处理,4:带配货页面
*/
public static final Integer ORDER_TYPE_BIZ = 1;
public static final Integer ORDER_TYPE_SCAN = 2;
public static final Integer ORDER_TYPE_NORMAL = 3;
public static final Integer ORDER_TYPE_WAIT = 4;
/**
* 供应商自助平台单据类型

2
src/main/java/com/glxp/api/controller/auth/InvBusUserController.java
Unescape Escape View File

@ -132,8 +132,8 @@ public class InvBusUserController {
@PostMapping("/spms/bus/user/warehouse/post")
@Log(title = "用户管理", businessType = BusinessType.INSERT)
public BaseResponse postRes(@RequestBody UpdateUserRelBusRequset relBusRequset) {
if (CollUtil.isNotEmpty(relBusRequset.getSelectActions())) {
invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode());
if (CollUtil.isNotEmpty(relBusRequset.getSelectActions())) {
relBusRequset.getSelectActions().forEach(action ->
{
InvBusUserEntity invBusUserEntity = new InvBusUserEntity();

2
src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
Unescape Escape View File

@ -583,7 +583,7 @@ public class InvWarehouseController extends BaseController {
@AuthRuleAnnotation("")
@PostMapping("/warehouse/inout/delWarehouseUser")
@Log(title = "用户管理", businessType = BusinessType.DELETE)
public BaseResponse deleteWarehouseUser(Integer id) {
public BaseResponse deleteWarehouseUser(Long id) {
if (null == id)
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
WarehouseUserEntity warehouseUserEntity = warehouseUserService.selectById(id);

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

@ -228,6 +228,7 @@ public class SysUserController extends BaseController {
DeptUserEntity deptUserEntity = new DeptUserEntity();
deptUserEntity.setUserId(authAdmin.getId());
deptUserEntity.setDeptId(authUserSaveRequest.getDepts().get(i));
deptUserEntity.setUpdateTime(new Date());
list.add(deptUserEntity);
}
deptUserService.insertBatch(list);
@ -327,6 +328,7 @@ public class SysUserController extends BaseController {
DeptUserEntity deptUserEntity = new DeptUserEntity();
deptUserEntity.setUserId(authUserSaveRequest.getId());
deptUserEntity.setDeptId(authUserSaveRequest.getDepts().get(i));
deptUserEntity.setUpdateTime(new Date());
list.add(deptUserEntity);
}
deptUserService.insertBatch(list);

2
src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.controller.basic;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
@ -70,6 +71,7 @@ public class BasicBusTypeChangeController {
return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加");
}
basicBusTypeChangeEntity.setUpdateTime(new Date());
basicBusTypeChangeEntity.setId(IdUtil.getSnowflakeNextId());
basicBusTypeChangeService.insert(basicBusTypeChangeEntity);
return ResultVOUtils.success("更新成功");
}

6
src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java
Unescape Escape View File

@ -195,10 +195,10 @@ public class BasicBusTypePreController {
}
if (basicBusTypePreEntity != null) {
//判断是否重复添加
boolean result = basicBusTypePreService.verifyExists(basicBusTypePreEntity);
if (result) {
BasicBusTypePreEntity exitEntity = basicBusTypePreService.findByOriginAction(basicBusTypePreEntity.getOriginAction());
if (exitEntity != null)
return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "原单据类型已存在，不允许重复添加！");
}
if (StrUtil.isNotBlank(basicBusTypePreEntity.getDefaultInvCode())) {
InvWarehouseEntity invWarehouse = invWarehouseService.findByInvSubByCode(basicBusTypePreEntity.getDefaultInvCode());

8
src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
Unescape Escape View File

@ -632,13 +632,13 @@ public class IoCodeTempController extends BaseController {
}
if (StringUtils.isBlank(exitLocalEntity.getSerialNo())) {
if (bussinessTypeEntity.isCheckEnable() && bussinessTypeEntity.getCheckWebNew() == 1 && addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL) {
if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable()) {
String errMsg = ioCheckInoutService.checkCode(genDetaiEntity);
if (errMsg != null) {
return ResultVOUtils.error(500, errMsg);
} else
codeTempService.updateById(exitLocalEntity);
} else if (bussinessTypeEntity.isCheckEnable() && (bussinessTypeEntity.getCheckWebNew() == 2 || (bussinessTypeEntity.getCheckWebNew() == 3 && addOrderRequest.getFromVailPi() == 1)) && addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL) {
} else if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_WAIT && bussinessTypeEntity.isCheckEnable()) {
String errMsg = ioCheckInoutService.checkNoPiCode(genDetaiEntity);
if (errMsg != null) {
return ResultVOUtils.error(500, errMsg);
@ -784,13 +784,13 @@ public class IoCodeTempController extends BaseController {
}
//是否边扫边校验
if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable() && bussinessTypeEntity.getCheckWebNew() == 1) {
if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable()) {
String errMsg = ioCheckInoutService.checkCode(codeEnttity);
if (errMsg != null) {
return ResultVOUtils.error(500, errMsg);
} else
codeTempService.insert(codeEnttity);
} else if (bussinessTypeEntity.isCheckEnable() && (bussinessTypeEntity.getCheckWebNew() == 2 || (bussinessTypeEntity.getCheckWebNew() == 3 && addOrderRequest.getFromVailPi() == 1)) && addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL) {
} else if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_WAIT && bussinessTypeEntity.isCheckEnable()) {
String errMsg = ioCheckInoutService.checkNoPiCode(codeEnttity);
if (errMsg != null) {
return ResultVOUtils.error(500, errMsg);

2
src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java
Unescape Escape View File

@ -11,9 +11,7 @@ import java.util.List;
@Mapper
public interface WarehouseBussinessTypeDao extends BaseMapperPlus<WarehouseBussinessTypeDao, WarehouseBussinessTypeEntity, WarehouseBussinessTypeEntity> {
WarehouseBussinessTypeEntity selectById(Integer id);
int deleteByPrimaryKey(Integer id);
int insertSelective(WarehouseBussinessTypeEntity record);

1
src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java
Unescape Escape View File

@ -35,7 +35,6 @@ public interface WarehouseUserDao extends BaseMapperPlus<WarehouseUserDao, Wareh
int updateBatchSelective(List<WarehouseUserEntity> list);
int batchInsert(@Param("list") List<WarehouseUserEntity> list);
List<WarehouseUserEntity> selectListByCode(@Param("code") String code);

2
src/main/java/com/glxp/api/req/auth/FilterInvUserRequest.java
Unescape Escape View File

@ -6,7 +6,7 @@ import lombok.Data;
@Data
public class FilterInvUserRequest extends ListPageRequest {
private Integer id;
private Long id;
private String code;
private Long userid;
private String username;

7
src/main/java/com/glxp/api/res/PageSimpleResponse.java
Unescape Escape View File

@ -10,7 +10,12 @@ import java.util.List;
@Data
public class PageSimpleResponse<T> {
// 总数
private Long total;
private Integer total;
// 列表
private List<T> list;
public void setTotal(Long total) {
this.total = total.intValue();
}
}

7
src/main/java/com/glxp/api/service/auth/WarehouseUserService.java
Unescape Escape View File

@ -18,7 +18,7 @@ public interface WarehouseUserService {
* @return
*/
WarehouseUserEntity selectById(Integer id);
WarehouseUserEntity selectById(Long id);
List<WarehouseUserEntity> getListByCode(String code);
@ -48,7 +48,7 @@ public interface WarehouseUserService {
*
* @param id
*/
void deleteWarehouseUser(Integer id);
void deleteWarehouseUser(Long id);
void deleteByCodeAndId(Long id, String code);
@ -61,7 +61,8 @@ public interface WarehouseUserService {
* @return
*/
List<WarehouseUserEntity> getWarehouseUserList(FilterInvLinkDataRequest filterInvLinkDataRequest);
List<WarehouseUserEntity> selectNotSelectUserid(@Param("userIds")List<Long> userIds );
List<WarehouseUserEntity> selectNotSelectUserid(@Param("userIds") List<Long> userIds);
/**
* 根据分仓编码，统计用户数量

2
src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java
Unescape Escape View File

@ -75,7 +75,7 @@ public class WarehouseBussinessTypeServiceImpl implements WarehouseBussinessType
@Override
public void deleteWarehouseByssuinessType(Integer id) {
if (null != id) {
warehouseBussinessTypeDao.deleteByPrimaryKey(id);
warehouseBussinessTypeDao.deleteById(id);
}
}

12
src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.glxp.api.service.auth.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.auth.WarehouseUserDao;
import com.glxp.api.entity.auth.AuthAdmin;
@ -27,7 +28,7 @@ public class WarehouseUserServiceImpl implements WarehouseUserService {
private WarehouseUserDao warehouseUserDao;
@Override
public WarehouseUserEntity selectById(Integer id) {
public WarehouseUserEntity selectById(Long id) {
FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest();
filterInvUserRequest.setId(id);
List<WarehouseUserEntity> warehouseUserEntities = warehouseUserDao.filterList(filterInvUserRequest);
@ -74,9 +75,10 @@ public class WarehouseUserServiceImpl implements WarehouseUserService {
warehouseUserEntity.setCode(code);
warehouseUserEntity.setUsername(user.getUserName());
warehouseUserEntity.setUserid(user.getId());
warehouseUserEntity.setId(IdUtil.getSnowflakeNextId());
warehouseUserEntities.add(warehouseUserEntity);
});
warehouseUserDao.batchInsert(warehouseUserEntities);
warehouseUserDao.insertBatch(warehouseUserEntities);
}
}
@ -99,9 +101,9 @@ public class WarehouseUserServiceImpl implements WarehouseUserService {
}
@Override
public void deleteWarehouseUser(Integer id) {
public void deleteWarehouseUser(Long id) {
if (null != id) {
warehouseUserDao.deleteByPrimaryKey(id);
warehouseUserDao.deleteById(id);
}
}
@ -141,6 +143,6 @@ public class WarehouseUserServiceImpl implements WarehouseUserService {
@Override
public boolean insert(WarehouseUserEntity warehouseUserEntity) {
return warehouseUserDao.insertEntity(warehouseUserEntity)>0;
return warehouseUserDao.insertEntity(warehouseUserEntity) > 0;
}
}

2
src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java
Unescape Escape View File

@ -80,4 +80,6 @@ public interface IBasicBusTypePreService extends IService<BasicBusTypePreEntity>
* @return
*/
boolean verifyExists(BasicBusTypePreEntity basicBusTypePreEntity);
}

11
src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml
Unescape Escape View File

@ -20,12 +20,6 @@
from auth_warehouse_bustype
where id = #{id,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
<!--@mbg.generated-->
delete
from auth_warehouse_bustype
where id = #{id,jdbcType=INTEGER}
</delete>
<insert id="insertSelective" keyColumn="id" keyProperty="id"
parameterType="com.glxp.api.entity.auth.WarehouseBussinessTypeEntity" useGeneratedKeys="true">
@ -163,11 +157,6 @@
</if>
</where>
</select>
<select id="selectById" resultMap="BaseResultMap">
select *
from auth_warehouse_bustype
where id = #{id}
</select>
<select id="selectListByAction" resultMap="BaseResultMap">
select auth_warehouse_bustype.id,

10
src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml
Unescape Escape View File

@ -167,16 +167,6 @@
#{item.id,jdbcType=INTEGER}
</foreach>
</update>
<insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into auth_warehouse_user
(code, userId, userName, isDirector)
values
<foreach collection="list" item="item" separator=",">
(#{item.code,jdbcType=VARCHAR}, #{item.userid,jdbcType=BIGINT}, #{item.username,jdbcType=VARCHAR},
#{item.isDirector})
</foreach>
</insert>
<insert id="insertOrUpdateEntity" keyColumn="id" keyProperty="id"
parameterType="com.glxp.api.entity.auth.WarehouseUserEntity" useGeneratedKeys="true">
<!--@mbg.generated-->

15
src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml
Unescape Escape View File

@ -2,12 +2,13 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.api.dao.basic.BasicBusTypeChangeDao">
<select id="filterList" resultType="com.glxp.api.res.basic.BasicBusTypeChangeResponse">
SELECT
bc.*,
SELECT bc.*,
bu.NAME targetName,
(select originName from basic_bustype_change where originAction = bc.targetBusAction) as targetBusName
FROM
basic_bustype_change bc
(select originName
from basic_bustype_change
where originAction = bc.targetBusAction
limit 1) as targetBusName
FROM basic_bustype_change bc
LEFT JOIN basic_bussiness_type bu ON bc.targetAction = bu.action
<where>
<if test="originAction != null and originAction != ''">
@ -31,7 +32,8 @@
</where>
</select>
<insert id="insertOrUpdateEntity" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.entity.basic.BasicBusTypeChangeEntity" useGeneratedKeys="true">
<insert id="insertOrUpdateEntity" keyColumn="id" keyProperty="id"
parameterType="com.glxp.api.entity.basic.BasicBusTypeChangeEntity" useGeneratedKeys="true">
insert into basic_bustype_change
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
@ -96,5 +98,4 @@
busBeforeTime = #{busBeforeTime,jdbcType=TINYINT},
</trim>
</insert>
</mapper>

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

@ -337,7 +337,8 @@ CALL Pro_Temp_ColumnWork('auth_warehouse_bustype', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('auth_warehouse_user', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('auth_space', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('auth_dept_user', 'userId', 'bigint', 2);
CALL Pro_Temp_ColumnWork('auth_dept_user', 'deptId', 'bigint', 2);
CALL Pro_Temp_ColumnWork('thr_dept', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('thr_inv_warehouse', 'id', 'bigint', 2);

Write Preview
Loading…
Cancel
Save