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

申购单据，采购订单等相关修改

Browse Source
dev
anthonywj 2 years ago
parent 5a377fe206
commit 428ed71f4e
6 changed files with 6 additions and 63 deletions
Show Stats Download Patch File Download Diff File

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

@ -194,8 +194,8 @@ public class ConstantStatus {
//往来信息类型-单据
public static final int CORP_TYPE_INPUT = 1; //客户
public static final int CORP_TYPE_OUT = 2; //供应商
public static final int CORP_TYPE_INNOR = 3; //内部科室等
public static final int CORP_TYPE_SPECIAL = 4; //特俗往来
public static final int CORP_TYPE_INNOR = 3; //内部科室等
public static final int CORP_TYPE_SPECIAL = 4; //特殊往来
public static final int CORP_TYPE_DEPT = 4; //部门

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

@ -201,67 +201,10 @@ public class InvWarehouseController extends BaseController {
}
@AuthRuleAnnotation("")
@GetMapping("spms/sub/inv/warehouse/findByInv")
public BaseResponse findByInv(FilterInvWarehouseRequest filterInvWarehouseRequest) {
// if (StrUtil.isEmpty(filterInvWarehouseRequest.getPcode()) || filterInvWarehouseRequest.getUserId() == null) {
// return ResultVOUtils.error(500, "用户或仓库不能未空！");
// }
AuthAdmin authAdmin = customerService.getUserBean();
if (StrUtil.isNotEmpty(filterInvWarehouseRequest.getPcode())) {
if (filterInvWarehouseRequest.getFilter() == null || filterInvWarehouseRequest.getFilter() == 1 || filterInvWarehouseRequest.getFilter() == 2) {
if (authAdmin.getCustomerId() == 110) {
filterInvWarehouseRequest.setUserId(authAdmin.getId());
} else {
filterInvWarehouseRequest.setSpUse(true);
}
}
} else {
if (filterInvWarehouseRequest.getFilter() != null && filterInvWarehouseRequest.getFilter() == 3) {
filterInvWarehouseRequest.setUserId(authAdmin.getId());
} else {
//走这边表示单据选择的是往来单位里面调出调入的库
//判断单据类型是1就是设置单据需要需要查询除自己以外的分库
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("corp_innor_inv");
if (systemParamConfigEntity.getParamValue().equals("0")) {
//不允许调拨
// 查询总库信息
InvWarehouseEntity invWarehouseEntity = invWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode());
//查询仓库信息
if (invWarehouseEntity != null) {
DeptEntity deptEntity = deptService.selectByCodeAll(invWarehouseEntity.getParentId());
filterInvWarehouseRequest.setSuperiorCode(deptEntity.getCode());
filterInvWarehouseRequest.setSuperiorPcode(deptEntity.getPcode());
filterInvWarehouseRequest.setCode(null);
} else {
return ResultVOUtils.error(999, "分库编号为空！");
}
} else {
//允许调拨
//查询总库信息
InvWarehouseEntity invWarehouseEntity = invWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode());
filterInvWarehouseRequest.setWarehouseCode(invWarehouseEntity.getParentId());
filterInvWarehouseRequest.setCode(null);
}
}
}
List<InvWarehouseEntity> invSubWarehouseEntities = invWarehouseService.filterGroupInvSub(filterInvWarehouseRequest);
return ResultVOUtils.success(invSubWarehouseEntities);
}
@AuthRuleAnnotation("")
@GetMapping("spms/sub/inv/warehouse/filterSub")
public BaseResponse filterSub(FilterInvWarehouseRequest filterInvWarehouseRequest) {
// if (StrUtil.isEmpty(filterInvWarehouseRequest.getPcode()) || filterInvWarehouseRequest.getUserId() == null) {
// return ResultVOUtils.error(500, "用户或仓库不能未空！");
// }
AuthAdmin authAdmin = customerService.getUserBean();
InvWarehouseEntity invWarehouseEntity = invWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode());
filterInvWarehouseRequest.setSubordinateCode(invWarehouseEntity.getParentId());
filterInvWarehouseRequest.setCode(null);

2
src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java
Unescape Escape View File

@ -231,7 +231,7 @@ public class IoPurChangeService {
purOrderEntity.setBillType(ConstantStatus.BUS_ORDER_CGDD);
if (basicBusTypeChangeEntity.getBusBeforeTime() != null) {
purOrderEntity.setCreateTime(MsDateUtil.timeProcess(new Date(), basicBusTypeChangeEntity.getBusBeforeTime()));
purOrderEntity.setUpdateTime(MsDateUtil.timeProcess(new Date(), basicBusTypeChangeEntity.getBusBeforeTime()));
purOrderEntity.setUpdateTime(new Date());
} else {
purOrderEntity.setCreateTime(new Date());
purOrderEntity.setUpdateTime(new Date());

2
src/main/java/com/glxp/api/controller/purchase/PurApplyController.java
Unescape Escape View File

@ -268,7 +268,7 @@ public class PurApplyController {
purOrderEntity.setCreateUser(purApplyEntity.getAuditUser());
purOrderEntity.setCreateTime(timeProcess(purApplyEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
purOrderEntity.setUpdateUser(purApplyEntity.getAuditUser());
purOrderEntity.setUpdateTime(timeProcess(purApplyEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
purOrderEntity.setUpdateTime(new Date());
if (purOrderEntity.getStatus() == 3) {
purOrderEntity.setAuditUser("");
purOrderEntity.setAuditTime(new Date());

2
src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java
Unescape Escape View File

@ -360,7 +360,7 @@ public class PurOrderReceiveController extends BaseController {
purOrderEntity.setCreateUser(purReceiveEntity.getAuditUser());
purOrderEntity.setCreateTime(timeProcess(purReceiveEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
purOrderEntity.setUpdateUser(purReceiveEntity.getAuditUser());
purOrderEntity.setUpdateTime(timeProcess(purReceiveEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
purOrderEntity.setUpdateTime(new Date());
if (purOrderEntity.getStatus() == 3) {
purOrderEntity.setAuditUser("");
purOrderEntity.setAuditTime(new Date());

2
src/main/java/com/glxp/api/controller/purchase/PurPlanController.java
Unescape Escape View File

@ -275,7 +275,7 @@ public class PurPlanController {
purOrderEntity.setCreateUser(purPlanEntity.getAuditUser());
purOrderEntity.setCreateTime(timeProcess(purPlanEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
purOrderEntity.setUpdateUser(purPlanEntity.getAuditUser());
purOrderEntity.setUpdateTime(timeProcess(purPlanEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
purOrderEntity.setUpdateTime(new Date());
if (purOrderEntity.getStatus() == 3) {
purOrderEntity.setAuditUser("");
purOrderEntity.setAuditTime(new Date());

Write Preview
Loading…
Cancel
Save