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

单据类型，仓库，新增寄售功能，关联库存，寄售库存，以及其他联动

Browse Source
master
anthonywj 2 years ago
parent b11264e812
commit 8a41703215
11 changed files with 173 additions and 62 deletions
Show Stats Download Patch File Download Diff File

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

@ -108,12 +108,13 @@ public class InvWarehouseController extends BaseController {
* @return
*/
@GetMapping("spms/inv/warehouse/findInvListByUser")
public BaseResponse findInvListByUser() {
public BaseResponse findInvListByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) {
Long userId = getUserId();
if (null == userId) {
return ResultVOUtils.error(ResultEnum.LOGIN_VERIFY_FALL);
}
List<InvWarehouseEntity> list = invWarehouseService.findInvListByUser(userId);
filterInvWarehouseRequest.setUserId(userId);
List<InvWarehouseEntity> list = invWarehouseService.findInvListByUser(filterInvWarehouseRequest);
return ResultVOUtils.success(list);
}
@ -421,9 +422,16 @@ public class InvWarehouseController extends BaseController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(filterInvLinkDataRequest.getCode());
//1.获取所有单据类型
FilterBussinessTypeRequest filterBussinessTypeRequest = new FilterBussinessTypeRequest();
filterBussinessTypeRequest.setEnable(true);
if (invWarehouseEntity.getAdvanceType()) {
filterBussinessTypeRequest.setAdvanceType(true);
}
List<BasicBussinessTypeEntity> basicBussinessTypeEntities = basicBussinessTypeService.findList(filterBussinessTypeRequest);
//获取仓库关联单据类型
@ -451,7 +459,7 @@ public class InvWarehouseController extends BaseController {
return ResultVOUtils.error(500, "仓库编码不能为空！");
boolean b = warehouseBussinessTypeService.deleteByCode(relBusRequset.getInvCode());
//同时对用户关联的单据类型尽心那个删除
invBusUserService.deleteByscAction(relBusRequset.getInvCode(),relBusRequset.getSelectActions());
invBusUserService.deleteByscAction(relBusRequset.getInvCode(), relBusRequset.getSelectActions());
if (CollUtil.isNotEmpty(relBusRequset.getSelectActions())) {
List<BasicBussinessTypeResponse> basicBussinessTypeResponses = new ArrayList<>();
relBusRequset.getSelectActions().forEach(action ->

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

@ -85,7 +85,7 @@ public interface InvWarehouseDao extends BaseMapperPlus<InvWarehouseDao, InvWare
* @param userId
* @return
*/
List<InvWarehouseEntity> selectInvListByUser(@Param("userId") Long userId);
List<InvWarehouseEntity> selectInvListByUser(FilterInvWarehouseRequest filterInvWarehouseRequest);
/**
* 根据仓库编码查询部门编码

100
src/main/java/com/glxp/api/entity/auth/InvWarehouseEntity.java
Unescape Escape View File

@ -1,27 +1,103 @@
package com.glxp.api.entity.auth;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@Data
@TableName(value = "auth_warehouse")
public class InvWarehouseEntity {
public String id;
public String code;
public String name;
public String parentId;
public String remark;
public boolean defaultInv;
public String thirdId;
@TableId(value = "id", type = IdType.AUTO)
private String id;
/**
* 仓库编码
*/
@TableField(value = "code")
private String code;
/**
* 仓库名称
*/
@TableField(value = "`name`")
private String name;
/**
* 部门编码
*/
@TableField(value = "parentId")
private String parentId;
/**
* 备注
*/
@TableField(value = "remark")
private String remark;
/**
* 是否系统默认仓库
*/
@TableField(value = "defaultInv")
private Boolean defaultInv;
/**
* 第三方产品编码
*/
@TableField(value = "thirdId")
private String thirdId;
/**
* 第三方产品编码
*/
@TableField(value = "thirdId1")
private String thirdId1;
/**
* 第三方产品编码
*/
@TableField(value = "thirdId2")
private String thirdId2;
/**
* 第三方产品编码
*/
@TableField(value = "thirdId3")
private String thirdId3;
/**
* 第三方产品编码
*/
@TableField(value = "thirdId4")
private String thirdId4;
/**
* 父级仓库
*/
@TableField(value = "parentCode")
private String parentCode;
/**
* 是否寄售
*/
@TableField(value = "advanceType")
private Boolean advanceType;
@TableField(exist = false)
public String thirdName;
public String thirdId1;
@TableField(exist = false)
public String thirdName1;
public String thirdId2;
@TableField(exist = false)
public String thirdName2;
public String thirdId3;
@TableField(exist = false)
public String thirdName3;
public String thirdId4;
@TableField(exist = false)
public String thirdName4;
@TableField(exist = false)
private String warehouseName;//仓库名字
private String parentCode;
}

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

@ -11,7 +11,7 @@ public class FilterInvSubWarehouseRequest extends ListPageRequest {
private String name;
private String parentId;
private Boolean defaultInv;
private Boolean advanceType;
public String thirdId;
public String thirdId1;

2
src/main/java/com/glxp/api/res/auth/InvSubWarehouseResponse.java
Unescape Escape View File

@ -21,5 +21,5 @@ public class InvSubWarehouseResponse {
private boolean defaultInv;
private String parentCode;
private String parentInvName;
private Boolean advanceType;
}

3
src/main/java/com/glxp/api/service/auth/InvWarehouseService.java
Unescape Escape View File

@ -78,8 +78,7 @@ public interface InvWarehouseService {
/**
* 查询用户关联所有仓库的编码，名称，父ID字段
*
* @param userId
* @return
*/
List<InvWarehouseEntity> findInvListByUser(Long userId);
List<InvWarehouseEntity> findInvListByUser(FilterInvWarehouseRequest filterInvWarehouseRequest);
}

4
src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java
Unescape Escape View File

@ -221,7 +221,7 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
}
@Override
public List<InvWarehouseEntity> findInvListByUser(Long userId) {
return invWarehouseDao.selectInvListByUser(userId);
public List<InvWarehouseEntity> findInvListByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) {
return invWarehouseDao.selectInvListByUser(filterInvWarehouseRequest);
}
}

2
src/main/java/com/glxp/api/service/inv/impl/InvPreProductServiceImpl.java
Unescape Escape View File

@ -63,7 +63,7 @@ public class InvPreProductServiceImpl implements InvPreProductService {
if (null == invPreProductRequest) {
return Collections.emptyList();
}
if (null != invPreProductRequest.getProductionDate() && null != invPreProductRequest.getLimit()) {
if (null != invPreProductRequest.getPage() && null != invPreProductRequest.getLimit()) {
PageHelper.offsetPage((invPreProductRequest.getPage() - 1) * invPreProductRequest.getLimit(), invPreProductRequest.getLimit());
}
return invPreProductDao.filterPreProductList(invPreProductRequest);

4
src/main/resources/application-dev.yml
Unescape Escape View File

@ -4,9 +4,9 @@ server:
spring:
datasource:
driver-class-name: com.p6spy.engine.spy.P6SpyDriver
jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_wms_wmd?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root
password: 123456
password: Glxp@6066
hikari:
connection-timeout: 60000
maximum-pool-size: 60

99
src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml
Unescape Escape View File

@ -16,6 +16,9 @@
<if test="name != '' and name != null">
AND a.name like concat('%', #{name}, '%')
</if>
<if test="advanceType != null">
AND a.advanceType = #{advanceType}
</if>
<if test="parentId != '' and parentId != null">
AND a.parentId = #{parentId}
</if>
@ -77,6 +80,9 @@
<if test="warehouseCode != '' and warehouseCode != null">
AND auth_dept.code &lt;&gt; #{warehouseCode}
</if>
<if test="advanceType != null">
AND auth_warehouse.advanceType = #{advanceType}
</if>
<if test="spUse != '' and spUse != null">
AND auth_dept.spUse = #{spUse}
</if>
@ -127,23 +133,22 @@
<insert id="insertInvSubWarehouse" keyProperty="id"
parameterType="com.glxp.api.entity.auth.InvWarehouseEntity">
replace
INTO auth_warehouse
(id, code, `name`, parentId, remark,defaultInv,parentCode
,thirdId,thirdId1,thirdId2,thirdId3,thirdId4)
values (
#{id},
#{code},
#{name},
#{parentId},
#{remark},
#{defaultInv},
#{parentCode},
#{thirdId},
#{thirdId1},
#{thirdId2},
#{thirdId3},
#{thirdId4}
)
INTO auth_warehouse
( id, code, `name`, parentId, remark, defaultInv, advanceType, parentCode
, thirdId, thirdId1, thirdId2, thirdId3, thirdId4)
values (#{id},
#{code},
#{name},
#{parentId},
#{remark},
#{defaultInv},
#{advanceType},
#{parentCode},
#{thirdId},
#{thirdId1},
#{thirdId2},
#{thirdId3},
#{thirdId4})
</insert>
@ -196,34 +201,35 @@
<if test="thirdId4 != null">
thirdId4=#{thirdId4},
</if>
<if test="advanceType != null">
advanceType=#{advanceType},
</if>
</trim>
WHERE id = #{id}
</update>
<insert id="importInvSubWarehouse" parameterType="java.util.List">
replace
into auth_warehouse
(id, code, `name`, parentId, remark,defaultInv,parentCode,thirdId,thirdId1,thirdId2,thirdId3,thirdId4)
into auth_warehouse
(id, code, `name`, parentId, remark, defaultInv, parentCode, advanceType, thirdId, thirdId1, thirdId2, thirdId3,
thirdId4)
values
<foreach collection="invWarehouseEntities" item="item" index="index" separator=",">
(
#{item.id},
#{item.code},
#{item.name},
#{item.parentId},
#{item.remark},
#{item.defaultInv},
#{item.parentCode},
#{item.thirdId},
#{item.thirdId1},
#{item.thirdId2},
#{item.thirdId3},
#{item.thirdId4}
)
(#{item.id},
#{item.code},
#{item.name},
#{item.parentId},
#{item.remark},
#{item.defaultInv},
#{item.parentCode},
#{item.advanceType},
#{item.thirdId},
#{item.thirdId1},
#{item.thirdId2},
#{item.thirdId3},
#{item.thirdId4})
</foreach>
</insert>
@ -254,6 +260,7 @@
a.parentId,
a.remark,
a.defaultInv,
a.advanceType,
a.thirdId,
a.thirdId1,
a.thirdId2,
@ -281,6 +288,9 @@
<if test="defaultInv != '' and defaultInv != null">
AND a.defaultInv = #{defaultInv}
</if>
<if test="advanceType != null">
AND a.advanceType = #{advanceType}
</if>
<if test="key != null and key != ''">
AND a.name like concat('%', #{key}, '%')
</if>
@ -326,6 +336,9 @@
<if test="pcode != null and pcode != ''">
AND a.parentId = #{pcode}
</if>
<if test="advanceType != null">
AND a.advanceType = #{advanceType}
</if>
</where>
GROUP BY a.code
</select>
@ -339,10 +352,22 @@
from auth_warehouse
inner join auth_dept on auth_warehouse.parentId = auth_dept.code
inner join auth_warehouse_user on auth_warehouse.code = auth_warehouse_user.code
where userId = #{userId}
<where>
<if test="userId != null">
AND auth_warehouse_user.userId = #{userId}
</if>
<if test="pcode != null and pcode != ''">
AND auth_warehouse.parentId = #{pcode}
</if>
<if test="advanceType != null">
AND auth_warehouse.advanceType = #{advanceType}
</if>
</where>
</select>
<select id="selectParentIdByCode" resultType="java.lang.String">
select parentId from auth_warehouse where code = #{invCode}
select parentId
from auth_warehouse
where code = #{invCode}
</select>
</mapper>

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

@ -8,3 +8,6 @@ CALL Pro_Temp_ColumnWork('thr_system_bus_api', 'thirdBuyName', 'varchar(255) ',
CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'bindRlIds', 'varchar(255) ', 1);
CALL Pro_Temp_ColumnWork('auth_warehouse', 'advanceType', 'tinyint', 1);

Write Preview
Loading…
Cancel
Save