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

Merge branch 'dev' into test

Browse Source
dev
郑明梁 2 years ago
parent e2e9e080ee 5513726e0b
commit 1ca7ac05f5
17 changed files with 71 additions and 80 deletions
Show Stats Download Patch File Download Diff File

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

@ -195,7 +195,7 @@ 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_SPECIAL = 4; //特殊往来
public static final int CORP_TYPE_DEPT = 4; //部门

58
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);
@ -286,7 +229,6 @@ public class InvWarehouseController extends BaseController {
}
FilterInvSubWarehouseRequest filterInvWarehouseRequest = new FilterInvSubWarehouseRequest();
filterInvWarehouseRequest.setParentId(invWarehouseEntity.getParentId());
InvWarehouseEntity codeEntity = invWarehouseService.selectMaxCode(filterInvWarehouseRequest);
DeptEntity pEntity = deptService.selectByCode(invWarehouseEntity.getParentId());
if (codeEntity == null) {

8
src/main/java/com/glxp/api/controller/basic/BasicCorpController.java
Unescape Escape View File

@ -79,13 +79,9 @@ public class BasicCorpController {
}
List<BasicCorpEntity> basicUnitMaintainEntities;
//是供应商的时候拉客户和供应商
if (basicUnitMaintainFilterRequest.getCorpType() == null) {
basicUnitMaintainFilterRequest.setCorpType(2);
} else if (basicUnitMaintainFilterRequest.getCorpType() == 2) {
if (basicUnitMaintainFilterRequest.getCorpType() == null || basicUnitMaintainFilterRequest.getCorpType() == 2) {
basicUnitMaintainFilterRequest.setCorpType(null);
basicUnitMaintainFilterRequest.setCorpTypeList(new ArrayList<>(Arrays.asList(1, 2)));
} else {
basicUnitMaintainFilterRequest.setOutType(ConstantStatus.CORP_SICK_SICK);
}
basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
PageInfo<BasicCorpEntity> pageInfo = new PageInfo<>(basicUnitMaintainEntities);
@ -153,6 +149,8 @@ public class BasicCorpController {
return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加");
}
basicUnitMaintainSaveRequest.setOutType(ConstantStatus.CORP_SICK_CUS);
basicUnitMaintainSaveRequest.setUpdateTime(new Date());
basicUnitMaintainService.updateById(basicUnitMaintainSaveRequest);
return ResultVOUtils.success("修改成功");
}

5
src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
Unescape Escape View File

@ -98,7 +98,7 @@ public class UdiRelevanceController extends BaseController {
}
List<UdiRelevanceResponse> udiRelevanceResponses = null;
if(StrUtil.isNotEmpty(filterUdiRelRequest.getUdiCode())){
if (StrUtil.isNotEmpty(filterUdiRelRequest.getUdiCode())) {
filterUdiRelRequest.setNameCode(FilterUdiUtils.getUdi(filterUdiRelRequest.getUdiCode()).getUdi());
}
@ -529,7 +529,8 @@ public class UdiRelevanceController extends BaseController {
} else {
udiRelevanceEntity = udiRelevanceService.selectById(filterUdiRelRequest.getId());
}
if (udiRelevanceEntity == null)
return ResultVOUtils.success();
FilterBasicThirdSysRequest filterBasicThirdSysRequest = new FilterBasicThirdSysRequest();
filterBasicThirdSysRequest.setEnabled(true);
List<ThrSystemEntity> basicThirdSysEntities = thrSystemService.filterBasicThiSys(filterBasicThirdSysRequest);

2
src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
Unescape Escape View File

@ -99,7 +99,9 @@ public class IoOrderDetailResultController extends BaseController {
}
orderDetailResultRequest.setActions(actions);
AuthAdmin authAdmin= customerService.getUserBean();
if (StrUtil.isBlank(orderDetailResultRequest.getInvCode())){
orderDetailResultRequest.setInvCode(authAdmin.getLocInvCode());
}
List<IoOrderDetailResultResponse> list = orderDetailResultService.filterOrderList(orderDetailResultRequest);
for (IoOrderDetailResultResponse orderDetailResultResponse : list) {

4
src/main/java/com/glxp/api/controller/inout/PlatformController.java
Unescape Escape View File

@ -128,7 +128,6 @@ public class PlatformController {
}
UnitMaintainPlatformEntity unitMaintainPlatform = new UnitMaintainPlatformEntity();
BeanUtil.copyProperties(platformLinkRequest, unitMaintainPlatform);
unitMaintainPlatform.setCustomerId(Long.valueOf(unitMaintainPlatform.getUnitId()));
platformService.saveUnitPlatform(unitMaintainPlatform);
return ResultVOUtils.success("关联成功");
}
@ -249,7 +248,4 @@ public class PlatformController {
}
}

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());

45
src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java
Unescape Escape View File

@ -12,6 +12,8 @@ import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.entity.basic.UdiProductEntity;
import com.glxp.api.entity.system.SystemParamConfigEntity;
import com.glxp.api.entity.thrsys.ThrProductsEntity;
import com.glxp.api.entity.thrsys.ThrSystemDetailEntity;
import com.glxp.api.http.ErpBasicClient;
@ -22,6 +24,8 @@ import com.glxp.api.req.thrsys.ThrOnhandRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.thrsys.ThrProductsResponse;
import com.glxp.api.service.auth.CustomerService;
import com.glxp.api.service.basic.UdiProductService;
import com.glxp.api.service.system.SystemParamConfigService;
import com.glxp.api.service.thrsys.ThrProductsService;
import com.glxp.api.service.thrsys.ThrSystemDetailService;
import lombok.extern.slf4j.Slf4j;
@ -176,6 +180,11 @@ public class ThrProductsController {
}
@Resource
SystemParamConfigService systemParamConfigService;
@Resource
UdiProductService udiProductService;
/**
* 编辑第三方产品信息
*
@ -189,6 +198,42 @@ public class ThrProductsController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
thrProductsEntity.setUpdateTime(new Date());
thrProductsService.updateById(thrProductsEntity);
String value = systemParamConfigService.selectValueByParamKey("enable_edit_third");
if (StrUtil.isNotEmpty(value) && value.equals("1")) {
UdiProductEntity udiProductEntity = udiProductService.findByNameCode(thrProductsEntity.getCode());
if (udiProductEntity != null) {
if (StrUtil.isNotEmpty(thrProductsEntity.getMeasname()))
udiProductEntity.setMeasname(thrProductsEntity.getMeasname());
if (StrUtil.isNotEmpty(thrProductsEntity.getSpec()))
udiProductEntity.setGgxh(thrProductsEntity.getSpec());
if (StrUtil.isNotEmpty(thrProductsEntity.getRegisterNo()))
udiProductEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());
if (StrUtil.isNotEmpty(thrProductsEntity.getManufactory()))
udiProductEntity.setManufactory(thrProductsEntity.getManufactory());
if (StrUtil.isNotEmpty(thrProductsEntity.getCplb()))
udiProductEntity.setCplb(thrProductsEntity.getCplb());
if (StrUtil.isNotEmpty(thrProductsEntity.getFlbm()))
udiProductEntity.setFlbm(thrProductsEntity.getFlbm());
if (StrUtil.isNotEmpty(thrProductsEntity.getQxlb()))
udiProductEntity.setQxlb(thrProductsEntity.getQxlb());
if (StrUtil.isNotEmpty(thrProductsEntity.getYbbm()))
udiProductEntity.setYbbm(thrProductsEntity.getYbbm());
if (StrUtil.isNotEmpty(thrProductsEntity.getSptm()))
udiProductEntity.setSptm(thrProductsEntity.getSptm());
if (StrUtil.isNotEmpty(thrProductsEntity.getTyshxydm()))
udiProductEntity.setTyshxydm(thrProductsEntity.getTyshxydm());
if (StrUtil.isNotEmpty(thrProductsEntity.getZczbhhzbapzbh()))
udiProductEntity.setZczbhhzbapzbh(thrProductsEntity.getZczbhhzbapzbh());
if (StrUtil.isNotEmpty(thrProductsEntity.getYlqxzcrbarmc()))
udiProductEntity.setYlqxzcrbarmc(thrProductsEntity.getYlqxzcrbarmc());
if (StrUtil.isNotEmpty(thrProductsEntity.getCpms()))
udiProductEntity.setCpms(thrProductsEntity.getCpms());
if (StrUtil.isNotEmpty(thrProductsEntity.getStandard()))
udiProductEntity.setGgxh(thrProductsEntity.getStandard());
udiProductService.updateUdiInfo(udiProductEntity);
}
}
return ResultVOUtils.success("修改成功！");
}

2
src/main/java/com/glxp/api/res/inout/PlatformLinkResponse.java
Unescape Escape View File

@ -23,6 +23,8 @@ public class PlatformLinkResponse {
//自助平台ID
private String platformId;
private String customerId;
private String socurceName;
//本地单据类型

2
src/main/java/com/glxp/api/util/udi/FilterUdiUtils.java
Unescape Escape View File

@ -109,7 +109,7 @@ public class FilterUdiUtils {
String expireDate = "";
String serialNo = null;
String udi = "";
String[] spilts = data.split("#");
String[] spilts = data.split("#",data.length());
if (spilts != null && spilts.length >= 5) {
udi = spilts[1];
produceDate = spilts[2];

3
src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml
Unescape Escape View File

@ -31,10 +31,11 @@
AND corpType = #{corpType}
</if>
<if test="corpTypeList != null and corpTypeList.size() > 0">
AND corpType in
AND (corpType in
<foreach item="item" index="index" collection="corpTypeList" open="(" separator="," close=")">
#{item}
</foreach>
) and outType <![CDATA[ <> ]]> 1
</if>
<if test="outType != null">
AND (outType <![CDATA[ <> ]]> #{outType} or outType is NULL)

4
src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
Unescape Escape View File

@ -188,8 +188,8 @@
allowNoBatch, allowNoExpire,
allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2,
basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7,
basicPrductRemak8
, sfwblztlcp, cgzmraqxgxx, sfbjwycxsy, zdcfsycs, sfwwjbz, syqsfxyjxmj, mjfs, categoryNamem,
basicPrductRemak8,updateTime
, sfwblztlcp, cgzmraqxgxx, sfbjwycxsy, zdcfsycs, sfwwjbz, syqsfxyjxmj, mjfs, categoryName,
pinyinInitial)
values (#{id}, #{uuid},
#{originUuid},

1
src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml
Unescape Escape View File

@ -164,6 +164,7 @@
io.id,
io.unitId,
io.platformId,
io.customerId,
io.invCode,
io.invName,
io.invSubCode,

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

@ -511,3 +511,6 @@ CALL Pro_Temp_ColumnWork('basic_products', 'syqsfxyjxmj', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('basic_products', 'mjfs', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('basic_products', 'categoryName', 'varchar(255)', 1);
INSERT ignore INTO `sys_param_config`(`parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`,
`paramExplain`, `updateTime`)
VALUES (0, '是否允许编辑第三方产品信息', 'enable_edit_third', '1', 0, 0, '0：否；1：是', NULL);

Write Preview
Loading…
Cancel
Save