diff --git a/src/main/java/com/glxp/api/constant/ConstantStatus.java b/src/main/java/com/glxp/api/constant/ConstantStatus.java index d60cc74b9..713edc2b6 100644 --- a/src/main/java/com/glxp/api/constant/ConstantStatus.java +++ b/src/main/java/com/glxp/api/constant/ConstantStatus.java @@ -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; //部门 diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index 8404d3fcf..641db804c 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -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 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) { diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java index 280b88671..8277778d6 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java @@ -79,13 +79,9 @@ public class BasicCorpController { } List 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 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("修改成功"); } diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index 04398618e..c963efb69 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -98,7 +98,7 @@ public class UdiRelevanceController extends BaseController { } List 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 basicThirdSysEntities = thrSystemService.filterBasicThiSys(filterBasicThirdSysRequest); diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java index d7df4709b..d4dbaf346 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java @@ -99,7 +99,9 @@ public class IoOrderDetailResultController extends BaseController { } orderDetailResultRequest.setActions(actions); AuthAdmin authAdmin= customerService.getUserBean(); - orderDetailResultRequest.setInvCode(authAdmin.getLocInvCode()); + if (StrUtil.isBlank(orderDetailResultRequest.getInvCode())){ + orderDetailResultRequest.setInvCode(authAdmin.getLocInvCode()); + } List list = orderDetailResultService.filterOrderList(orderDetailResultRequest); for (IoOrderDetailResultResponse orderDetailResultResponse : list) { diff --git a/src/main/java/com/glxp/api/controller/inout/PlatformController.java b/src/main/java/com/glxp/api/controller/inout/PlatformController.java index 88ea13bf8..b8c0f81a6 100644 --- a/src/main/java/com/glxp/api/controller/inout/PlatformController.java +++ b/src/main/java/com/glxp/api/controller/inout/PlatformController.java @@ -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 { } - - - } diff --git a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java index 3c4e758a9..6dce4fff8 100644 --- a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java +++ b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java @@ -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()); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java index 140b32be1..922404986 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java @@ -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()); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java index af5efd3af..5715c8050 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java @@ -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()); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java index b497be27e..6dc421476 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java @@ -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()); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java index 6a83ee3d8..db50e28f4 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java @@ -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("修改成功！"); } diff --git a/src/main/java/com/glxp/api/res/inout/PlatformLinkResponse.java b/src/main/java/com/glxp/api/res/inout/PlatformLinkResponse.java index 661ce4e15..2311b38d0 100644 --- a/src/main/java/com/glxp/api/res/inout/PlatformLinkResponse.java +++ b/src/main/java/com/glxp/api/res/inout/PlatformLinkResponse.java @@ -23,6 +23,8 @@ public class PlatformLinkResponse { //自助平台ID private String platformId; + private String customerId; + private String socurceName; //本地单据类型 diff --git a/src/main/java/com/glxp/api/util/udi/FilterUdiUtils.java b/src/main/java/com/glxp/api/util/udi/FilterUdiUtils.java index 720d1fdd1..05f50f7b8 100644 --- a/src/main/java/com/glxp/api/util/udi/FilterUdiUtils.java +++ b/src/main/java/com/glxp/api/util/udi/FilterUdiUtils.java @@ -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]; diff --git a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml index 9639dd6d1..e7ce1c290 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml @@ -31,10 +31,11 @@ AND corpType = #{corpType} - AND corpType in + AND (corpType in #{item} + ) and outType ]]> 1 AND (outType ]]> #{outType} or outType is NULL) diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml index 12a6271d6..f25339d4d 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml @@ -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}, diff --git a/src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml b/src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml index 2f3af3657..5a6944da6 100644 --- a/src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml +++ b/src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml @@ -164,6 +164,7 @@ io.id, io.unitId, io.platformId, + io.customerId, io.invCode, io.invName, io.invSubCode, diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 7df586008..bd6baa8d5 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -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);