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

Merge remote-tracking branch 'origin/busUser' into zhairh

Browse Source 
# Conflicts:
#	api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java
feature-order-fix
x_z 3 years ago
parent c56ed7d5b0 a5147bd4f7
commit 1989fb27e5
27 changed files with 315 additions and 49 deletions
Show Stats Download Patch File Download Diff File

8
api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java
Unescape Escape View File

@ -5,6 +5,7 @@ import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.entity.auth.AuthAdmin;
import com.glxp.api.admin.entity.auth.AuthRole;
import com.glxp.api.admin.entity.auth.AuthRoleAdmin;
import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity;
import com.glxp.api.admin.req.auth.AuthAdminQueryRequest;
import com.glxp.api.admin.req.auth.AuthAdminSaveRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
@ -13,6 +14,7 @@ import com.glxp.api.admin.res.auth.AuthAdminRoleResponse;
import com.glxp.api.admin.service.auth.AuthAdminService;
import com.glxp.api.admin.service.auth.AuthRoleAdminService;
import com.glxp.api.admin.service.auth.AuthRoleService;
import com.glxp.api.admin.service.inventory.InvSubWarehouseService;
import com.glxp.api.admin.util.GennerOrderUtils;
import com.glxp.api.admin.util.PasswordUtils;
import com.glxp.api.common.enums.ResultEnum;
@ -43,6 +45,8 @@ public class AuthAdminController {
private AuthRoleAdminService authRoleAdminService;
@Resource
GennerOrderUtils gennerOrderUtils;
@Resource
private InvSubWarehouseService invSubWarehouseService;
/**
* 获取管理员列表
@ -216,6 +220,10 @@ public class AuthAdminController {
if (authAdminSaveRequest.getId() == null) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数错误！");
}
InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(authAdminSaveRequest.getLocSubInvCode());
if(invSubWarehouseEntity!=null){
authAdminSaveRequest.setLocInvCode(invSubWarehouseEntity.getParentId());
}
AuthAdmin authAdmin = new AuthAdmin();
BeanUtils.copyProperties(authAdminSaveRequest, authAdmin);
authAdmin.setLastModifyTime(new Date());

48
api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
Unescape Escape View File

@ -1308,30 +1308,30 @@ public class WareHouseController {
if (StrUtil.isBlank(code) || StrUtil.isBlank(bussinessTypeJson))
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
List<BussinessTypResponse> bussinessTypResponses = JSONUtil.toList(bussinessTypeJson, BussinessTypResponse.class);
FilterInvBusUserRequest filterInvBusUserRequest = new FilterInvBusUserRequest();
filterInvBusUserRequest.setSubInvCode(code);
List<InvBusUserResponse> invBusUserEntities = invBusUserService.filterJoinInvBusUser(filterInvBusUserRequest);
Map<String, InvBusUserResponse> filteBusTypes = new HashMap<>();
for (InvBusUserResponse invBusUserEntity : invBusUserEntities) {
boolean isExit = false;
for (BussinessTypResponse bussinessTypResponse : bussinessTypResponses) {
if (bussinessTypResponse.getAction().equals(invBusUserEntity.getScAction())) {
isExit = true;
continue;
}
}
if (!isExit) {
filteBusTypes.put(invBusUserEntity.getScAction(), invBusUserEntity);
}
}
if (filteBusTypes.size() > 0) {
String data = "";
for (InvBusUserResponse invBusUserResponse : filteBusTypes.values()) {
data = data + invBusUserResponse.getBillTypeName() + ",";
}
return ResultVOUtils.error(500, "单据类型：" + data + "已被用户关联，请先移除后修改！");
}
// List<BussinessTypResponse> bussinessTypResponses = JSONUtil.toList(bussinessTypeJson, BussinessTypResponse.class);
// FilterInvBusUserRequest filterInvBusUserRequest = new FilterInvBusUserRequest();
// filterInvBusUserRequest.setSubInvCode(code);
// List<InvBusUserResponse> invBusUserEntities = invBusUserService.filterJoinInvBusUser(filterInvBusUserRequest);
// Map<String, InvBusUserResponse> filteBusTypes = new HashMap<>();
// for (InvBusUserResponse invBusUserEntity : invBusUserEntities) {
// boolean isExit = false;
// for (BussinessTypResponse bussinessTypResponse : bussinessTypResponses) {
// if (bussinessTypResponse.getAction().equals(invBusUserEntity.getScAction())) {
// isExit = true;
// continue;
// }
// }
// if (!isExit) {
// filteBusTypes.put(invBusUserEntity.getScAction(), invBusUserEntity);
// }
// }
// if (filteBusTypes.size() > 0) {
// String data = "";
// for (InvBusUserResponse invBusUserResponse : filteBusTypes.values()) {
// data = data + invBusUserResponse.getBillTypeName() + ",";
// }
// return ResultVOUtils.error(500, "单据类型：" + data + "已被用户关联，请先移除后修改！");
// }
warehouseBussinessTypeService.saveWarehouseBussinessType(code, JSONUtil.toList(bussinessTypeJson, BussinessTypResponse.class));

57
api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java
Unescape Escape View File

@ -1,12 +1,11 @@
package com.glxp.api.admin.controller.inventory;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.entity.auth.AuthAdmin;
import com.glxp.api.admin.entity.business.InvSpace;
import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity;
import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity;
import com.glxp.api.admin.entity.inventory.InvWarehouseEntity;
@ -18,10 +17,10 @@ import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.inventory.InvSubWarehouseResponse;
import com.glxp.api.admin.res.inventory.InvWarehouseThirdSysResponse;
import com.glxp.api.admin.service.auth.CustomerService;
import com.glxp.api.admin.service.info.SystemParamConfigService;
import com.glxp.api.admin.service.inout.WarehouseBussinessTypeService;
import com.glxp.api.admin.service.inout.WarehouseUserService;
import com.glxp.api.admin.service.inventory.InvProductService;
import com.glxp.api.admin.service.inventory.InvSpaceService;
import com.glxp.api.admin.service.inventory.InvSubWarehouseService;
import com.glxp.api.admin.service.inventory.InvWarehouseService;
import com.glxp.api.common.enums.ResultEnum;
@ -54,7 +53,7 @@ public class InvSubWarehouseController {
@Resource
private WarehouseUserService warehouseUserService;
@Resource
private InvSpaceService invSpaceService;
SystemParamConfigService systemParamConfigService;
@AuthRuleAnnotation("")
@GetMapping("spms/sub/inv/warehouse/filter")
@ -72,16 +71,54 @@ public class InvSubWarehouseController {
// return ResultVOUtils.error(500, "用户或仓库不能未空！");
// }
AuthAdmin authAdmin = customerService.getUserBean();
if (filterInvWarehouseRequest.getFilter() == null || filterInvWarehouseRequest.getFilter() == 1) {
filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue());
if (filterInvWarehouseRequest.getFilter() == null || filterInvWarehouseRequest.getFilter() == 1 || StrUtil.isNotEmpty(filterInvWarehouseRequest.getPcode())) {
if (authAdmin.getCustomerId().equals("110"))
filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue());
else{
filterInvWarehouseRequest.setSpUse(true);
}
}else{
//走这边表示单据选择的是往来单位里面调出调入的库
//判断单据类型是1就是设置单据需要需要查询除自己以外的分库
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("corp_innor_inv");
if(systemParamConfigEntity.getParamValue().equals("0")){
//不允许调拨
// 查询总库信息
InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode());
//查询仓库信息
InvWarehouseEntity invWarehouseEntity=invWarehouseService.selectByCodeAll(invSubWarehouseEntity.getParentId());
filterInvWarehouseRequest.setSuperiorCode(invWarehouseEntity.getCode());
filterInvWarehouseRequest.setSubordinateCode(invWarehouseEntity.getPcode());
filterInvWarehouseRequest.setCode(null);
}else {
//允许调拨
//查询总库信息
InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode());
filterInvWarehouseRequest.setWarehouseCode(invSubWarehouseEntity.getParentId());
filterInvWarehouseRequest.setCode(null);
}
}
List<InvSubWarehouseEntity> invSubWarehouseEntities = invSubWarehouseService.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();
InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode());
filterInvWarehouseRequest.setSubordinateCode(invSubWarehouseEntity.getParentId());
filterInvWarehouseRequest.setCode(null);
List<InvSubWarehouseEntity> invSubWarehouseEntities = invSubWarehouseService.filterGroupInvSubDown(filterInvWarehouseRequest);
return ResultVOUtils.success(invSubWarehouseEntities);
}
@AuthRuleAnnotation("")
@PostMapping("/spms/sub/inv/warehouse/save")
@ -168,12 +205,6 @@ public class InvSubWarehouseController {
return ResultVOUtils.error(500, "此分库存在库存，不能删除！");
}
//判断此分库下是否有货位
List<InvSpace> spaceList = invSpaceService.findBySubWarehouseCode(invSubWarehouse.getCode());
if (CollUtil.isNotEmpty(spaceList)) {
return ResultVOUtils.error(500, "请先移除此分库下的货位！");
}
boolean b = invSubWarehouseService.deleteById(deleteRequest.getId());
if (!b) {

1
api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurPlanController.java
Unescape Escape View File

@ -106,6 +106,7 @@ public class PurPlanController {
PurPlanDetailEntity purApplyDetailEntity = new PurPlanDetailEntity();
BeanUtils.copyProperties(stockOrderDetailEntity, purApplyDetailEntity);
purApplyDetailEntity.setOrderIdFk(purApplyEntity.getId() + "");
purApplyDetailEntity.setCount(Integer.valueOf(stockOrderDetailEntity.getCount()));
purPlanDetailService.insert(purApplyDetailEntity);
purPlanDetailEntities.add(purApplyDetailEntity);
}

7
api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCertSetController.java
Unescape Escape View File

@ -36,6 +36,7 @@ public class SupCertSetController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
filterCertSetsRequest.setNeed(0);
List<SupCertSetEntity> supCertEntityList
= supCertSetService.filterCertSets(filterCertSetsRequest);
PageInfo<SupCertSetEntity> pageInfo;
@ -54,6 +55,12 @@ public class SupCertSetController {
supCertSetEntity = new SupCertSetEntity();
}
supCertSetEntity.setUpdateTime(new Date());
if(supCertSetEntity.getType()==3){
if(supCertSetEntity.getFlbmList().size()>0){
String flbm = String.join(",", supCertSetEntity.getFlbmList());
supCertSetEntity.setFlbm(flbm);
}
}
boolean b = supCertSetService.insertCertSet(supCertSetEntity);
return ResultVOUtils.success("添加成功！");
}

1
api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCompanyController.java
Unescape Escape View File

@ -107,6 +107,7 @@ public class SupCompanyController {
//提交审核
FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest();
filterCertSetsRequest.setType(ConstantStatus.CERT_COMPANY);
filterCertSetsRequest.setNeed(1);
List<SupCertSetEntity> supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest);
List<SupCertEntity> supCertEntityList = supCertService.findAll(companyEntity.getCustomerId());
//验证

82
api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupManufacturerController.java
Unescape Escape View File

@ -90,8 +90,77 @@ public class SupManufacturerController {
@AuthRuleAnnotation("")
@PostMapping("/sup/manufacturer/addCompany")
public BaseResponse addCompany(@RequestBody SupManufacturerEntity supManufacturerEntity) {
//提交审核
if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE || supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) {
//判断是否上级供应商是否审核通过
SupCompanyEntity supCompanyEntity = supCompanyService.findCompany(supManufacturerEntity.getCustomerId());
if (supCompanyEntity.getAuditStatus() == ConstantStatus.AUDIT_UN
|| supCompanyEntity.getAuditStatus() == ConstantStatus.AUDIT_DRAFT) {
return ResultVOUtils.error(500, "所属配送企业资质未通过审核，暂时无法提交！");
}
//验证证书是否齐全
FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest();
filterCertSetsRequest.setType(ConstantStatus.CERT_MANUFACTURER);
filterCertSetsRequest.setNeed(0);
List<SupCertSetEntity> supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest);
List<SupCertEntity> supCertEntityList = supCertService.findAll(supManufacturerEntity.getCustomerId(), supManufacturerEntity.getManufacturerId());
ListIterator<SupCertSetEntity> iterable = supCertSetEntities.listIterator();
while (iterable.hasNext()) {
SupCertSetEntity supCertSetEntity = iterable.next();
if (supCertSetEntity.isNeed()
||
(!supCertSetEntity.isNeed() &&
supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 2
&& StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2"))
||
(!supCertSetEntity.isNeed() &&
supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 1
&& StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2"))
||
(!supCertSetEntity.isNeed()
&& supCertSetEntity.getForeign() != null
&& supCertSetEntity.getForeign() == 1
&& supManufacturerEntity.getCompanyType().equals("1"))
||
(!supCertSetEntity.isNeed()
&& supCertSetEntity.getForeign() != null
&& supCertSetEntity.getForeign() == 3
&& supManufacturerEntity.getCompanyType().equals("1"))) {
for (SupCertEntity supCertEntity : supCertEntityList) {
if (supCertEntity.getName().equals(supCertSetEntity.getName())) {
if (StrUtil.isNotEmpty(supCertEntity.getFilePath())) {
iterable.remove();
break;
}
}
}
} else {
iterable.remove();
}
}
String errMsg = "";
if (supCertSetEntities.size() > 0) {
for (SupCertSetEntity supCertSetEntity : supCertSetEntities) {
errMsg = errMsg + "," + supCertSetEntity.getName();
}
return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！");
}
}
supManufacturerEntity.setCreateTime(new Date());
supManufacturerEntity.setUpdateTime(new Date());
boolean b = supManufacturerService.insertCompany(supManufacturerEntity);
if (b) {
return ResultVOUtils.success("添加成功");
@ -108,7 +177,7 @@ public class SupManufacturerController {
return ResultVOUtils.error(500, "参数错误！");
}
//提交审核
if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) {
if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE || supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) {
//判断是否上级供应商是否审核通过
SupCompanyEntity supCompanyEntity = supCompanyService.findCompany(supManufacturerEntity.getCustomerId());
if (supCompanyEntity.getAuditStatus() == ConstantStatus.AUDIT_UN
@ -119,6 +188,7 @@ public class SupManufacturerController {
//验证证书是否齐全
FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest();
filterCertSetsRequest.setType(ConstantStatus.CERT_MANUFACTURER);
filterCertSetsRequest.setNeed(0);
List<SupCertSetEntity> supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest);
List<SupCertEntity> supCertEntityList = supCertService.findAll(supManufacturerEntity.getCustomerId(), supManufacturerEntity.getManufacturerId());
ListIterator<SupCertSetEntity> iterable = supCertSetEntities.listIterator();
@ -130,11 +200,19 @@ public class SupManufacturerController {
(!supCertSetEntity.isNeed() &&
supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 2
&& StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2"))
||
(!supCertSetEntity.isNeed() &&
supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 1
&& StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2"))
||
(!supCertSetEntity.isNeed()
&& supCertSetEntity.getForeign() != null
&& supCertSetEntity.getForeign() == 1
&& supManufacturerEntity.getCompanyType().equals("1"))
||
(!supCertSetEntity.isNeed()
&& supCertSetEntity.getForeign() != null
&& supCertSetEntity.getForeign() == 3
&& supManufacturerEntity.getCompanyType().equals("1"))) {
for (SupCertEntity supCertEntity : supCertEntityList) {

48
api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupProductController.java
Unescape Escape View File

@ -104,6 +104,54 @@ public class SupProductController {
@AuthRuleAnnotation("")
@PostMapping("/sup/product/addRegistration")
public BaseResponse addRegistration(@RequestBody SupProductEntity supProductEntity) {
//提交审核
if (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) {
//判断是否上级供应商是否审核通过
SupManufacturerEntity supManufacturerEntity = supManufacturerService.findManufacturer(supProductEntity.getManufacturerIdFk());
if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_UN
|| supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_DRAFT) {
return ResultVOUtils.error(500, "所属生产企业资质未通过审核，暂时无法提交！");
}
//验证证书是否齐全
FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest();
filterCertSetsRequest.setType(ConstantStatus.CERT_PRODUCT);
filterCertSetsRequest.setNeed(0);
List<SupCertSetEntity> supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest);
List<SupCertEntity> supCertEntityList = supCertService.findAll(supProductEntity.getCustomerId(), supProductEntity.getManufacturerIdFk(), supProductEntity.getProductId());
ListIterator<SupCertSetEntity> iterable = supCertSetEntities.listIterator();
while (iterable.hasNext()) {
SupCertSetEntity supCertSetEntity = iterable.next();
if (supCertSetEntity.getImports() == 1|| (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 2
&& StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进"))
|| (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 3 && !StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进"))
|| (StrUtil.trimToEmpty(supProductEntity.getProductType()).equals(supCertSetEntity.getCplx()))
|| (StrUtil.trimToEmpty(supProductEntity.getHchzsb()).equals(supCertSetEntity.getHchzsb()))
|| StrUtil.isNotEmpty(supCertSetEntity.getFlbm()) &&(supCertSetEntity.getFlbm().contains(StrUtil.trimToEmpty(supProductEntity.getProductDirectoryCode())))
) {
for (SupCertEntity supCertEntity : supCertEntityList) {
if (supCertEntity.getName().equals(supCertSetEntity.getName())) {
if (StrUtil.isNotEmpty(supCertEntity.getFilePath())) {
iterable.remove();
break;
}
}
}
} else {
iterable.remove();
}
}
String errMsg = "";
if (supCertSetEntities.size() > 0) {
for (SupCertSetEntity supCertSetEntity : supCertSetEntities) {
errMsg = errMsg + "," + supCertSetEntity.getName();
}
return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！");
}
}
supProductEntity.setCreateTime(new Date());
supProductEntity.setUpdateTime(new Date());
boolean b = supProductService.insertRegistration(supProductEntity);

6
api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvSubWarehouseDao.java
Unescape Escape View File

@ -59,4 +59,10 @@ public interface InvSubWarehouseDao {
*/
List<InvSubWarehouseResponse> filterInvSubWarehouseResponse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest);
/** 查询分仓和总仓信息 ...*/
InvSubWarehouseEntity filterGroupInvSubAndcode(@Param("code") String code);
List<InvSubWarehouseEntity> filterGroupInvSubDown(FilterInvWarehouseRequest filterInvSubWarehouseRequest);
}

3
api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvWarehouseDao.java
Unescape Escape View File

@ -49,4 +49,7 @@ public interface InvWarehouseDao {
InvWarehouseEntity selectByThirdSys(@Param("thirdIdSys") String thirdIdSys, @Param("thirdId") String thirdId);
/** 根据code查询* */
InvWarehouseEntity selectByCodeAll(@Param("code") String code);
}

2
api-admin/src/main/java/com/glxp/api/admin/dao/purchase/PurApplyDetailDao.java
Unescape Escape View File

@ -19,7 +19,7 @@ public interface PurApplyDetailDao {
Boolean update(PurApplyDetailEntity purApplyRequest);
Boolean deleteByIds(List<Long> ids);
Boolean deleteByIds(@Param("ids") List<Long> ids);
Boolean deleteByOrderId(@Param("orderIdFk") String orderIdFk);

4
api-admin/src/main/java/com/glxp/api/admin/entity/info/SyncDataSetEntity.java
Unescape Escape View File

@ -38,4 +38,8 @@ public class SyncDataSetEntity {
private boolean companyCert;
private boolean manufacturerCert;
private boolean productCert;
private String orderSyncStart;
private String basicSyncStart;
}

1
api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvSubWarehouseEntity.java
Unescape Escape View File

@ -22,4 +22,5 @@ public class InvSubWarehouseEntity {
public String thirdName3;
public String thirdId4;
public String thirdName4;
private String warehouseName;//仓库名字
}

5
api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvWarehouseRequest.java
Unescape Escape View File

@ -23,7 +23,10 @@ public class FilterInvWarehouseRequest extends ListPageRequest {
private Integer status;
private String lastUpdateTime;
private List<Integer> ids;
private Boolean spUse;
private Integer filter;
private int billType;//判断是否是单据类型需要的分库
private String warehouseCode;
private String superiorCode;//上级
private String subordinateCode;//下级
}

2
api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterCertSetsRequest.java
Unescape Escape View File

@ -8,5 +8,7 @@ public class FilterCertSetsRequest extends ListPageRequest {
private String name;
private Integer type;
private Integer need;
}

3
api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurApplyRequest.java
Unescape Escape View File

@ -93,6 +93,9 @@ public class PurApplyRequest extends ListPageRequest {
*/
private Date createTime;
private String auditRemark;
private String targetInv;
private String targetSubInv;
private String targetBillType;

5
api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSubWarehouseService.java
Unescape Escape View File

@ -55,4 +55,9 @@ public interface InvSubWarehouseService {
*/
List<InvSubWarehouseResponse> filterInvSubWarehouseResponse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest);
/** 查询分仓和总仓信息 ...*/
InvSubWarehouseEntity filterGroupInvSubAndcode( String code);
/** 查询仓库下级*/
List<InvSubWarehouseEntity> filterGroupInvSubDown(FilterInvWarehouseRequest filterInvSubWarehouseRequest);
}

4
api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvWarehouseService.java
Unescape Escape View File

@ -72,4 +72,8 @@ public interface InvWarehouseService {
* @return
*/
String getInvName(String code);
/** 根据code查询* */
InvWarehouseEntity selectByCodeAll(String code);
}

9
api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java
Unescape Escape View File

@ -190,4 +190,13 @@ public class InvSubWarehouseServiceImpl implements InvSubWarehouseService {
List<InvSubWarehouseResponse> data = invSubWarehouseDao.filterInvSubWarehouseResponse(filterInvSubWarehouseRequest);
return data;
}
@Override
public InvSubWarehouseEntity filterGroupInvSubAndcode(String code) {
return invSubWarehouseDao.filterGroupInvSubAndcode(code);
}
@Override
public List<InvSubWarehouseEntity> filterGroupInvSubDown(FilterInvWarehouseRequest filterInvSubWarehouseRequest) {
return invSubWarehouseDao.filterGroupInvSubDown(filterInvSubWarehouseRequest);
}
}

5
api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvWarehouseServiceImpl.java
Unescape Escape View File

@ -245,4 +245,9 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
}
return invWarehouseDao.getNameByCode(code);
}
@Override
public InvWarehouseEntity selectByCodeAll(String code) {
return invWarehouseDao.selectByCodeAll(code);
}
}

44
api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml
Unescape Escape View File

@ -54,9 +54,11 @@
<select id="filterGroupInvSub" parameterType="com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest"
resultType="com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity">
select inv_warehouse_sub.* from inv_warehouse_sub INNER JOIN inv_warehouse
select inv_warehouse_sub.*, inv_warehouse.`name` AS warehouseName from inv_warehouse_sub INNER JOIN inv_warehouse
on inv_warehouse_sub.parentId = inv_warehouse.code
INNER JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.code
<if test="userId != '' and userId != null">
INNER JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.code
</if>
<where>
<if test="userId != '' and userId != null">
AND inv_warehouse_user.userId = #{userId}
@ -64,11 +66,34 @@
<if test="pcode != '' and pcode != null">
AND inv_warehouse.code = #{pcode}
</if>
<if test="warehouseCode != '' and warehouseCode != null">
AND inv_warehouse.code &lt;&gt; #{warehouseCode}
</if>
<if test="spUse != '' and spUse != null">
AND inv_warehouse.spUse = #{spUse}
</if>
<if test="superiorCode != '' and superiorCode != null">
AND (inv_warehouse.code = #{subordinateCode}
OR inv_warehouse.pcode = #{superiorCode})
</if>
<if test="subordinateCode != '' and subordinateCode != null">
AND inv_warehouse.pcode = #{subordinateCode}
</if>
</where>
group by inv_warehouse_sub.id
</select>
<select id="filterGroupInvSubAndcode" parameterType="com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest"
resultType="com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity">
select inv_warehouse_sub.* from inv_warehouse_sub
<where>
<if test="code != '' and code != null">
AND inv_warehouse_sub.code = #{code}
</if>
</where>
group by inv_warehouse_sub.id
</select>
<select id="selectMaxCode" parameterType="com.glxp.api.admin.req.inventory.FilterInvSubWarehouseRequest"
resultType="com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity">
@ -190,4 +215,17 @@
</where>
</select>
<select id="filterGroupInvSubDown" parameterType="com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest"
resultType="com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity">
select inv_warehouse_sub.*, inv_warehouse.`name` AS warehouseName from inv_warehouse_sub INNER JOIN inv_warehouse
on inv_warehouse_sub.parentId = inv_warehouse.code
<where>
<if test="subordinateCode != '' and subordinateCode != null">
AND inv_warehouse.pcode = #{subordinateCode}
</if>
</where>
group by inv_warehouse_sub.id
</select>
</mapper>

6
api-admin/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml
Unescape Escape View File

@ -266,4 +266,10 @@
from inv_warehouse
where ${thirdIdSys} = #{thirdId}
</select>
<select id="selectByCodeAll" resultType="com.glxp.api.admin.entity.inventory.InvWarehouseEntity">
select *
from inv_warehouse
where code = #{code}
</select>
</mapper>

2
api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml
Unescape Escape View File

@ -24,7 +24,7 @@
and ( pur_apply.status = 3 or pur_apply.status=2 or pur_apply.status=4)
</if>
<if test="status ==11">
and ( pur_apply.status = 1 or pur_apply.status=2)
and ( pur_apply.status = 1 or pur_apply.status=2 or pur_apply.status=4)
</if>
<if test="deptCode != '' and deptCode != null">

2
api-admin/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml
Unescape Escape View File

@ -25,7 +25,7 @@
and ( pur_plan.status = 3 or pur_plan.status=2 or pur_plan.status=4)
</if>
<if test="status ==11">
and ( pur_plan.status = 1 or pur_plan.status=2)
and ( pur_plan.status = 1 or pur_plan.status=2 or pur_plan.status=4)
</if>
<if test="deptCode != '' and deptCode != null">

5
api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml
Unescape Escape View File

@ -10,9 +10,12 @@
<if test="name != '' and name!=null">
and `name` = #{name}
</if>
<if test="type != '' and type!=null">
<if test="type!=null">
and `type` = #{type}
</if>
<if test="need!=null">
and `need` = #{need}
</if>
</where>
ORDER BY id DESC
</select>

2
api-admin/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml
Unescape Escape View File

@ -23,7 +23,7 @@
and companyName like concat('%',#{companyName},'%')
</if>
<if test="creditNum != null and creditNum != ''">
and creditNum like ('%',#{creditNum},'%')
and creditNum like concat('%',#{creditNum},'%')
</if>
<if test="auditStatus != null and auditStatus !=20 and auditStatus !=21 and auditStatus !=22">
and auditStatus = #{auditStatus}

2
api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml
Unescape Escape View File

@ -19,7 +19,7 @@
<select id="getCompany" parameterType="com.glxp.api.admin.req.purchase.FilterSupManufacturerRequest"
resultType="com.glxp.api.admin.entity.purchase.SupManufacturerEntity">
SELECT sup_manufacturer.* ,sup_company.companyName supName FROM sup_manufacturer
SELECT sup_manufacturer.* ,sup_company.companyName as supName FROM sup_manufacturer
inner join sup_company on sup_manufacturer.customerId = sup_company.customerId
<where>
<if test="id != null and id != ''">

Write Preview
Loading…
Cancel
Save