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

切换分支备份

Browse Source
fengcang
anthonyywj2 3 years ago
parent 6a283d9a07
commit fef9a9707c
9 changed files with 94 additions and 37 deletions
Show Stats Download Patch File Download Diff File

18
api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java
Unescape Escape View File

@ -13,10 +13,7 @@ import com.glxp.api.admin.req.receipt.ProductInfoFilterRequest;
import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.ErpProductsResponse;
import com.glxp.api.admin.service.basic.BasicThirdSysDetailService;
import com.glxp.api.admin.service.basic.SyncUdiService;
import com.glxp.api.admin.service.basic.UdiInfoService;
import com.glxp.api.admin.service.basic.UdiRelevanceService;
import com.glxp.api.admin.service.basic.*;
import com.glxp.api.admin.service.thrsys.ThrProductsService;
import com.glxp.api.admin.util.FilterUdiUtils;
import com.glxp.api.common.enums.ResultEnum;
@ -231,6 +228,11 @@ public class UdiInfoController {
return ResultVOUtils.success(udiInfoEntity);
}
@Resource
UdiContrastService udiContrastService;
@Resource
BasicThirdSysService basicThirdSysService;
/**
* 新增第三方产品信息
*
@ -244,6 +246,14 @@ public class UdiInfoController {
thrProductsEntity.setThirdSysFk(thrProductsEntity.getThirdSys());
thrProductsEntity.setUpdateTime(new Date());
thrProductsService.insertThrProducts(thrProductsEntity);
//新增主系统产品信息直接加到耗材字典里
BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
if (basicThirdSysEntity.getThirdId().equals(thrProductsEntity.getThirdSysFk()))
if (!udiContrastService.isExit(null, thrProductsEntity.getCode(), null)) {
udiContrastService.createOnlyMainId(thrProductsEntity.getCode());
}
return ResultVOUtils.success();
}

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

@ -21,6 +21,8 @@ public interface BussinessOriginTypeDao {
boolean insertBusOriginType(BussinessOriginTypeEntity bussinessTypeEntity);
// boolean insertOrUpdate(BussinessOriginTypeEntity bussinessOriginTypeEntity);
boolean deleteById(@Param("id") String id);
/**
@ -33,6 +35,7 @@ public interface BussinessOriginTypeDao {
/**
* 根据单据类型统计条数
*
* @param action
* @return
*/

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

@ -26,6 +26,9 @@ public interface BussinessOriginTypeService {
boolean insertBusOriginType(BussinessOriginTypeEntity bussinessTypeEntity);
boolean insertOrUpdate(BussinessOriginTypeEntity bussinessOriginTypeEntity);
List<BussinessOriginTypeResponse> filterJoinList(BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest);
//第三方单据类型
@ -49,6 +52,7 @@ public interface BussinessOriginTypeService {
/**
* 校验单据类型代码是否重复
*
* @param action
* @param thirdSys
* @return

59
api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiContrastService.java
Unescape Escape View File

@ -2,9 +2,19 @@ package com.glxp.api.admin.service.basic;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.dao.basic.UdiRelevanceDao;
import com.glxp.api.admin.entity.basic.UdiInfoEntity;
import com.glxp.api.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.api.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.api.admin.req.basic.FilterUdiInfoRequest;
import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest;
import com.glxp.api.admin.service.thrsys.ThrProductsService;
import com.glxp.api.admin.util.CustomUtil;
import com.glxp.api.admin.util.DateUtil;
import com.glxp.api.admin.util.GennerOrderUtils;
import com.glxp.api.admin.util.UdiInfoUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -109,4 +119,53 @@ public class UdiContrastService {
}
@Resource
GennerOrderUtils gennerOrderUtils;
@Resource
ThrProductsService thrProductsService;
@Resource
UdiRelevanceService udiRelevanceService;
@Resource
UdiInfoService udiInfoService;
public void createOnlyMainId(String mainId) {
FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest();
filterThrProductsRequest.setCode(mainId);
List<ThrProductsEntity> thrProductsEntities = thrProductsService.selectThrProducts(filterThrProductsRequest);
ThrProductsEntity thrProductsEntity = thrProductsEntities.get(0);
UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
udiRelevanceEntity.setThirdId(thrProductsEntity.getCode());
udiRelevanceEntity.setThirdName(thrProductsEntity.getName());
udiRelevanceEntity.setMainId(thrProductsEntity.getCode());
udiRelevanceEntity.setMainName(thrProductsEntity.getName());
udiRelevanceEntity.setMeasname(thrProductsEntity.getMeasname());
String time = DateUtil.getDateTime();
udiRelevanceEntity.setUpdateTime(time);
udiRelevanceEntity.setModifyTime(time);
udiRelevanceEntity.setUuid(CustomUtil.getUUId());
udiRelevanceEntity.setSupName(thrProductsEntity.getSupName());
udiRelevanceEntity.setManufactory(thrProductsEntity.getManufactory());
udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + "");
udiRelevanceEntity.setPrice(thrProductsEntity.getPrice());
udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
BeanUtils.copyProperties(thrProductsEntity, udiInfoEntity);
udiInfoEntity.setNameCode(thrProductsEntity.getCode());
udiInfoEntity.setCpmctymc(thrProductsEntity.getName());
udiInfoEntity.setManufactory(thrProductsEntity.getManufactory());
udiInfoEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory());
udiInfoEntity.setGgxh(thrProductsEntity.getSpec());
udiInfoEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());
udiInfoEntity.setUuid(udiRelevanceEntity.getUuid());
udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
udiInfoEntity.setDiType(1);
udiInfoEntity.setScbssfbhph("是");
udiInfoEntity.setScbssfbhscrq("是");
udiInfoEntity.setScbssfbhsxrq("是");
udiInfoEntity.setScbssfbhxlh("否");
udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity);
udiInfoService.insertUdiInfo(udiInfoEntity);
}
}

6
api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessOriginTypeServiceImpl.java
Unescape Escape View File

@ -89,6 +89,12 @@ public class BussinessOriginTypeServiceImpl implements BussinessOriginTypeServic
return bussinessOriginTypeDao.insertBusOriginType(bussinessTypeEntity);
}
@Override
public boolean insertOrUpdate(BussinessOriginTypeEntity bussinessOriginTypeEntity) {
return false;
}
@Override
public List<BussinessOriginTypeResponse> filterJoinList(BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest) {
return bussinessOriginTypeDao.filterJoinList(bussinessOriginTypeFilterRequest);

2
api-admin/src/main/java/com/glxp/api/admin/thread/BasicUdiInfoImportService.java
Unescape Escape View File

@ -43,8 +43,6 @@ public class BasicUdiInfoImportService {
UdiRelevanceService udiRelevanceService;
@Resource
ThrDataService thrDataService;
@Value("${UDI_SERVER_URL}")
private String udiUrl;
@Resource
SystemParamConfigService systemParamConfigService;
@Resource

6
api-admin/src/main/java/com/glxp/api/admin/thread/DownloadThirdSysDataTask.java
Unescape Escape View File

@ -10,6 +10,7 @@ import com.glxp.api.admin.dao.schedule.ScheduledDao;
import com.glxp.api.admin.dao.schedule.SystemParamConfigDao;
import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity;
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.api.admin.entity.basic.BasicThirdSysEntity;
import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity;
import com.glxp.api.admin.entity.info.ScheduledEntity;
import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
@ -20,6 +21,7 @@ import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest;
import com.glxp.api.admin.req.info.ScheduledRequest;
import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.service.basic.BasicThirdSysService;
import com.glxp.api.admin.service.basic.BussinessOriginTypeService;
import com.glxp.api.admin.service.thrsys.ThrCorpImportLogService;
import com.glxp.api.admin.service.thrsys.ThrInvWarehouseService;
@ -67,6 +69,8 @@ public class DownloadThirdSysDataTask implements SchedulingConfigurer {
private BussinessOriginTypeService bussinessOriginTypeService;
@Resource
private BasicThirdSysDetailDao basicThirdSysDetailDao;
@Resource
private BasicThirdSysService basicThirdSysService;
@Override
public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
@ -93,6 +97,8 @@ public class DownloadThirdSysDataTask implements SchedulingConfigurer {
//下载第三方仓库数据
//查询所有启用的第三方系统的标识
List<String> thirdIds = basicThirdSysDao.selectEnabledThirdId();
if (CollUtil.isNotEmpty(thirdIds)) {
for (String thirdId : thirdIds) {
//查询此系统的仓库仓位码配置详情

32
api-admin/src/main/resources/application-dev.properties
Unescape Escape View File

@ -1,62 +1,32 @@
# \u672C\u5730\u73AF\u5883
server.port=9991
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.username=root
spring.datasource.password=123456
#spring.datasource.password=89083fb2fc145533
server.servlet.context-path=
#logging.level.com.glxp.api.admin.dao=debug
logging.level.com.glxp.api.admin.dao.auth=debug
logging.level.com.glxp.api.admin.dao.basic=debug
logging.level.com.glxp.api.admin.dao.business=debug
logging.level.com.glxp.api.admin.dao.info=debug
logging.level.com.glxp.api.admin.dao.inout=debug
logging.level.com.glxp.api.admin.dao.inventory=debug
logging.level.com.glxp.api.admin.dao.thrsys=debug
logging.level.com.glxp.api.admin.erp.second=debug
logging.level.com.glxp.api.admin.dao=debug
file_path=D:/udi/udiwms/udiwmsfile/
#file_path=/home/glxp/udiwms
#UDI\u6570\u636E\u4E0B\u8F7D
UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df
UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test
SPMS_KEY=lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
#\u4E2D\u8F6C\u670D\u52A1IP\u5730\u5740
#SPSYNC_IP=http://192.168.0.35:9150/SP_SYNC_SERVER
SPSYNC_IP=http://127.0.0.1:9989
#SPSYNC_IP=http://139.159.187.130/SP_SYNC_SERVER
#UDI_SERVER_URL=http://127.0.0.1:9995
##\u7AEF\u53E3\u53F7
# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
spring.redis.database=8
# Redis\u670D\u52A1\u5668\u5730\u5740
spring.redis.host=127.0.0.1
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
spring.redis.port=6379
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
spring.redis.password=
#\u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
spring.redis.jedis.pool.max-active=8
# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
spring.redis.jedis.pool.max-wait=-1
# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
spring.redis.jedis.pool.max-idle=8
# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
spring.redis.jedis.pool.min-idle=0
# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
spring.redis.jedis.timeout=300
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
spring.jackson.time-zone=GMT+8
spring.servlet.multipart.max-file-size=500MB
spring.servlet.multipart.max-request-size=500MB
ok.http.connect-timeout=3000
ok.http.read-timeout=3000
ok.http.write-timeout=3000
# \u8FDE\u63A5\u6C60\u4E2D\u6574\u4F53\u7684\u7A7A\u95F2\u8FDE\u63A5\u7684\u6700\u5927\u6570\u91CF
ok.http.max-idle-connections=200
# \u8FDE\u63A5\u7A7A\u95F2\u65F6\u95F4\u6700\u591A\u4E3A 300 \u79D2
ok.http.keep-alive-duration=300

1
api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml
Unescape Escape View File

@ -102,6 +102,7 @@
)
</insert>
<update id="updateBusOriginType" parameterType="com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity">
UPDATE basic_bustype_origin
<trim prefix="set" suffixOverrides=",">

Write Preview
Loading…
Cancel
Save