Compare commits

..

22 Commits

@ -269,10 +269,6 @@
<groupId>com.lowagie</groupId>
<artifactId>itext</artifactId>
</exclusion>
<exclusion>
<artifactId>olap4j</artifactId>
<groupId>org.olap4j</groupId>
</exclusion>
</exclusions>
</dependency>

@ -7,6 +7,7 @@ import com.glxp.api.dao.system.DbVersionDao;
import com.glxp.api.entity.system.DbVersionEntity;
import com.glxp.api.entity.system.SchemaData;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.core.annotation.Order;
@ -26,10 +27,16 @@ public class HdSchemaExecutor implements ApplicationRunner {
@Resource
DbVersionDao hdCommonDao;
@Value("${initSql:true}")
private boolean initSql;
private List<SchemaData> schema = new ArrayList<>();
@Override
public void run(ApplicationArguments args) throws Exception {
if (!initSql) {
return;
}
//初始版本列表
buildSchemas();
//定义sql文件路径
@ -42,7 +49,7 @@ public class HdSchemaExecutor implements ApplicationRunner {
String sql = IoUtil.readUtf8(inputStream);
try {
//判断版本表是否存在
int count = hdCommonDao.selectTableExist("hd_version");
int count = hdCommonDao.selectTableExist("sys_db_version");
if (count == 0) {
hdCommonDao.updateSql(sql);
}
@ -77,7 +84,5 @@ public class HdSchemaExecutor implements ApplicationRunner {
// schema.add(new SchemaData("v2.1", "schema_v2.1.sql"));
// schema.add(new SchemaData("v2.2", "schema_v2.2.sql"));
schema.add(new SchemaData("v2.3", "schema_v2.3.sql"));
// schema.add(new SchemaData("v2.4", "schema_v2.4.sql"));
}
}

@ -238,9 +238,6 @@ public class Constant {
public static final String ORDER_STATUS_INCODE = "supInCode";
public static final String ORDER_STATUS_RETURN = "supReturned";
/**前端页面查询相关单据类型标识*/
@ -265,6 +262,7 @@ public class Constant {
public static final String ORDER_ACTION_SUP_DELAUDIT = "supDelAudit";
public static final String ORDER_ACTION_SUP_INOUT = "supInout";
public static final String ORDER_ACTION_SUP_PREIN = "preInOrder";
public static final String ORDER_ACTION_SUP_RETURN = "supReturned";
public static final String SYNC_REMARK = "syncRemark";

@ -11,7 +11,6 @@ import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.dto.DictDto;
import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.auth.DeptEntity;
import com.glxp.api.entity.auth.DeptUserEntity;
@ -70,18 +69,6 @@ public class DeptController extends BaseController {
return ResultVOUtils.success(invWarehouseEntities);
}
@AuthRuleAnnotation("")
@GetMapping("spms/inv/warehouse/filterAllOptimize")
public BaseResponse filterAllInvWarehouseOptimize(FilterInvWarehouseRequest filterInvWarehouseRequest) {
filterInvWarehouseRequest.setPid(0);
filterInvWarehouseRequest.setStatus(1);
List<DeptEntity> invWarehouseEntities = deptService.filterInvWarehouse(filterInvWarehouseRequest);
List<DictDto> reList = invWarehouseEntities.stream().map(s-> {
DictDto dictDto = new DictDto(s.getCode(),s.getName());
return dictDto;
}).collect(Collectors.toList());
return ResultVOUtils.success(reList);
}
@AuthRuleAnnotation("")
@GetMapping("spms/inv/warehouse/filterNext")
@ -113,29 +100,6 @@ public class DeptController extends BaseController {
}
@AuthRuleAnnotation("")
@GetMapping("spms/inv/warehouse/filterByUserOptimize")
public BaseResponse filterByUserOptimize(FilterInvWarehouseRequest filterInvWarehouseRequest) {
if (isHosUser()) {
AuthAdmin authAdmin = customerService.getUserBean();
filterInvWarehouseRequest.setUserId(authAdmin.getId());
} else {
}
filterInvWarehouseRequest.setPid(0);
filterInvWarehouseRequest.setStatus(1);
List<DeptEntity> mInvWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest);
List<DictDto> reList = mInvWarehouseEntities.stream().map(s-> {
DictDto dictDto = new DictDto(s.getCode(),s.getName());
return dictDto;
}).collect(Collectors.toList());
return ResultVOUtils.success(reList);
}
@AuthRuleAnnotation("")
@GetMapping("spms/inv/warehouse/filterAllLocInv")
public BaseResponse filterAllLocInv(FilterInvWarehouseRequest filterInvWarehouseRequest) {

@ -12,7 +12,6 @@ import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.dto.DictDto;
import com.glxp.api.entity.auth.*;
import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
import com.glxp.api.req.auth.*;
@ -73,23 +72,6 @@ public class InvWarehouseController extends BaseController {
return ResultVOUtils.success(responses);
}
/**
*
*
* @param filterInvSubWarehouseRequest
* @return
*/
@AuthRuleAnnotation("")
@GetMapping("spms/sub/inv/warehouse/filterOptimize")
public BaseResponse filterOptimize(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest) {
List<InvSubWarehouseResponse> responses = invWarehouseService.filterInvSubWarehouseResponse(filterInvSubWarehouseRequest);
List<DictDto> reList = responses.stream().map(s-> {
DictDto dictDto = new DictDto(s.getCode(),s.getName());
return dictDto;
}).collect(Collectors.toList());
return ResultVOUtils.success(reList);
}
/**
* -
*
@ -159,29 +141,6 @@ public class InvWarehouseController extends BaseController {
return ResultVOUtils.success(list);
}
@AuthRuleAnnotation("")
@GetMapping("spms/inv/warehouse/findInvListByUserOptimize")
public BaseResponse findInvListByUserOptimize(FilterInvWarehouseRequest filterInvWarehouseRequest) {
Long userId = getUserId();
if (null == userId) {
return ResultVOUtils.error(ResultEnum.LOGIN_VERIFY_FALL);
}
if (isHosUser()) {
filterInvWarehouseRequest.setUserId(userId);
} else {
filterInvWarehouseRequest.setUserId(null);
filterInvWarehouseRequest.setSpUse(true);
}
List<InvWarehouseEntity> list = invWarehouseService.findInvListByUser(filterInvWarehouseRequest);
List<DictDto> reList = list.stream().map(s-> {
DictDto dictDto = new DictDto(s.getCode(),s.getName());
return dictDto;
}).collect(Collectors.toList());
return ResultVOUtils.success(reList);
}
/**
* ()
*

@ -132,7 +132,7 @@ public class RegisterController {
JSONObject json = new JSONObject();
json.put("memPhone", checkCodeRequest.getPhoneNum());
json.put("code", mobile_code);
json.put("createTime", System.currentTimeMillis() + "");
json.put("createTime", System.currentTimeMillis());
//验证码存入redis中
redisUtil.set(Constant.CAPTCHAS + checkCodeRequest.getPhoneNum(), json, 300L);
return ResultVOUtils.success("发送成功" + " " + mobile_code);

@ -1,224 +0,0 @@
package com.glxp.api.controller.auth;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.beust.jcommander.internal.Lists;
import com.beust.jcommander.internal.Maps;
import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
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.constant.BusinessType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.SysCustomConfigDetailEntity;
import com.glxp.api.entity.auth.SysCustomConfigEntity;
import com.glxp.api.req.auth.SysCustomConfigDetailRequest;
import com.glxp.api.req.auth.SysCustomConfigRequest;
import com.glxp.api.req.system.DeleteRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.auth.SysCustomConfigFromDetailResponse;
import com.glxp.api.res.auth.SysCustomConfigResponse;
import com.glxp.api.service.auth.ISysCustomConfigDetailService;
import com.glxp.api.service.auth.ISysCustomConfigService;
import com.glxp.api.util.StringUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.BindingResult;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.*;
import java.util.stream.Collectors;
/**
*
*
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/custom/config")
@Transactional(rollbackFor = Exception.class)
public class SysCustomConfigController extends BaseController {
private final ISysCustomConfigService sysCustomConfigService;
private final ISysCustomConfigDetailService sysCustomConfigDetailService;
@GetMapping("/list")
public BaseResponse list(SysCustomConfigRequest request, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<SysCustomConfigEntity> list = sysCustomConfigService.filterSysCustomConfig(request);
PageInfo<SysCustomConfigEntity> authAdminPageInfo = new PageInfo<>(list);
PageSimpleResponse<SysCustomConfigEntity> authAdminPageSimpleResponse = new PageSimpleResponse<>();
authAdminPageSimpleResponse.setTotal(authAdminPageInfo.getTotal());
authAdminPageSimpleResponse.setList(list);
return ResultVOUtils.success(authAdminPageSimpleResponse);
}
@AuthRuleAnnotation("")
@PostMapping("/save")
@Log(title = "界面配置管理", businessType = BusinessType.INSERT)
public BaseResponse save(@RequestBody SysCustomConfigEntity entity,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
boolean b = sysCustomConfigService.insertSysCustomConfig(entity);
if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}
return ResultVOUtils.success("添加成功!");
}
@AuthRuleAnnotation("")
@PostMapping("/edit")
@Log(title = "界面配置管理", businessType = BusinessType.UPDATE)
public BaseResponse edit(@RequestBody @Valid SysCustomConfigEntity entity,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (entity.getId() == null) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
SysCustomConfigEntity originEntity = sysCustomConfigService.selectById(entity.getId());
if (originEntity == null) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
boolean b = sysCustomConfigService.updateSysCustomConfig(entity);
if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}
return ResultVOUtils.success("修改成功!");
}
@AuthRuleAnnotation("")
@PostMapping("/delete")
@Log(title = "界面配置管理", businessType = BusinessType.DELETE)
public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) {
if (StringUtils.isEmpty(deleteRequest.getId())) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
boolean b = sysCustomConfigService.deleteById(deleteRequest.getId());
sysCustomConfigDetailService.deleteByConfigId(deleteRequest.getId());
if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}
return ResultVOUtils.success();
}
@AuthRuleAnnotation("")
@PostMapping("/getConfigs")
@Log(title = "界面配置管理")
public BaseResponse getConfigs(@RequestBody SysCustomConfigRequest request,BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<SysCustomConfigEntity> list = sysCustomConfigService.filterSysCustomConfig(request);
if (CollectionUtil.isEmpty(list)) {
return ResultVOUtils.error(ResultEnum.DATA_NOT);
}
SysCustomConfigEntity sysCustomConfigEntity = list.get(0);
SysCustomConfigDetailRequest detailRequest = new SysCustomConfigDetailRequest();
detailRequest.setConfigId(sysCustomConfigEntity.getId().toString());
detailRequest.setIsShow("1");
// detailRequest.setType(request.getType());
List<SysCustomConfigDetailEntity> detailList = sysCustomConfigDetailService.filterSysCustomConfigDetail(detailRequest);
Map<String,List<SysCustomConfigDetailEntity>> map = detailList.stream().collect(
Collectors.groupingBy(SysCustomConfigDetailEntity::getType));
List<SysCustomConfigDetailEntity> tableList = map.get("1") == null? Lists.newArrayList():map.get("1");
List<SysCustomConfigDetailEntity> queryList = map.get("2") == null? Lists.newArrayList():map.get("2");
List<SysCustomConfigDetailEntity> fromList = map.get("3") == null? Lists.newArrayList():map.get("3");
List<SysCustomConfigDetailEntity> fromSortList = fromList.stream().sorted(Comparator.comparing(SysCustomConfigDetailEntity::getLineNumber)).collect(Collectors.toList());
Map<Integer,List<SysCustomConfigDetailEntity>> fromMap = fromSortList.stream().collect(
Collectors.groupingBy(SysCustomConfigDetailEntity::getLineNumber,LinkedHashMap::new,Collectors.toList()));
List<SysCustomConfigFromDetailResponse> fromDetailList = Lists.newArrayList();
for (Map.Entry<Integer, List<SysCustomConfigDetailEntity>> entry : fromMap.entrySet()) {
SysCustomConfigFromDetailResponse sysCustomConfigFromDetailResponse = new SysCustomConfigFromDetailResponse();
sysCustomConfigFromDetailResponse.setNumber(entry.getKey());
List<SysCustomConfigDetailEntity> entities = entry.getValue();
entities.stream().forEach(s->{
if(StringUtils.isNotEmpty(s.getCheckRules())){
String replacedJsonString = s.getCheckRules().replaceAll("(\\w+)(\\s*:\\s*)", "\"$1\"$2");
JSONArray object = JSONArray.parseArray(replacedJsonString);
s.setCheckRulesObj(object);
}
if(StringUtils.isNotEmpty(s.getLableRule())){
JSONObject objectLaber = JSONObject.parseObject(s.getLableRule());
List<Map> mapList = Lists.newArrayList();
Iterator<String> it = objectLaber.keySet().iterator();
String inputType = s.getInputType();
while(it.hasNext()) {
Map<String,Object> mapTemp = Maps.newHashMap();
String key = (String) it.next();
String value = objectLaber.getString(key);
mapTemp.put("label", value);
if("number".equals(inputType)){
mapTemp.put("value", Integer.parseInt(key));
}else{
mapTemp.put("value", key);
}
mapList.add(mapTemp);
}
s.setLableRuleObj(mapList);
}
});
sysCustomConfigFromDetailResponse.setList(entities);
fromDetailList.add(sysCustomConfigFromDetailResponse);
}
tableList.stream().forEach(s->{
if(StringUtils.isNotEmpty(s.getLableRule())) {
JSONObject objectLaber = JSONObject.parseObject(s.getLableRule());
s.setLableRuleObj(objectLaber);
}
if(StringUtils.isNotEmpty(s.getButtonRule())){
JSONArray objectButton = JSONArray.parseArray(s.getButtonRule());
s.setButtonRulObj(objectButton);
}
});
queryList.stream().forEach(s->{
if(StringUtils.isNotEmpty(s.getLableRule())){
JSONObject objectLaber = JSONObject.parseObject(s.getLableRule());
List<Map> mapList = Lists.newArrayList();
Iterator<String> it = objectLaber.keySet().iterator();
while(it.hasNext()) {
Map<String,String> mapTemp = Maps.newHashMap();
String key = (String) it.next();
String value = objectLaber.getString(key);
mapTemp.put("label", value);
mapTemp.put("value", key);
mapList.add(mapTemp);
}
s.setLableRuleObj(mapList);
}
});
SysCustomConfigResponse sysCustomConfigResponse = new SysCustomConfigResponse();
BeanUtil.copyProperties(sysCustomConfigEntity, sysCustomConfigResponse);
sysCustomConfigResponse.setTableList(tableList);
sysCustomConfigResponse.setQueryList(queryList);
sysCustomConfigResponse.setFromList(fromDetailList);
return ResultVOUtils.success(sysCustomConfigResponse);
}
}

@ -1,114 +0,0 @@
package com.glxp.api.controller.auth;
import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
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.constant.BusinessType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.SysCustomConfigDetailEntity;
import com.glxp.api.req.auth.SysCustomConfigDetailRequest;
import com.glxp.api.req.system.DeleteRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.service.auth.ISysCustomConfigDetailService;
import com.glxp.api.util.StringUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.BindingResult;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
/**
*
*
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/custom/configDetail")
@Transactional(rollbackFor = Exception.class)
public class SysCustomConfigDetailController extends BaseController {
private final ISysCustomConfigDetailService sysCustomConfigDetailService;
@GetMapping("/list")
public BaseResponse list(SysCustomConfigDetailRequest request, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<SysCustomConfigDetailEntity> list = sysCustomConfigDetailService.filterSysCustomConfigDetail(request);
PageInfo<SysCustomConfigDetailEntity> authAdminPageInfo = new PageInfo<>(list);
PageSimpleResponse<SysCustomConfigDetailEntity> authAdminPageSimpleResponse = new PageSimpleResponse<>();
authAdminPageSimpleResponse.setTotal(authAdminPageInfo.getTotal());
authAdminPageSimpleResponse.setList(list);
return ResultVOUtils.success(authAdminPageSimpleResponse);
}
@AuthRuleAnnotation("")
@PostMapping("/save")
@Log(title = "界面配置管理", businessType = BusinessType.INSERT)
public BaseResponse save(@RequestBody SysCustomConfigDetailEntity entity,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
boolean b = sysCustomConfigDetailService.insertSysCustomConfigDetail(entity);
if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}
return ResultVOUtils.success("添加成功!");
}
@AuthRuleAnnotation("")
@PostMapping("/edit")
@Log(title = "界面配置管理", businessType = BusinessType.UPDATE)
public BaseResponse edit(@RequestBody @Valid SysCustomConfigDetailEntity entity,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (entity.getId() == null) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
SysCustomConfigDetailEntity originEntity = sysCustomConfigDetailService.selectById(entity.getId());
if (originEntity == null) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
boolean b = sysCustomConfigDetailService.updateSysCustomConfigDetail(entity);
if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}
return ResultVOUtils.success("修改成功!");
}
@AuthRuleAnnotation("")
@PostMapping("/delete")
@Log(title = "界面配置管理", businessType = BusinessType.DELETE)
public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) {
if (StringUtils.isEmpty(deleteRequest.getId())) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
boolean b = sysCustomConfigDetailService.deleteById(deleteRequest.getId());
if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}
return ResultVOUtils.success();
}
}

@ -17,7 +17,6 @@ import com.glxp.api.constant.ConstantType;
import com.glxp.api.constant.SocketMsgType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.controller.sync.SpsSyncWebSocket;
import com.glxp.api.dto.DictDto;
import com.glxp.api.entity.auth.WarehouseBussinessTypeEntity;
import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
import com.glxp.api.entity.sync.SocketMsgEntity;
@ -54,7 +53,6 @@ import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
/**
*
@ -260,58 +258,6 @@ public class BasicBussinessTypeController extends BaseController {
}
@AuthRuleAnnotation("")
@GetMapping("/udiwms/localBusType/filterJoinByUserOptimize")
public BaseResponse filterJoinByUserOptimize(FilterBussinessTypeRequest bussinessTypeFilterRequest,
BindingResult bindingResult) {
List<DictDto> reList = new ArrayList<>();
if (StrUtil.isNotEmpty(bussinessTypeFilterRequest.getVueType())) {
List<BasicBussinessTypeEntity> result = new ArrayList<>();
List<BasicBussinessTypeEntity> bussinessTypeEntities = basicBussinessTypeService.findByVueType(bussinessTypeFilterRequest.getVueType());
if (StrUtil.isNotEmpty(bussinessTypeFilterRequest.getInvCode()) || StrUtil.isNotEmpty(bussinessTypeFilterRequest.getCode())) {
//过滤是否是当前仓库底下单据类型
FilterBussinessTypeRequest tempRequest = new FilterBussinessTypeRequest();
tempRequest.setCode(bussinessTypeFilterRequest.getCode());
tempRequest.setInvCode(bussinessTypeFilterRequest.getInvCode());
tempRequest.setMainAction(bussinessTypeFilterRequest.getMainAction());
List<BasicBussinessTypeResponse> bussinessTypeResponses = basicBussinessTypeService.filterJoinByInv(tempRequest);
if (CollUtil.isNotEmpty(bussinessTypeResponses)) {
for (BasicBussinessTypeResponse bussinessTypExportResponse : bussinessTypeResponses) {
for (BasicBussinessTypeEntity basicBussinessTypeEntity : bussinessTypeEntities) {
if (bussinessTypExportResponse.getAction().equals(basicBussinessTypeEntity.getAction())) {
result.add(basicBussinessTypeEntity);
}
}
}
}
} else {
result.addAll(bussinessTypeEntities);
}
reList = result.stream().map(s-> {
DictDto dictDto = new DictDto(s.getAction(),s.getName());
return dictDto;
}).collect(Collectors.toList());
} else {
List<BasicBussinessTypeResponse> bussinessTypeEntities;
//判断是否是医院用户
bussinessTypeFilterRequest.setUserId(getUserId());
bussinessTypeEntities = basicBussinessTypeService.filterJoinByUser(
bussinessTypeFilterRequest);
reList = bussinessTypeEntities.stream().map(s-> {
DictDto dictDto = new DictDto(s.getAction(),s.getName());
return dictDto;
}).collect(Collectors.toList());
}
return ResultVOUtils.success(reList);
}
@Resource
IoOrderService orderService;
@Resource

@ -13,7 +13,6 @@ import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.constant.SocketMsgType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.controller.sync.SpsSyncWebSocket;
import com.glxp.api.dto.DictDto;
import com.glxp.api.entity.basic.BasicCorpEntity;
import com.glxp.api.entity.sync.SocketMsgEntity;
import com.glxp.api.entity.system.SystemParamConfigEntity;
@ -95,28 +94,6 @@ public class BasicCorpController extends BaseController {
return ResultVOUtils.success(pageSimpleResponse);
}
@GetMapping("/udiwms/basic/unit/maintain/filterOptimize")
public BaseResponse filterBasicUnitMaintainOptimize(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<BasicCorpEntity> basicUnitMaintainEntities;
basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
PageInfo<BasicCorpEntity> pageInfo = new PageInfo<>(basicUnitMaintainEntities);
PageSimpleResponse<DictDto> pageSimpleResponse = new PageSimpleResponse<>();
List<DictDto> reList = basicUnitMaintainEntities.stream().map(s-> {
DictDto dictDto = new DictDto(s.getErpId(),s.getName());
return dictDto;
}).collect(Collectors.toList());
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(reList);
return ResultVOUtils.success(pageSimpleResponse);
}
@GetMapping("/udiwms/basic/unit/maintain/filter2")
public BaseResponse filterBasicUnitMaintain2(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,
BindingResult bindingResult) {

@ -193,9 +193,8 @@ public class UdiContrastController {
productInfoService.insertProductInfos(productInfoEntityList);
newUuid = productInfoEntityList.get(0).getUuid();
}
} else {
return ResultVOUtils.error(500, "实时获取国家库数据失败!");
}
udiInfoEntities = udiDlHttpClient.getUdiByUuid(newUuid);
udiProductService.deleteByUuid(udiCombineRequest.getUuid());
for (UdiProductEntity udiProductEntity : udiInfoEntities) {

@ -16,7 +16,6 @@ import com.glxp.api.constant.SocketMsgType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.controller.sync.SpsSyncWebSocket;
import com.glxp.api.dao.basic.UdiRelevanceDao;
import com.glxp.api.dto.DictDto;
import com.glxp.api.entity.basic.*;
import com.glxp.api.entity.sync.SocketMsgEntity;
import com.glxp.api.entity.system.SystemParamConfigEntity;
@ -36,7 +35,6 @@ import com.glxp.api.service.inv.InvProductService;
import com.glxp.api.service.system.SystemParamConfigService;
import com.glxp.api.service.thrsys.ThrDataService;
import com.glxp.api.service.thrsys.ThrSystemService;
import com.glxp.api.util.IntUtil;
import com.glxp.api.util.udi.FilterUdiUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.validation.BindingResult;
@ -344,7 +342,6 @@ public class UdiRelevanceController extends BaseController {
udiProductEntity.setAllowNoProduct(udiRelevanceSaveRequest.getAllowNoProduct());
udiProductEntity.setAllowNoSerial(udiRelevanceSaveRequest.getAllowNoSerial());
udiProductEntity.setZxxsbzbhsydysl(udiRelevanceEntity.getUseNum());
udiProductEntity.setGroupBuy(udiRelevanceSaveRequest.getGroupBuy());
udiProductEntity.setBasicPrductRemak1(udiRelevanceSaveRequest.getBasicPrductRemak1());
udiProductEntity.setBasicPrductRemak2(udiRelevanceSaveRequest.getBasicPrductRemak2());
udiProductEntity.setBasicPrductRemak3(udiRelevanceSaveRequest.getBasicPrductRemak3());
@ -522,38 +519,6 @@ public class UdiRelevanceController extends BaseController {
return ResultVOUtils.success(pageSimpleResponse);
}
//获取产品信息详情(多平台)
@AuthRuleAnnotation("")
@GetMapping("/udiwms/udirel/thirdSys/filterOptimize")
public BaseResponse getThirdSysfilterOptimize(FilterUdiRelRequest filterUdiRelRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
FilterBasicThirdSysRequest filterBasicThirdSysRequest = new FilterBasicThirdSysRequest();
filterBasicThirdSysRequest.setEnabled(true);
List<ThrSystemEntity> basicThirdSysEntities = thrSystemService.filterBasicThiSys(filterBasicThirdSysRequest);
List<DictDto> filterSysEntityList = new ArrayList<DictDto>();
filterSysEntityList.add(new DictDto(0, "全部"));
filterSysEntityList.add(new DictDto(1, "对照完成"));
filterSysEntityList.add(new DictDto(2, "未对照DI"));
if (basicThirdSysEntities != null && basicThirdSysEntities.size() > 0) {
for (int i = 0; i < basicThirdSysEntities.size(); i++) {
filterSysEntityList.add(new DictDto(i + 3, "未对照" + basicThirdSysEntities.get(i).getThirdName()));
}
}
filterSysEntityList.add(new DictDto(10, "最新同步"));
PageInfo<DictDto> pageInfo;
pageInfo = new PageInfo<>(filterSysEntityList);
PageSimpleResponse<DictDto> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(filterSysEntityList);
return ResultVOUtils.success(pageSimpleResponse);
}
//获取对照过滤列表
@AuthRuleAnnotation("")
@ -717,7 +682,7 @@ public class UdiRelevanceController extends BaseController {
boolean falg = udiProductService.updateUdiInfoById(udiProductEntity);
UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
udiRelevanceEntity.setId(udiProductEntity.getUid());
udiRelevanceEntity.setGroupBuy(IntUtil.value(udiProductEntity.getGroupBuy()));
udiRelevanceEntity.setGroupBuy(udiProductEntity.isGroupBuy());
boolean b = udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
if (udiProductEntity.getRelSupId() != null) {
UdiRlSupEntity udiRlSupEntity = new UdiRlSupEntity();

@ -244,7 +244,6 @@ public class UdiRlSupController extends BaseController {
UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
udiRelevanceEntity.setId(Long.parseLong(rlidStr));
udiRelevanceEntity.setLockStatus(1);
udiRelevanceEntity.setGroupBuy(udiInfoExportRequest.getSupplementRequest().getGroupBuy());
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
UdiProductEntity udiProductEntity = new UdiProductEntity();
BeanUtil.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiProductEntity);

@ -3,13 +3,11 @@ package com.glxp.api.controller.basic;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.AsyncDiDlHelper;
import com.glxp.api.dto.DictDto;
import com.glxp.api.entity.basic.*;
import com.glxp.api.req.basic.*;
import com.glxp.api.res.PageSimpleResponse;
@ -23,7 +21,6 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
*
@ -117,27 +114,6 @@ public class UdiSyncController {
}
}
//获取同步库医疗器械注册人信息
@AuthRuleAnnotation("")
@GetMapping("udiwms/udiinfo/filterCompanyOptimize")
public BaseResponse filterCompanyOptimize(UdiCompanyRequest udiCompanyRequest) {
try {
BaseResponse<Page<UdiCompanyEntity>> udiDlDeviceResponse = syncUdiService.filterCompany(udiCompanyRequest);
List<DictDto> reList = udiDlDeviceResponse.getData().getResult().stream().map(s-> {
DictDto dictDto = new DictDto(s.getYlqxzcrbarmc(),s.getYlqxzcrbarmc());
return dictDto;
}).collect(Collectors.toList());
PageSimpleResponse<DictDto> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(udiDlDeviceResponse.getData().getTotal());
pageSimpleResponse.setList(reList);
return ResultVOUtils.success(pageSimpleResponse);
} catch (Exception e) {
e.printStackTrace();
return ResultVOUtils.error(500, "连接UDI数据下载服务出错");
}
}
@AuthRuleAnnotation("")
@GetMapping("udiwms/udiinfo/superSearch")
public BaseResponse superSearch(FilterUdiInfoRequest filterUdiInfoRequest) {

@ -15,6 +15,7 @@ import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.*;
import com.glxp.api.controller.BaseController;
import com.glxp.api.controller.sync.SpsSyncWebSocket;
import com.glxp.api.dao.inout.IoOrderDetailBizDao;
import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.auth.InvBusUserEntity;
import com.glxp.api.entity.auth.InvWarehouseEntity;
@ -83,7 +84,7 @@ public class IoOrderController extends BaseController {
@Resource
IoOrderInvoiceService orderInvoiceService;
@Resource
private SystemParamConfigService systemParamConfigService;
IoOrderDetailBizDao orderDetailBizDao;
/**
*
@ -873,7 +874,7 @@ public class IoOrderController extends BaseController {
return ResultVOUtils.page(pageInfo);
}
@AuthRuleAnnotation("")
@GetMapping("/udiwms/inout/order/findByBillNo")
public BaseResponse findByBillNo(@RequestParam("billNo") String billNo) {
if (StrUtil.isBlank(billNo)) {
@ -883,5 +884,56 @@ public class IoOrderController extends BaseController {
return ResultVOUtils.success(orderEntity);
}
/**
*
*
* @param ioOrderEntity
* @return
*/
@AuthRuleAnnotation("")
@PostMapping("/udiwms/inout/order/copyOrder")
@Log(title = "单据再次配货", businessType = BusinessType.UPDATE)
public BaseResponse copyOrder(@RequestBody IoOrderEntity ioOrderEntity) {
IoOrderEntity orderEntity;
IoOrderEntity originOrderEntity = orderService.findByBillNo(ioOrderEntity.getBillNo());
originOrderEntity.setRepeatSup(true);
orderService.update(originOrderEntity);
orderEntity = orderService.findByCorpId(ioOrderEntity.getBillNo());
if (orderEntity != null && orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_TEMP_SAVE) {
return ResultVOUtils.success(orderEntity);
}
orderEntity = new IoOrderEntity();
BeanUtil.copyProperties(originOrderEntity, orderEntity);
String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER, "yyyyMMdd"));
orderEntity.setCreateTime(new Date());
orderEntity.setBillNo(orderNo);
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE);
orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_DRAFT);
orderEntity.setCorpOrderId(orderEntity.getBillNo());
orderEntity.setFromType(ConstantStatus.FROM_WEBNEW);
orderEntity.setMainAction(ConstantType.TYPE_PUT);
orderEntity.setAction(null);
orderEntity.setUpdateTime(new Date());
orderEntity.setUpdateUser(null);
orderEntity.setRelKey(null);
orderEntity.setRepeatSup(true);
orderEntity.setOriginUllageSupNo(orderEntity.getBillNo());
orderService.insertOrder(orderEntity);
List<IoOrderDetailBizEntity> originDetailBizEntities = orderDetailBizService.findByOrderId(ioOrderEntity.getBillNo());
List<IoOrderDetailBizEntity> orderDetailBizEntities = BeanUtil.copyToList(originDetailBizEntities, IoOrderDetailBizEntity.class);
orderDetailBizEntities.forEach(item ->
{
item.setId(null);
item.setOrderIdFk(orderNo);
orderDetailBizService.insert(item);
}
);
return ResultVOUtils.success(orderEntity);
}
}

@ -437,7 +437,7 @@ public class SupCertController {
supData.put("status", obj.getStatus() == 0 ? "有效" : "失效");
supData.put("auditStatus", getAuditStatus(obj.getAuditStatus()));
supData.put("remark", obj.getRemark() == null ? ' ' : obj.getRemark());
supData.put("filePath", filePath + "register/file/image2/" + url);
supData.put("filePath", filePath + "register/image2/" + url);
list.add(supData);
i++;
}
@ -553,7 +553,7 @@ public class SupCertController {
supData.put("status", obj.getStatus() == 0 ? "有效" : "失效");
supData.put("auditStatus", getAuditStatus(obj.getAuditStatus()));
supData.put("remark2", obj.getRemark() == null ? ' ' : obj.getRemark());
supData.put("filePath", filePath + "register/file/image2/" + url);
supData.put("filePath", filePath + "register/image2/" + url);
list.add(supData);
i++;
}
@ -619,7 +619,7 @@ public class SupCertController {
supData.put("status", obj.getStatus() == 0 ? "有效" : "失效");
supData.put("auditStatus", getAuditStatus(obj.getAuditStatus()));
supData.put("remark2", obj.getRemark() == null ? ' ' : obj.getRemark());
supData.put("filePath", filePath + "register/file/image2/" + url);
supData.put("filePath", filePath + "register/image2/" + url);
list.add(supData);
i++;
}

@ -144,16 +144,15 @@ public class SupProductController {
int i = supProductService.findProduct(supProductEntity);
System.out.println(i);
if (i == 0) {
supProductEntity.setCreateTime(new Date());
supProductEntity.setUpdateTime(new Date());
supProductEntity.setId(IdUtil.getSnowflakeNextId());
boolean b = supProductService.insertRegistration(supProductEntity);
if (b) {
return ResultVOUtils.success("添加成功");
} else {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}
supProductEntity.setCreateTime(new Date());
supProductEntity.setUpdateTime(new Date());
supProductEntity.setId(IdUtil.getSnowflakeNextId());
boolean b = supProductService.insertRegistration(supProductEntity);
if (b) {
return ResultVOUtils.success("添加成功");
} else {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}} else {
return ResultVOUtils.error(ResultEnum.DATA_REPEAT);
}
}
@ -177,7 +176,6 @@ public class SupProductController {
supProductEntity.setProductType(udiRelevanceResponse.getQxlb());
supProductEntity.setProductDirectoryCode(udiRelevanceResponse.getFlbm());
supProductEntity.setRecordPeopleName(udiRelevanceResponse.getYlqxzcrbarmc());
supProductEntity.setManufactory(selectProductBindRequest.getCompanyName());
supProductEntity.setSpecification(udiRelevanceResponse.getGgxh());
supProductEntity.setCreateTime(new Date());
supProductEntity.setUpdateTime(new Date());

@ -8,7 +8,6 @@ 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.constant.BusinessType;
import com.glxp.api.dto.DictDto;
import com.glxp.api.entity.auth.*;
import com.glxp.api.entity.purchase.CustomerContactEntity;
import com.glxp.api.entity.system.CompanyEntity;
@ -32,7 +31,6 @@ import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@RestController
@Slf4j
@ -64,23 +62,6 @@ public class CustomerController {
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("")
@GetMapping("/spms/customer/listOptimize")
public BaseResponse filterCustomersOptimize(CustomerInfoFilterRequest customerFilterRequest) {
List<CustomerInfoEntity> customerDetailEntities = customerInfoService.filterCustomerInfo(customerFilterRequest);
List<DictDto> reList = customerDetailEntities.stream().map(s-> {
DictDto dictDto = new DictDto(s.getCustomerId().toString(),s.getCompanyName());
return dictDto;
}).collect(Collectors.toList());
PageInfo<DictDto> pageInfo;
pageInfo = new PageInfo<>(reList);
PageSimpleResponse<DictDto> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(reList);
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("")
@GetMapping("salewarehouse/customer/list")
public BaseResponse filterList(CustomerInfoFilterRequest customerFilterRequest) {
@ -102,7 +83,6 @@ public class CustomerController {
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("")
@GetMapping("salewarehouse/customer/detail")
public BaseResponse customerDetail(CustomerInfoFilterRequest customerFilterRequest) {

@ -1,68 +0,0 @@
package com.glxp.api.controller.sync;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.dao.basic.BasicProductsDao;
import com.glxp.api.dao.basic.CompanyProductRelevanceDao;
import com.glxp.api.dao.basic.UdiRelevanceDao;
import com.glxp.api.entity.basic.UdiRelevanceEntity;
import com.glxp.api.req.sync.SpsSyncBasicRlRequest;
import com.glxp.api.req.system.DeleteRequest;
import io.swagger.annotations.Api;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
@RestController
@Api(tags = "内网基础信息同步修改")
@RequiredArgsConstructor
@Slf4j
public class SpsSyncBasicController {
private final UdiRelevanceDao udiRelevanceDao;
private final BasicProductsDao basicProductsDao;
private final CompanyProductRelevanceDao relevanceDao;
@AuthRuleAnnotation("")
@PostMapping("/spssync/basic/udirl/update")
@Log(title = "内网同步修改基础数据", businessType = BusinessType.UPDATE)
public BaseResponse udiRlUpdate(@RequestBody UdiRelevanceEntity udiRelevanceEntity) {
if (udiRelevanceEntity.getId() == null) {
return ResultVOUtils.error(500, "缺少唯一标识");
}
int b = udiRelevanceDao.updateById(udiRelevanceEntity);
if (b > 0)
return ResultVOUtils.success("更新成功!");
else
return ResultVOUtils.error(500, "更新失败!");
}
@AuthRuleAnnotation("")
@PostMapping("/spssync/basic/udirl/batchInsert")
@Log(title = "内网同步修改基础数据", businessType = BusinessType.UPDATE)
public BaseResponse udiRlUpdate(@RequestBody SpsSyncBasicRlRequest spsSyncBasicRlRequest) {
if (CollectionUtil.isNotEmpty(spsSyncBasicRlRequest.getUdiRelevanceEntities())) {
udiRelevanceDao.replaceBatchs(spsSyncBasicRlRequest.getUdiRelevanceEntities());
}
if (CollectionUtil.isNotEmpty(spsSyncBasicRlRequest.getBasicProductsEntities())) {
basicProductsDao.replaceBatchs(spsSyncBasicRlRequest.getBasicProductsEntities());
}
if (CollectionUtil.isNotEmpty(spsSyncBasicRlRequest.getCompanyProductRelevanceEntities())) {
relevanceDao.replaceBatchs(spsSyncBasicRlRequest.getCompanyProductRelevanceEntities());
}
return ResultVOUtils.success("同步成功!");
}
}

@ -1332,6 +1332,5 @@ public class SpsSyncDownloadController {
}
}
}

@ -1,44 +0,0 @@
package com.glxp.api.controller.thrsys;
import com.github.pagehelper.PageInfo;
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.thrsys.ThrProductTypeEntity;
import com.glxp.api.req.thrsys.FilterThrProductTypeRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.service.thrsys.ThrProductTypeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
@Slf4j
@RestController
public class ThrProductTypeCotroller {
@Resource
ThrProductTypeService thrProductTypeService;
@AuthRuleAnnotation("")
@GetMapping("/udiwms/thrsys/getThrProductType")
public BaseResponse getProductTypes(FilterThrProductTypeRequest filterThrProductTypeRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<ThrProductTypeEntity> thrProductTypeEntityList
= thrProductTypeService.getProductTypes(filterThrProductTypeRequest);
PageInfo<ThrProductTypeEntity> pageInfo;
pageInfo = new PageInfo<ThrProductTypeEntity>(thrProductTypeEntityList);
PageSimpleResponse<ThrProductTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(thrProductTypeEntityList);
return ResultVOUtils.success(pageSimpleResponse);
}
}

@ -224,8 +224,6 @@ public class ThrProductsAddDiController {
udiProductEntity.setBasicPrductRemak6(thrProductsAddDiResponse.getBasicPrductRemak6());
udiProductEntity.setBasicPrductRemak7(thrProductsAddDiResponse.getBasicPrductRemak7());
udiProductEntity.setBasicPrductRemak8(thrProductsAddDiResponse.getBasicPrductRemak8());
udiProductEntity.setGroupBuy(thrProductsAddDiResponse.getGroupBuy());
udiRelevanceEntity.setGroupBuy(thrProductsAddDiResponse.getGroupBuy());
udiProductEntity.setNameCode(null);
udiProductService.updateUdiInfoByUuid(udiProductEntity);
UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity();

@ -1,26 +0,0 @@
package com.glxp.api.dao.auth;
import com.glxp.api.entity.auth.SysCustomConfigEntity;
import com.glxp.api.req.auth.SysCustomConfigRequest;
import com.glxp.api.req.system.DeleteRequest;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface SysCustomConfigDao {
List<SysCustomConfigEntity> filterSysCustomConfig(SysCustomConfigRequest request);
boolean insertSysCustomConfig(SysCustomConfigEntity entity);
boolean updateSysCustomConfig(SysCustomConfigEntity entity);
boolean deleteById(String id);
SysCustomConfigEntity selectById(Long id);
boolean deleteContact(DeleteRequest request);
}

@ -1,28 +0,0 @@
package com.glxp.api.dao.auth;
import com.glxp.api.entity.auth.SysCustomConfigDetailEntity;
import com.glxp.api.req.auth.SysCustomConfigDetailRequest;
import com.glxp.api.req.system.DeleteRequest;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface SysCustomConfigDetailDao {
List<SysCustomConfigDetailEntity> filterSysCustomConfigDetail(SysCustomConfigDetailRequest request);
boolean insertSysCustomConfigDetail(SysCustomConfigDetailEntity entity);
boolean updateSysCustomConfigDetail(SysCustomConfigDetailEntity entity);
boolean deleteById(String id);
boolean deleteByConfigId(String id);
SysCustomConfigDetailEntity selectById(Long id);
boolean deleteContact(DeleteRequest request);
}

@ -30,7 +30,4 @@ public interface IoOrderDetailResultDao extends BaseMapperPlus<IoOrderDetailResu
List<CptTraceOrderResponse> cptTrace(CptTraceRequest cptTraceRequest);
List<CptTraceOrderResponse> cptCodeTrace(CptTraceRequest cptTraceRequest);
}

@ -1,15 +0,0 @@
package com.glxp.api.dao.thrsys;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.thrsys.ThrProductTypeEntity;
import com.glxp.api.req.thrsys.FilterThrProductTypeRequest;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface ThrProductTypeMapper extends BaseMapper<ThrProductTypeEntity> {
List<ThrProductTypeEntity> getProductTypes(FilterThrProductTypeRequest filterThrProductTypeRequest);
}

@ -1,20 +0,0 @@
package com.glxp.api.dto;
import lombok.Data;
@Data
public class DictDto {
private String code;
private String label;
public DictDto(String code, String label) {
this.code = code;
this.label = label;
}
public DictDto(Integer code, String label) {
this.code = code.toString();
this.label = label;
}
}

@ -1,188 +0,0 @@
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;
/**
* <p>
*
* </p>
*
* @author
* @since 2023-02-07
*/
@TableName("sys_custom_config_detail")
@Data
public class SysCustomConfigDetailEntity {
@TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
* id
*/
@TableField("configId")
private Long configId;
/**
* 1 2 3
*/
@TableField("type")
private String type;
/**
* 1 2
*/
@TableField("isShow")
private String isShow;
/**
*
*/
@TableField("columnName")
private String columnName;
/**
*
*/
@TableField("columnDesc")
private String columnDesc;
/**
*
*/
@TableField("columnType")
private String columnType;
/**
*
*/
@TableField("colorRule")
private String colorRule;
/**
*
*/
@TableField("lableRule")
private String lableRule;
/**
*
*/
@TableField(exist = false)
private Object lableRuleObj;
/**
*
*/
@TableField("buttonRule")
private String buttonRule;
/**
*
*/
@TableField(exist = false)
private Object buttonRulObj;
/**
*
*/
@TableField("width")
private Integer width;
/**
*
*/
@TableField("sort")
private Boolean sort;
/**
*
*/
@TableField("tooltip")
private Boolean tooltip;
/**
*
*/
@TableField("number")
private Integer number;
/**
*
*/
@TableField("lineNumber")
private Integer lineNumber;
/**
*
*/
@TableField("clickFuc")
private String clickFuc;
/**
*
*/
@TableField("禁用方法")
private String disabledFuc;
/**
* eval
*/
@TableField("eval表达式")
private String expression;
/**
*
*/
@TableField("size")
private String size;
/**
*
*/
@TableField("style")
private String style;
/**
*
*/
@TableField("disabled")
private Boolean disabled;
/**
*
*/
@TableField("checkRules")
private String checkRules;
/**
*
*/
@TableField(exist = false)
private Object checkRulesObj;
/**
* input
*/
@TableField("inputType")
private String inputType;
/**
*
*/
@TableField("dataFuc")
private String dataFuc;
/**
* 1 2
*/
@TableField("isShowXx")
private String isShowXx;
}

@ -1,49 +0,0 @@
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;
/**
* <p>
*
* </p>
*
* @author
* @since 2023-02-07
*/
@TableName("sys_custom_config")
@Data
public class SysCustomConfigEntity {
@TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
*
*/
@TableField("businessType")
private String businessType;
/**
*
*/
@TableField("remark")
private String remark;
/**
* 1 2
*/
@TableField("type")
private String type;
/**
*
*/
@TableField("handleChangeFuc")
private String handleChangeFuc;
}

@ -99,7 +99,7 @@ public class BasicCorpEntity {
private String thirdName4;
/**
* 1.23,4.
* 1.23,4.
*/
@TableField(value = "corpType")
private Integer corpType;

@ -348,9 +348,6 @@ public class BasicProductsEntity {
@TableField(value = "remark")
private String remark;
@TableField(value = "cphhhbh")
private String cphhhbh;
public static final String COL_ID = "id";
public static final String COL_UUID = "uuid";

@ -95,7 +95,7 @@ public class UdiProductEntity {
private Long relSupId;
private Boolean groupBuy;
private boolean groupBuy;
private Long uid;

@ -271,4 +271,11 @@ public class IoOrderEntity {
private String outSickInfo;
/**
*
*/
@TableField(value = "repeatSup")
private Boolean repeatSup;
}

@ -1,56 +0,0 @@
package com.glxp.api.entity.thrsys;
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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
@ApiModel(value = "com-glxp-api-entity-thrsys-ThrProductType")
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "thr_product_type")
public class ThrProductTypeEntity implements Serializable {
@TableId(value = "id", type = IdType.INPUT)
@ApiModelProperty(value = "")
private Integer id;
/**
*
*/
@TableField(value = "code")
@ApiModelProperty(value = "类别编码")
private String code;
/**
*
*/
@TableField(value = "`name`")
@ApiModelProperty(value = "类别名称")
private String name;
/**
*
*/
@TableField(value = "thirdSys")
@ApiModelProperty(value = "第三系统标识")
private String thirdSys;
/**
*
*/
@TableField(value = "remark")
@ApiModelProperty(value = "备注")
private String remark;
private static final long serialVersionUID = 1L;
}

@ -282,11 +282,6 @@ public class ThrProductsAddDiEntity {
@ApiModelProperty(value = "关联ID主键")
private String relId;
@TableField(value = "groupBuy")
@ApiModelProperty(value = "集采")
private Boolean groupBuy;
/**
* 12
*/

@ -2,7 +2,6 @@ package com.glxp.api.http;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.entity.basic.ProductInfoEntity;
import com.glxp.api.entity.basic.UdiProductEntity;
@ -34,8 +33,7 @@ public class NmpaUdiClient {
productInfoFilterRequest.setPage(1);
productInfoFilterRequest.setLimit(100);
productInfoFilterRequest.setUuid(uuid);
if (StrUtil.isEmpty(uuid))
return null;
List<ProductInfoEntity> productInfoEntityList = productInfoService.findAll(productInfoFilterRequest);
List<UdiProductEntity> udiInfoEntities = new ArrayList<>();
String myUuid = UuidUtils.getUUId();

@ -14,9 +14,6 @@ public class FilterInvWarehouseRequest extends ListPageRequest {
private String code;
private String name;
private String deptCode;
/**
* 1:23
*/
private Integer advanceType;
private Boolean isDefault;
private Date updateTime;

@ -1,12 +0,0 @@
package com.glxp.api.req.auth;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
@Data
public class SysCustomConfigDetailRequest extends ListPageRequest {
private String configId;
private String type;
private String isShow;
}

@ -1,13 +0,0 @@
package com.glxp.api.req.auth;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
@Data
public class SysCustomConfigRequest extends ListPageRequest {
private String businessType;
private String remark;
private String type;
}

@ -5,6 +5,7 @@ import lombok.Data;
//选入产品补充信息
@Data
public class SupplementRequest {
//补充信息:
private String basicPrductRemak1;
private String basicPrductRemak2;
@ -21,5 +22,4 @@ public class SupplementRequest {
private String spmc;
private String cpms;
private String price;
private Boolean groupBuy;
}

@ -1,16 +0,0 @@
package com.glxp.api.req.sync;
import com.glxp.api.entity.basic.BasicProductsEntity;
import com.glxp.api.entity.basic.CompanyProductRelevanceEntity;
import com.glxp.api.entity.basic.UdiRelevanceEntity;
import lombok.Data;
import java.util.List;
@Data
public class SpsSyncBasicRlRequest {
private List<UdiRelevanceEntity> udiRelevanceEntities;
private List<CompanyProductRelevanceEntity> companyProductRelevanceEntities;
private List<BasicProductsEntity> basicProductsEntities;
}

@ -49,7 +49,6 @@ public class AddThrDiProductsRequest {
private String basicPrductRemak8;
private String deviceRecordKey;
private Boolean groupBuy;
}

@ -1,26 +0,0 @@
package com.glxp.api.req.thrsys;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
@Data
public class FilterThrProductTypeRequest extends ListPageRequest {
/**
*
*/
private String code;
/**
*
*/
private String name;
/**
*
*/
private String thirdSys;
private String key;
}

@ -1,12 +0,0 @@
package com.glxp.api.res.auth;
import com.glxp.api.entity.auth.SysCustomConfigDetailEntity;
import lombok.Data;
import java.util.List;
@Data
public class SysCustomConfigFromDetailResponse {
Integer number;
List<SysCustomConfigDetailEntity> list;
}

@ -1,18 +0,0 @@
package com.glxp.api.res.auth;
import com.glxp.api.entity.auth.SysCustomConfigDetailEntity;
import com.glxp.api.entity.auth.SysCustomConfigEntity;
import lombok.Data;
import java.util.List;
@Data
public class SysCustomConfigResponse extends SysCustomConfigEntity{
List<SysCustomConfigDetailEntity> tableList;
List<SysCustomConfigDetailEntity> queryList;
List<SysCustomConfigFromDetailResponse> fromList;
}

@ -83,6 +83,4 @@ public class CompanyProductRelevanceResponse {
private String basicPrductRemak6;
private String basicPrductRemak7;
private String basicPrductRemak8;
private String cphhhbh;
}

@ -119,7 +119,7 @@ public class UdiRelevanceResponse {
private String syqsfxyjxmj;
private String mjfs;
private String categoryName;
private String cphhhbh;
public int getBhzxxsbzsl() {
if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {

@ -45,7 +45,6 @@ public class UdiRlDlResponse {
private String sptm;
private Integer productType;
private String mainId;
private String cphhhbh;
public Integer getProductType() {
if (productType == null) return 0

@ -94,6 +94,6 @@ public class UdiRlSupResponse {
private String classifyName;
private boolean groupBuy; //是否集采产品
private String cphhhbh;
private Long uid;
}

@ -258,6 +258,9 @@ public class IoOrderResponse {
private boolean checkType;
private Boolean repeatSup;
public String getFromName() {
if (StrUtil.isNotEmpty(fromCorpName))

@ -23,7 +23,6 @@ public class InnerOrderPrintResponse {
private String ylqxzcrbarmc;
private String zczbhhzbapzbh;
private String warehouseName;
private String manufactory;
private String warehouseCode;
private String spaceCode;
private String spaceName;

@ -6,7 +6,7 @@ import com.glxp.api.dao.BaseMapperPlus;
import java.util.List;
public class CustomServiceImpl<M extends BaseMapperPlus<M,T,T>, T> extends ServiceImpl<M, T> implements CustomService<T>{
public class CustomServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<BaseMapperPlus<M,T,T>, T> implements CustomService<T>{
@Override
public int insertIgnore(T entity) {
return baseMapper.insertIgnore(entity);

@ -1,23 +0,0 @@
package com.glxp.api.service.auth;
import com.glxp.api.entity.auth.SysCustomConfigDetailEntity;
import com.glxp.api.req.auth.SysCustomConfigDetailRequest;
import java.util.List;
public interface ISysCustomConfigDetailService {
List<SysCustomConfigDetailEntity> filterSysCustomConfigDetail(SysCustomConfigDetailRequest request);
boolean insertSysCustomConfigDetail(SysCustomConfigDetailEntity entity);
boolean updateSysCustomConfigDetail(SysCustomConfigDetailEntity entity);
boolean deleteById(String id);
boolean deleteByConfigId(String id);
SysCustomConfigDetailEntity selectById(Long id);
}

@ -1,21 +0,0 @@
package com.glxp.api.service.auth;
import com.glxp.api.entity.auth.SysCustomConfigEntity;
import com.glxp.api.req.auth.SysCustomConfigRequest;
import java.util.List;
public interface ISysCustomConfigService {
List<SysCustomConfigEntity> filterSysCustomConfig(SysCustomConfigRequest request);
boolean insertSysCustomConfig(SysCustomConfigEntity entity);
boolean updateSysCustomConfig(SysCustomConfigEntity entity);
boolean deleteById(String id);
SysCustomConfigEntity selectById(Long id);
}

@ -1,52 +0,0 @@
package com.glxp.api.service.auth.impl;
import com.glxp.api.dao.auth.SysCustomConfigDetailDao;
import com.glxp.api.entity.auth.SysCustomConfigDetailEntity;
import com.glxp.api.req.auth.SysCustomConfigDetailRequest;
import com.glxp.api.service.auth.ISysCustomConfigDetailService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
@Service
@Transactional(rollbackFor = Exception.class)
public class SysCustomConfigDetailServiceImpl implements ISysCustomConfigDetailService {
@Resource
private SysCustomConfigDetailDao sysCustomConfigDetailDao;
@Override
public List<SysCustomConfigDetailEntity> filterSysCustomConfigDetail(SysCustomConfigDetailRequest request) {
return sysCustomConfigDetailDao.filterSysCustomConfigDetail(request);
}
@Override
public boolean insertSysCustomConfigDetail(SysCustomConfigDetailEntity entity) {
return sysCustomConfigDetailDao.insertSysCustomConfigDetail(entity);
}
@Override
public boolean updateSysCustomConfigDetail(SysCustomConfigDetailEntity entity) {
return sysCustomConfigDetailDao.updateSysCustomConfigDetail(entity);
}
@Override
public boolean deleteById(String id) {
return sysCustomConfigDetailDao.deleteById(id);
}
@Override
public boolean deleteByConfigId(String id) {
return sysCustomConfigDetailDao.deleteByConfigId(id);
}
@Override
public SysCustomConfigDetailEntity selectById(Long id) {
return sysCustomConfigDetailDao.selectById(id);
}
}

@ -1,56 +0,0 @@
package com.glxp.api.service.auth.impl;
import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.auth.SysCustomConfigDao;
import com.glxp.api.entity.auth.SysCustomConfigEntity;
import com.glxp.api.req.auth.SysCustomConfigRequest;
import com.glxp.api.service.auth.ISysCustomConfigService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
@Service
@Transactional(rollbackFor = Exception.class)
public class SysCustomConfigServiceImpl implements ISysCustomConfigService {
@Resource
private SysCustomConfigDao sysCustomConfigDao;
@Override
public List<SysCustomConfigEntity> filterSysCustomConfig(SysCustomConfigRequest request) {
if (request == null) {
return Collections.emptyList();
}
if (request.getPage() != null) {
int offset = (request.getPage() - 1) * request.getLimit();
PageHelper.offsetPage(offset, request.getLimit());
}
return sysCustomConfigDao.filterSysCustomConfig(request);
}
@Override
public boolean insertSysCustomConfig(SysCustomConfigEntity entity) {
return sysCustomConfigDao.insertSysCustomConfig(entity);
}
@Override
public boolean updateSysCustomConfig(SysCustomConfigEntity entity) {
return sysCustomConfigDao.updateSysCustomConfig(entity);
}
@Override
public boolean deleteById(String id) {
return sysCustomConfigDao.deleteById(id);
}
@Override
public SysCustomConfigEntity selectById(Long id) {
return sysCustomConfigDao.selectById(id);
}
}

@ -257,7 +257,8 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl<BasicBussinessTyp
case Constant.ORDER_ACTION_SUP_PREIN:
bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
.gt("spUse", 0).eq("enable", true).eq("corpType", ConstantStatus.CORP_TYPE_OUT).eq("actionType", 2));
case Constant.ORDER_STATUS_RETURN:
break;
case Constant.ORDER_ACTION_SUP_RETURN:
bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
.gt("spUse", 0).eq("enable", true).eq("corpType", ConstantStatus.CORP_TYPE_OUT).eq("mainAction", ConstantType.TYPE_OUT));
break;

@ -154,7 +154,6 @@ public class IoAddInoutService {
} else {
orderEntity.setStatus(ConstantStatus.ORDER_STATS_ERROR);
orderEntity.setUpdateTime(new Date());
orderEntity.setErrMsg(result);
orderService.update(orderEntity);
insertList.clear();
return;
@ -683,10 +682,7 @@ public class IoAddInoutService {
int count = 0;
if (filterList != null) {
for (IoCodeTempEntity temp : filterList) {
if (temp.getCode().equals(codeEntity.getCode())
&& StrUtil.trimToEmpty(temp.getSerialNo()).equals(StrUtil.trimToEmpty(codeEntity.getSerialNo()))
&& StrUtil.trimToEmpty(temp.getInBatchNo()).equals(StrUtil.trimToEmpty(codeEntity.getInBatchNo()))
) {
if (temp.getCode().equals(codeEntity.getCode())) {
count = count + 1;
}
}
@ -697,6 +693,7 @@ public class IoAddInoutService {
return null;
}
public String checkOriginCode(IoCodeTempEntity warehouseEntity) {
UdiEntity udiEntity = FilterUdiUtils.getUdi(warehouseEntity.getCode());

@ -23,6 +23,9 @@ public interface IoOrderService {
IoOrderEntity findByBillNo(String billNO);
IoOrderEntity findByCorpId(String corpOrderId);
List<IoOrderEntity> findByStatus(String action, Integer status, Date lastUpdateTime);
int insertOrder(IoOrderEntity orderEntity);
@ -126,5 +129,6 @@ public interface IoOrderService {
boolean isExitByAction(String action);
List<IoOrderEntity> selectList(Long userId);
}

@ -76,10 +76,7 @@ public class IoOrderDetailResultServiceImpl implements IoOrderDetailResultServic
@Override
public List<CptTraceOrderResponse> cptTrace(CptTraceRequest cptTraceRequest) {
if (StrUtil.isNotEmpty(cptTraceRequest.getSerialNo())) {
return orderDetailResultDao.cptCodeTrace(cptTraceRequest);
} else
return orderDetailResultDao.cptTrace(cptTraceRequest);
return orderDetailResultDao.cptTrace(cptTraceRequest);
}
}

@ -144,6 +144,12 @@ public class IoOrderServiceImpl implements IoOrderService {
return orderDao.selectOne(new QueryWrapper<IoOrderEntity>().eq("billNo", billNO));
}
@Override
public IoOrderEntity findByCorpId(String corpOrderId) {
return orderDao.selectOne(new QueryWrapper<IoOrderEntity>().eq("corpOrderId", corpOrderId).last("limit 1"));
}
@Override
public List<IoOrderEntity> findByStatus(String action, Integer status, Date lastUpdateTime) {
return orderDao.selectList(Wrappers.lambdaQuery(IoOrderEntity.class).eq(IoOrderEntity::getAction, action).eq(IoOrderEntity::getStatus, status)
@ -691,11 +697,6 @@ public class IoOrderServiceImpl implements IoOrderService {
case Constant.ORDER_STATUS_UN_ALLOCATE:
filterOrderRequest.setStatuses(Arrays.asList(ConstantStatus.ORDER_STATUS_ALLOCATE));
filterOrderRequest.setDealStatuses(Arrays.asList(2));
case Constant.ORDER_STATUS_RETURN:
filterOrderRequest.setStatuses(Arrays.asList(10, 7));
filterOrderRequest.setDealStatuses(Arrays.asList(3, 4));
break;
default:
break;
}

@ -147,12 +147,10 @@ public class SupProductServiceImpl extends ServiceImpl<SupProductDao, SupProduct
public boolean insertRegistration(SupProductEntity companyEntity) {
return supProductDao.insert(companyEntity) > 0 ? true : false;
}
@Override
public int findProduct(SupProductEntity supProductEntity) {
return supProductDao.findProduct(supProductEntity);
}
@Override
public boolean deleteById(String id) {
return supProductDao.deleteById(id);

@ -295,7 +295,7 @@ public class SpsSyncDownloadService {
}
exportStatus = BasicExportStatusEntity.builder()
.id(CustomUtil.getId())
.status(BasicExportStatusEnum.WAIT_BUILT.getCode())
.status(syncTime == null ? BasicExportStatusEnum.WAIT_TRIGGERED.getCode() : BasicExportStatusEnum.WAIT_BUILT.getCode())
.idDatas(exportEnum.getKey())
.type(exportEnum.getRemark())
.scheduleType(0)
@ -303,9 +303,9 @@ public class SpsSyncDownloadService {
.startTime(now)
.build();
basicExportService.save(exportStatus);
// if (syncTime != null) {
createFileMethod.apply(applicationContext.getBean(this.getClass()));
// }
if (syncTime != null) {
createFileMethod.apply(applicationContext.getBean(this.getClass()));
}
} else if (exportStatus.getStatus().equals(BasicExportStatusEnum.WAIT_BUILT.getCode())) {//文件待生成
createFileMethod.apply(applicationContext.getBean(this.getClass()));
}

@ -18,12 +18,14 @@ import java.util.List;
@Transactional(rollbackFor = Exception.class)
public class BasicExportTimeServiceImpl extends CustomServiceImpl<BasicExportTimeDao, BasicExportStatusTimeEntity> implements BasicExportTimeService {
@Resource
BasicExportTimeDao basicExportTimeDao;
@Override
public BasicExportStatusTimeEntity findByType(String type) {
BasicExportTimeRequest basicExportTimeRequest = new BasicExportTimeRequest();
basicExportTimeRequest.setKey(type);
List<BasicExportStatusTimeEntity> basicExportStatusTimeEntities = super.baseMapper.filterExportStatus(basicExportTimeRequest);
List<BasicExportStatusTimeEntity> basicExportStatusTimeEntities = basicExportTimeDao.filterExportStatus(basicExportTimeRequest);
if (CollUtil.isNotEmpty(basicExportStatusTimeEntities)) {
return basicExportStatusTimeEntities.get(0);
}
@ -39,23 +41,23 @@ public class BasicExportTimeServiceImpl extends CustomServiceImpl<BasicExportTim
if (basicExportStatusRequest == null) {
return Collections.emptyList();
}
return super.baseMapper.filterExportStatus(basicExportStatusRequest);
return basicExportTimeDao.filterExportStatus(basicExportStatusRequest);
}
@Override
public boolean insertExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity) {
return super.baseMapper.insertExportStatus(basicExportStatusTimeEntity);
return basicExportTimeDao.insertExportStatus(basicExportStatusTimeEntity);
}
@Override
public boolean deleteById(String id) {
return super.baseMapper.deleteById(id);
return basicExportTimeDao.deleteById(id);
}
@Override
public boolean updateExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity) {
return super.baseMapper.updateExportStatus(basicExportStatusTimeEntity);
return basicExportTimeDao.updateExportStatus(basicExportStatusTimeEntity);
}
}

@ -1,30 +0,0 @@
package com.glxp.api.service.thrsys;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.thrsys.ThrProductTypeMapper;
import com.glxp.api.entity.thrsys.ThrProductTypeEntity;
import com.glxp.api.req.thrsys.FilterThrProductTypeRequest;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
@Service
public class ThrProductTypeService extends ServiceImpl<ThrProductTypeMapper, ThrProductTypeEntity> {
@Resource
ThrProductTypeMapper thrProductTypeMapper;
public List<ThrProductTypeEntity> getProductTypes(FilterThrProductTypeRequest filterThrProductTypeRequest) {
if (filterThrProductTypeRequest == null) {
return Collections.emptyList();
}
if (filterThrProductTypeRequest.getPage() != null) {
int offset = (filterThrProductTypeRequest.getPage() - 1) * filterThrProductTypeRequest.getLimit();
PageHelper.offsetPage(offset, filterThrProductTypeRequest.getLimit());
}
List<ThrProductTypeEntity> data = thrProductTypeMapper.getProductTypes(filterThrProductTypeRequest);
return data;
}
}

@ -122,7 +122,7 @@ public class ThrProductsAddDiService extends ServiceImpl<ThrProductsAddDiDao, Th
thrProductsAddDiEntity.setYlqxzcrbarmc(productInfoEntity.getYlqxzcrbarmc());
thrProductsAddDiEntity.setDeviceRecordKey(productInfoEntity.getDeviceRecordKey());
thrProductsAddDiEntity.setZczbhhzbapzbh(productInfoEntity.getZczbhhzbapzbh());
thrProductsAddDiEntity.setGroupBuy(thrDiProductsRequest.getGroupBuy());
//设置编辑区参数
thrProductsAddDiEntity.setSptm(thrDiProductsRequest.getSptm());
thrProductsAddDiEntity.setYbbm(thrDiProductsRequest.getYbbm());
@ -134,7 +134,7 @@ public class ThrProductsAddDiService extends ServiceImpl<ThrProductsAddDiDao, Th
thrProductsAddDiEntity.setCreateTime(date);
thrProductsAddDiEntity.setUpdateTime(new Date());
thrProductsAddDiEntity.setStatus(1); //..
thrProductsAddDiEntity.setStatus(1); //未审核
thrProductsAddDiEntity.setSelectThridSysStr(JSONUtil.toJsonStr(thrDiProductsRequest.getSelectThirdSys()));
list.add(thrProductsAddDiEntity);
}

@ -1,13 +1,10 @@
package com.glxp.api.upload;
import cn.hutool.core.exceptions.ExceptionUtil;
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.util.MinioUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
@ -24,7 +21,6 @@ import java.util.UUID;
/**
*
*/
@Slf4j
@RestController
public class uploadController {
@ -45,8 +41,7 @@ public class uploadController {
*/
@PostMapping("/udiwms/upload/pdf/template/jasper")
public BaseResponse uploadPDFTemplate(@RequestParam("file") MultipartFile file) {
log.error("上传jasper文件了");
public BaseResponse uploadPDFTemplate(@RequestParam("file") MultipartFile file) throws UnsupportedEncodingException {
if (file.isEmpty()) {
return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件不能为空");
}
@ -65,8 +60,6 @@ public class uploadController {
file1.mkdirs();// 创建多层目录
}
file1 = new File(savePath + "/" + newName);
log.error("创建文件了");
try {
file.transferTo(file1);
Map<String, String> rMap = new HashMap<>();
@ -75,7 +68,6 @@ public class uploadController {
return ResultVOUtils.success(rMap);
} catch (IOException e) {
e.printStackTrace();
log.error("异常" + ExceptionUtils.getStackTrace(e));
}
return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传失败");
}

@ -2,14 +2,12 @@ package com.glxp.api.util;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON;
import lombok.extern.slf4j.Slf4j;
import net.sf.jasperreports.engine.*;
import net.sf.jasperreports.engine.export.ooxml.JRDocxExporter;
import net.sf.jasperreports.engine.query.JsonQueryExecuterFactory;
import net.sf.jasperreports.engine.util.JRLoader;
import net.sf.jasperreports.export.SimpleExporterInput;
import net.sf.jasperreports.export.SimpleOutputStreamExporterOutput;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
@ -30,7 +28,6 @@ import java.util.Map;
* @date 2021-11-10 22:23
*/
@Component
@Slf4j
public class JasperUtils {
private static Logger logger = LoggerFactory.getLogger(JasperUtils.class);
@ -105,7 +102,7 @@ public class JasperUtils {
os.close();
}
} catch (Exception e) {
log.error(ExceptionUtils.getStackTrace(e));
e.printStackTrace();
}

@ -78,13 +78,6 @@ public class SupplementVailUtil {
}
}
basicProductSetEntity = basicProductSetEntityMap.get("groupBuy");
if (isMustFill(type, basicProductSetEntity)) {
if (supplementRequest.getGroupBuy() == null) {
return "请选择是否集采";
}
}
basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak1");
if (isMustFill(type, basicProductSetEntity)) {
@ -138,15 +131,6 @@ public class SupplementVailUtil {
if (!systemParamConfigEntity.getParamValue().equals("0")) {
return systemParamConfigEntity.getParamValue() + "不能为空";
}
} else {
if (supplementRequest.getBasicPrductRemak6().equals("1")) {
if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak8())) {
SystemParamConfigEntity temp = systemParamConfigEntityMap.get("basicPrductRemak8");
if (!temp.getParamValue().equals("0")) {
return temp.getParamValue() + "不能为空";
}
}
}
}
}
basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak7");

@ -3,7 +3,7 @@ server:
spring:
datasource:
driver-class-name: com.p6spy.engine.spy.P6SpyDriver
jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root
password: 123456
hikari:
@ -11,7 +11,7 @@ spring:
maximum-pool-size: 60
minimum-idle: 10
redis:
database: 10
database: 8
host: 127.0.0.1
port: 6379
# password: 123456
@ -37,23 +37,19 @@ ok:
write-timeout: 3000
max-idle-connections: 200
keep-alive-duration: 300
minio:
endpoint: http://139.9.219.60:9000
access-key: minioadmin
secret-key: minioadmin
logging:
level:
com.glxp.api.dao: debug
back_file_path: d:/share/udisps/back/
file_path: D:/udi/udiwms/udiwmsfile/
file_lpath: /udiwms/image/register/file/getImage
file_url: http://127.0.0.1:9993
minio_path: /udi
minio_url: http://139.9.219.60:9000
err_path: d:/udi/udiwms/err/
back_file_path: d:/share/udisps/back/
UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs

@ -13,7 +13,7 @@ spring:
redis:
database: 10
host: 127.0.0.1
port: 6379
port: 6404
# password: 123456
timeout: 300
jedis:
@ -43,20 +43,15 @@ logging:
level:
com.glxp.api.dao: debug
file_path: D:/udi/udiwms/udiwmsfile/
file_lpath: /udiwms/image/register/file/getImage
file_url: http://127.0.0.1:9993
minio_path: /udi
minio_url: http://139.9.219.60:9000
err_path: d:/udi/udiwms/err/
back_file_path: d:/share/udisps/back/
file_path: /udi/udiwms/udiwmsfile/
back_file_path: /share/udisps/back/
err_path: /udi/udiwms/err/
UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
API_KEY: 1101
API_SECRET: zBITspLNvuoEd4FaamlSoqxRHmNsmQ9L
WEB_TITLE: 大田县总医院
WEB_TITLE: 漳州市中医院
WEBSOCKET_TOKEN: 07rKFDFkQvBkbxgc7aUBlONo4gWNdx8b

@ -7,7 +7,6 @@ spring:
multipart:
max-file-size: 200MB
max-request-size: 200MB
location: D:/tmp
mybatis-plus:
mapper-locations: classpath:mybatis/mapper/*/*.xml
configuration:
@ -32,6 +31,6 @@ server:
tomcat:
max-http-form-post-size: 100MB
max-http-post-size: 100MB
max-http-header-size: 100MB
max-http-header-size: 100MB

@ -1,64 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.dao.auth.SysCustomConfigDao">
<select id="filterSysCustomConfig" parameterType="com.glxp.api.req.auth.SysCustomConfigRequest"
resultType="com.glxp.api.entity.auth.SysCustomConfigEntity">
SELECT *
FROM sys_custom_config
<where>
<if test="businessType != null and '' != businessType">
AND businessType = #{businessType}
</if>
<if test="remark != '' and remark != null">
AND remark like concat('%', #{remark}, '%')
</if>
<if test="type != null and '' != type">
AND type = #{type}
</if>
</where>
</select>
<insert id="insertSysCustomConfig" keyProperty="id"
parameterType="com.glxp.api.entity.auth.SysCustomConfigEntity">
INSERT INTO sys_custom_config
(id,remark, businessType,type,handleChangeFuc)
values (#{id},#{remark}, #{businessType},#{type},#{handleChangeFuc})
</insert>
<update id="updateSysCustomConfig" parameterType="com.glxp.api.entity.auth.SysCustomConfigEntity">
UPDATE sys_custom_config
<set>
<if test="businessType != null">
businessType=#{businessType},
</if>
<if test="remark != null">
remark=#{remark},
</if>
<if test="handleChangeFuc != null">
handleChangeFuc=#{handleChangeFuc},
</if>
<if test="type != null">
type=#{type},
</if>
</set>
WHERE id = #{id}
</update>
<delete id="deleteById" parameterType="java.lang.String">
delete
from sys_custom_config
where id = #{id}
</delete>
<select id="selectById" parameterType="java.lang.Long"
resultType="com.glxp.api.entity.auth.SysCustomConfigEntity">
SELECT *
FROM sys_custom_config
WHERE (
id = #{id})
limit 1
</select>
</mapper>

@ -1,133 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.dao.auth.SysCustomConfigDetailDao">
<select id="filterSysCustomConfigDetail" parameterType="com.glxp.api.req.auth.SysCustomConfigDetailRequest"
resultType="com.glxp.api.entity.auth.SysCustomConfigDetailEntity">
SELECT *
FROM sys_custom_config_detail
<where>
<if test="configId != null and '' != configId">
AND configId = #{configId}
</if>
<if test="type != null and '' != type">
AND type = #{type}
</if>
<if test="isShow != null and '' != isShow">
AND isShow = #{isShow}
</if>
</where>
order by lineNumber asc,number desc
</select>
<insert id="insertSysCustomConfigDetail" keyProperty="id"
parameterType="com.glxp.api.entity.auth.SysCustomConfigDetailEntity">
INSERT INTO sys_custom_config_detail
(id,configId,type,isShow, columnName,columnDesc,columnType,colorRule,sort,lableRule,width,tooltip,buttonRule,number,
clickFuc,disabledFuc,expression,size,style,disabled,checkRules,inputType,lineNumber,dataFuc,isShowXx)
values (#{id},#{configId},#{type},#{isShow}, #{columnName},#{columnDesc},#{columnType},#{colorRule},#{sort},
#{lableRule},#{width},#{tooltip},#{buttonRule},#{number},#{clickFuc},#{disabledFuc},#{expression},#{size},#{style},
#{disabled}, #{checkRules}, #{inputType}, #{lineNumber}, #{dataFuc},#{isShowXx})
</insert>
<update id="updateSysCustomConfigDetail" parameterType="com.glxp.api.entity.auth.SysCustomConfigDetailEntity">
UPDATE sys_custom_config_detail
<set>
<if test="columnName != null">
columnName=#{columnName},
</if>
<if test="configId != null">
configId=#{configId},
</if>
<if test="type != null">
type=#{type},
</if>
<if test="isShow != null">
isShow=#{isShow},
</if>
<if test="columnDesc != null">
columnDesc=#{columnDesc},
</if>
<if test="columnType != null">
columnType=#{columnType},
</if>
<if test="colorRule != null">
colorRule=#{colorRule},
</if>
<if test="sort != null">
sort=#{sort},
</if>
<if test="lableRule != null">
lableRule=#{lableRule},
</if>
<if test="width != null">
width=#{width},
</if>
<if test="tooltip != null">
tooltip=#{tooltip},
</if>
<if test="buttonRule != null">
buttonRule=#{buttonRule},
</if>
<if test="number != null">
number=#{number},
</if>
<if test="clickFuc != null">
clickFuc=#{clickFuc},
</if>
<if test="disabledFuc != null">
disabledFuc=#{disabledFuc},
</if>
<if test="expression != null">
expression=#{expression},
</if>
<if test="size != null">
size=#{size},
</if>
<if test="style != null">
style=#{style},
</if>
<if test="disabled != null">
disabled=#{disabled},
</if>
<if test="checkRules != null">
checkRules=#{checkRules},
</if>
<if test="inputType != null">
inputType=#{inputType},
</if>
<if test="lineNumber != null">
lineNumber=#{lineNumber},
</if>
<if test="dataFuc != null">
dataFuc=#{dataFuc},
</if>
<if test="isShowXx != null">
isShowXx=#{isShowXx},
</if>
</set>
WHERE id = #{id}
</update>
<delete id="deleteById" parameterType="java.lang.String">
delete
from sys_custom_config_detail
where id = #{id}
</delete>
<delete id="deleteByConfigId" parameterType="java.lang.String">
delete
from sys_custom_config_detail
where configId = #{configId}
</delete>
<select id="selectById" parameterType="java.lang.Long"
resultType="com.glxp.api.entity.auth.SysCustomConfigDetailEntity">
SELECT *
FROM sys_custom_config_detail
WHERE (
id = #{id})
limit 1
</select>
</mapper>

@ -92,7 +92,6 @@
basic_products.syqsfxyjxmj,
basic_products.mjfs,
basic_products.categoryName,
basic_products.cphhhbh,
basic_products.hchzsb
FROM (company_product_relevance
inner JOIN basic_udirel
@ -675,9 +674,6 @@
<if test="basicPrductRemak8 != null">
basicPrductRemak8=#{basicPrductRemak8},
</if>
<if test="groupBuy != null">
groupBuy=#{groupBuy},
</if>
<if test="updateTime != null">
updateTime=#{updateTime},
</if>

@ -65,8 +65,7 @@
basic_products.sfwwjbz,
basic_products.syqsfxyjxmj,
basic_products.mjfs,
basic_products.categoryName,
basic_products.cphhhbh
basic_products.categoryName
FROM basic_udirel
inner JOIN basic_products
ON basic_products.uuid = basic_udirel.uuid
@ -326,7 +325,7 @@
basic_products.sfwwjbz,
basic_products.syqsfxyjxmj,
basic_products.mjfs,
basic_products.categoryName,basic_products.cphhhbh,
basic_products.categoryName,
company_product_relevance.unitFk,
basic_corp.name companyName
FROM basic_udirel
@ -464,8 +463,7 @@
basic_products.mjfs,
basic_products.categoryName,
basic_products.groupBuy,
basic_products.basicPrductRemak8,
basic_products.cphhhbh
basic_products.basicPrductRemak8
FROM basic_products
inner JOIN basic_udirel
ON basic_products.uuid = basic_udirel.uuid
@ -647,7 +645,7 @@
basic_products.sfwwjbz,
basic_products.syqsfxyjxmj,
basic_products.mjfs,
basic_products.categoryName,basic_products.cphhhbh
basic_products.categoryName
FROM basic_products
inner JOIN basic_udirel
ON basic_products.uuid = basic_udirel.uuid
@ -822,7 +820,7 @@
basic_products.sfwwjbz,
basic_products.syqsfxyjxmj,
basic_products.mjfs,
basic_products.categoryName,basic_products.cphhhbh
basic_products.categoryName
from basic_udirel
INNER JOIN basic_products on basic_udirel.uuid = basic_products.uuid
<where>
@ -1256,7 +1254,7 @@
basic_products.sfwwjbz,
basic_products.syqsfxyjxmj,
basic_products.mjfs,
basic_products.categoryName,basic_products.cphhhbh
basic_products.categoryName
FROM basic_udirel
INNER JOIN basic_products
on basic_udirel.uuid = basic_products.uuid
@ -1376,7 +1374,7 @@
basic_products.mjfs,
basic_products.categoryName,
company_product_relevance.unitFk,
basic_corp.name companyName,basic_products.cphhhbh
basic_corp.name companyName
FROM basic_udirel
inner JOIN basic_products
ON basic_products.uuid = basic_udirel.uuid

@ -102,7 +102,6 @@
basic_products.basicPrductRemak6,
basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8,
basic_products.cphhhbh,
basic_products.sfwblztlcp,
basic_products.cgzmraqxgxx,
basic_products.sfbjwycxsy,
@ -110,8 +109,9 @@
basic_products.sfwwjbz,
basic_products.syqsfxyjxmj,
basic_products.mjfs,
basic_products.categoryName,basic_products.cphhhbh,
basic_products.categoryName,
basic_udirel.groupBuy,
basic_udirel.id as uid,
basic_corp.name companyName
FROM company_product_relevance
@ -377,12 +377,14 @@
<select id="filterCompanyProduct" parameterType="com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest"
resultType="com.glxp.api.req.inout.ioOrderUploadRequest">
SELECT basic_udirel.id,
basic_udirel.uuid as udiRlIdFk
FROM company_product_relevance
INNER JOIN basic_udirel ON company_product_relevance.udiRlIdFk = basic_udirel.id
INNER JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
LEFT JOIN basic_corp ON basic_corp.erpId = company_product_relevance.customerId
SELECT
basic_udirel.id,
basic_udirel.uuid as udiRlIdFk
FROM
company_product_relevance
INNER JOIN basic_udirel ON company_product_relevance.udiRlIdFk = basic_udirel.id
INNER JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
LEFT JOIN basic_corp ON basic_corp.erpId = company_product_relevance.customerId
<where>
<if test="customerId != '' and customerId != null">
and company_product_relevance.customerId = #{customerId}

@ -89,8 +89,7 @@
basic_corp.creditNo,
io.action,
io.fromInvCode,
bbt.corpType,
iodr.reCount count
bbt.corpType,iodr.reCount count
from io_order_detail_result iodr
INNER JOIN io_order io on iodr.orderIdFk = io.billNo
left join basic_corp on io.fromCorp = basic_corp.erpId
@ -108,36 +107,4 @@
</if>
</where>
</select>
<select id="cptCodeTrace" parameterType="com.glxp.api.req.inout.CptTraceRequest"
resultType="com.glxp.api.res.inout.CptTraceOrderResponse">
select io.billNo,
io.createTime,
io.mainAction,
bbt.`name` billType,
basic_corp.`name` fromCorpName,
basic_corp.creditNo,
io.action,
io.fromInvCode,
bbt.corpType,
iodr.reCount count
from io_code iodr
INNER JOIN io_order io on iodr.orderId = io.billNo
left join basic_corp on io.fromCorp = basic_corp.erpId
INNER JOIN basic_bussiness_type bbt on io.action = bbt.action
<where>
and bbt.inStock = true
<if test="batchNo != null and batchNo != ''">
AND iodr.batchNo = #{batchNo}
</if>
<if test="diList != null and diList.size() != 0">
AND iodr.`nameCode` in
<foreach collection="diList" index="index" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
<if test="serialNo != null and serialNo != ''">
AND iodr.serialNo = #{serialNo}
</if>
</where>
</select>
</mapper>

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.api.dao.inv.InvInnerOrderPrintDao">
<resultMap id="BaseResultMap" autoMapping="true" type="com.glxp.api.entity.inv.InvInnerOrderPrintEntity">
<resultMap id="BaseResultMap" autoMapping="true" type="com.glxp.api.entity.inv.InvInnerOrderPrintEntity">
<!--@mbg.generated-->
<!--@Table inv_inner_order_print-->
<!-- <id column="id" jdbcType="INTEGER" property="id"/>-->
<!-- <id column="id" jdbcType="INTEGER" property="id"/>-->
<result column="orderIdFk" jdbcType="VARCHAR" property="orderIdFk"/>
<result column="udiCode" jdbcType="VARCHAR" property="udiCode"/>
<result column="productId" jdbcType="VARCHAR" property="productId"/>
@ -54,7 +54,6 @@
basic_products.cpmctymc,
basic_products.ylqxzcrbarmc,
basic_products.zczbhhzbapzbh,
basic_products.manufactory,
basic_products.ggxh
FROM inv_inner_order_print

@ -1,33 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.api.dao.thrsys.ThrProductTypeMapper">
<resultMap id="BaseResultMap" type="com.glxp.api.entity.thrsys.ThrProductTypeEntity">
<!--@mbg.generated-->
<!--@Table thr_product_type-->
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="code" jdbcType="VARCHAR" property="code"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
<result column="thirdSys" jdbcType="VARCHAR" property="thirdSys"/>
<result column="remark" jdbcType="VARCHAR" property="remark"/>
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, code, `name`, thirdSys, remark
</sql>
<select id="getProductTypes" parameterType="com.glxp.api.req.thrsys.FilterThrProductTypeRequest"
resultType="com.glxp.api.entity.thrsys.ThrProductTypeEntity">
SELECT *
FROM thr_product_type
<where>
<if test="key != '' and key != null">
AND (code LIKE concat('%', #{key}, '%') or name LIKE concat('%', #{key}, '%')
)
</if>
<if test="code != '' and code != null">
AND code = #{code}
</if>
</where>
</select>
</mapper>

@ -16,7 +16,7 @@
qxlb, tyshxydm, zczbhhzbapzbh,
ylqxzcrbarmc, ylqxzcrbarywmc, updateTime,
supName, model, `standard`,
qtbm, zczyxqz, relId, type, deviceRecordKey, groupBuy)
qtbm, zczyxqz, relId, type, deviceRecordKey)
values
<foreach collection="list" index="index" item="item" separator=",">
(#{item.uuid},
@ -42,7 +42,7 @@
, #{item.flbm}, #{item.qxlb}, #{item.tyshxydm}, #{item.zczbhhzbapzbh}
, #{item.ylqxzcrbarmc}, #{item.ylqxzcrbarywmc}, #{item.updateTime}, #{item.supName}, #{item.model}
, #{item.standard}, #{item.qtbm}, #{item.standard}, #{item.zczyxqz}, #{item.type},
#{item.deviceRecordKey}, #{item.groupBuy})
#{item.deviceRecordKey})
</foreach>
</insert>
@ -124,9 +124,6 @@
<if test="selectThridSysStr != null">
`selectThridSysStr`=#{selectThridSysStr},
</if>
<if test="groupBuy != null">
`groupBuy`=#{groupBuy},
</if>
</trim>
WHERE id = #{id}
</update>
@ -232,9 +229,9 @@
<if test="status != null">
AND tdi.status = #{status}
</if>
<!-- <if test="diType != null">-->
<!-- AND updateTime &lt;= "2023-04-5 00:00:00"-->
<!-- </if>-->
<if test="diType != null">
AND updateTime &lt;= "2023-04-5 00:00:00"
</if>
</where>
</select>
</mapper>

@ -623,6 +623,39 @@ INSERT ignore INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`,
VALUES (20078, 0, '是否启用价格先进先出策略', 'price_fifo', '1', 1, 0, '01', '2023-10-10 10:10:08');
INSERT ignore INTO `auth_menu`(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
`is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`,
`create_time`, `update_by`, `update_time`, `remark`)
VALUES (2006, '首页111111', 0, 20, 'home/11111', NULL, NULL, 1, 0, 'M', '1', '0', NULL, NULL, '超级用户',
'2023-11-17 09:27:27', NULL, NULL, NULL);
INSERT ignore INTO `auth_menu`(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
`is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`,
`create_time`, `update_by`, `update_time`, `remark`)
VALUES (2007, '已对照产品', 2006, 1, NULL, NULL, NULL, 1, 0, 'F', '0', '0', 'home:index:product', NULL, '超级用户',
'2023-11-17 09:30:47', NULL, NULL, NULL);
INSERT ignore INTO `auth_menu`(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
`is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`,
`create_time`, `update_by`, `update_time`, `remark`)
VALUES (2008, '库存预警', 2006, 2, NULL, NULL, NULL, 1, 0, 'F', '0', '0', 'home:index:invWarn', NULL, '超级用户',
'2023-11-17 09:35:08', NULL, NULL, NULL);
INSERT ignore INTO `auth_menu`(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
`is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`,
`create_time`, `update_by`, `update_time`, `remark`)
VALUES (2009, '资质预警', 2006, 3, NULL, NULL, NULL, 1, 0, 'F', '0', '0', 'home:index:certWarn', NULL, '超级用户',
'2023-11-17 09:35:24', NULL, NULL, NULL);
INSERT ignore INTO `auth_menu`(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
`is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`,
`create_time`, `update_by`, `update_time`, `remark`)
VALUES (2010, '待办事项', 2006, 4, NULL, NULL, NULL, 1, 0, 'F', '0', '0', 'home:index:todo', NULL, '超级用户',
'2023-11-17 09:36:08', NULL, NULL, NULL);
INSERT ignore INTO `auth_menu`(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
`is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`,
`create_time`, `update_by`, `update_time`, `remark`)
VALUES (2011, '待审核单据·', 2006, 5, NULL, NULL, NULL, 1, 0, 'F', '0', '0', 'home:index:ioAudit', NULL, '超级用户',
'2023-11-17 09:36:26', NULL, NULL, NULL);
CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'inPreInBack', 'tinyint', 1);
@ -662,7 +695,7 @@ CALL Pro_Temp_ColumnWork('io_order_detail_code', 'sterDate', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('io_order_detail_result', 'sterBatchNo', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('io_order_detail_result', 'sterDate', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('basic_products', 'cphhhbh', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('io_order', 'repeatSup', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('thr_products_add_di', 'groupBuy', 'tinyint', 1);

Loading…
Cancel
Save