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

代码备份

Browse Source
dev_no_inv
yewj 10 months ago
parent b367f58010
commit 6981fba035
6 changed files with 34 additions and 213 deletions
Show Stats Download Patch File Download Diff File

4
src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java
Unescape Escape View File

@ -97,13 +97,13 @@ public class IoCollectOriginController extends BaseController {
//通过工位列表 获取出 业务列表 //通过工位列表 获取出 业务列表
workBindBusTypeRequest.setWorkPlaceCodes(workPlaceCodes); workBindBusTypeRequest.setWorkPlaceCodes(workPlaceCodes);
sysWorkplaceDocumentResponses = sysWorkplaceDocumentService.filterListByWorkplace(workBindBusTypeRequest); sysWorkplaceDocumentResponses = sysWorkplaceDocumentService.filterListByWorkplace(workBindBusTypeRequest);
}else { } else {
workBindBusTypeRequest.setWorkplaceCode(collectOrderRequest.getWorkPlaceCode()); workBindBusTypeRequest.setWorkplaceCode(collectOrderRequest.getWorkPlaceCode());
sysWorkplaceDocumentResponses = sysWorkplaceDocumentService.filterListByWorkplace(workBindBusTypeRequest); sysWorkplaceDocumentResponses = sysWorkplaceDocumentService.filterListByWorkplace(workBindBusTypeRequest);
collectOrderRequest.setWorkPlaceCode(null); collectOrderRequest.setWorkPlaceCode(null);
} }
if (CollUtil.isNotEmpty(sysWorkplaceDocumentResponses)){ if (CollUtil.isNotEmpty(sysWorkplaceDocumentResponses)) {
Set<String> uniqueDocumentTypeCodesLinkedHashSet = sysWorkplaceDocumentResponses.stream() Set<String> uniqueDocumentTypeCodesLinkedHashSet = sysWorkplaceDocumentResponses.stream()
.map(SysWorkplaceDocumentResponse::getDocumentTypeCode) .map(SysWorkplaceDocumentResponse::getDocumentTypeCode)
.collect(Collectors.toCollection(LinkedHashSet::new)); .collect(Collectors.toCollection(LinkedHashSet::new));

59
src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
Unescape Escape View File

@ -480,35 +480,36 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
if (sysWorkplaceDocumentEntity == null) { if (sysWorkplaceDocumentEntity == null) {
continue; continue;
} }
if (collectOrder.getWorkPlaceCode() == null) { //暂时不自动分配工位
//自动分配工位 // if (collectOrder.getWorkPlaceCode() == null) {
final Long[] defaultWorkplace = {null}; // //自动分配工位
List<SysWorkplaceResponse> sysWorkplaces = sysWorkplaceService.getAllByBusType(addr); // final Long[] defaultWorkplace = {null};
if (CollUtil.isNotEmpty(sysWorkplaces)) { // List<SysWorkplaceResponse> sysWorkplaces = sysWorkplaceService.getAllByBusType(addr);
if (sysWorkplaces.size() == 1) { // if (CollUtil.isNotEmpty(sysWorkplaces)) {
defaultWorkplace[0] = sysWorkplaces.get(0).getWorkplaceId(); // if (sysWorkplaces.size() == 1) {
} else { // defaultWorkplace[0] = sysWorkplaces.get(0).getWorkplaceId();
List<SysWorkplaceResponse> addWorkplace = new ArrayList<>(); // } else {
for (SysWorkplaceResponse sysWorkplace : sysWorkplaces) { // List<SysWorkplaceResponse> addWorkplace = new ArrayList<>();
//获取是否有正在处理的工位 // for (SysWorkplaceResponse sysWorkplace : sysWorkplaces) {
List<IoCollectOrder> collectOrderList1 = collectOrderMapper.selectList(new LambdaQueryWrapper<IoCollectOrder>() // //获取是否有正在处理的工位
.eq(IoCollectOrder::getWorkPlaceCode, sysWorkplace.getWorkplaceId()).in(IoCollectOrder::getTagStatus, -1, 1, 2)); // List<IoCollectOrder> collectOrderList1 = collectOrderMapper.selectList(new LambdaQueryWrapper<IoCollectOrder>()
sysWorkplace.setOrderCount(collectOrderList1.size()); // .eq(IoCollectOrder::getWorkPlaceCode, sysWorkplace.getWorkplaceId()).in(IoCollectOrder::getTagStatus, -1, 1, 2));
if (IntUtil.value(sysWorkplace.getOrderCount()) > 0) { // sysWorkplace.setOrderCount(collectOrderList1.size());
addWorkplace.add(sysWorkplace); // if (IntUtil.value(sysWorkplace.getOrderCount()) > 0) {
} // addWorkplace.add(sysWorkplace);
} // }
if (addWorkplace.size() > 0) { // }
Optional<SysWorkplaceResponse> minCountObject = addWorkplace.stream() // if (addWorkplace.size() > 0) {
.min((o1, o2) -> Integer.compare(o1.getOrderCount(), o2.getOrderCount())); // Optional<SysWorkplaceResponse> minCountObject = addWorkplace.stream()
minCountObject.ifPresent(sysWorkplace -> defaultWorkplace[0] = sysWorkplace.getWorkplaceId()); // .min((o1, o2) -> Integer.compare(o1.getOrderCount(), o2.getOrderCount()));
} else { // minCountObject.ifPresent(sysWorkplace -> defaultWorkplace[0] = sysWorkplace.getWorkplaceId());
defaultWorkplace[0] = sysWorkplaces.get(0).getWorkplaceId(); // } else {
} // defaultWorkplace[0] = sysWorkplaces.get(0).getWorkplaceId();
} // }
} // }
collectOrder.setWorkPlaceCode(defaultWorkplace[0]); // }
} // collectOrder.setWorkPlaceCode(defaultWorkplace[0]);
// }
collectOrder.setBusType(sysWorkplaceDocumentEntity.getDocumentTypeCode()); collectOrder.setBusType(sysWorkplaceDocumentEntity.getDocumentTypeCode());
collectOrder.setOrderCirType(sysWorkplaceDocumentEntity.getOrderCirType()); collectOrder.setOrderCirType(sysWorkplaceDocumentEntity.getOrderCirType());

5
src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java
Unescape Escape View File

@ -110,7 +110,7 @@ public class IoCollectOriginService {
collectOrderRequest.setBusType(item.getDocumentTypeCode()); collectOrderRequest.setBusType(item.getDocumentTypeCode());
downloadFactory.downloadOrder(collectOrderRequest); downloadFactory.downloadOrder(collectOrderRequest);
} }
}else{ } else {
return ResultVOUtils.error("未配置业务类型"); return ResultVOUtils.error("未配置业务类型");
} }
return ResultVOUtils.success("下载成功"); return ResultVOUtils.success("下载成功");
@ -137,9 +137,6 @@ public class IoCollectOriginService {
if (StrUtil.isBlank(collectOrderRequest.getBusType())) { if (StrUtil.isBlank(collectOrderRequest.getBusType())) {
throw new JsonException(500, "单据类型不能为空"); throw new JsonException(500, "单据类型不能为空");
} }
if (collectOrderRequest.getWorkPlaceCode() == null) {
throw new JsonException(500, "工位号不能为空");
}
//删除异常单据 //删除异常单据
collectOrderBizService.remove(new LambdaQueryWrapper<IoCollectOrderBiz>() collectOrderBizService.remove(new LambdaQueryWrapper<IoCollectOrderBiz>()
.eq(IoCollectOrderBiz::getOrderIdFk, collectOrderRequest.getBillNo())); .eq(IoCollectOrderBiz::getOrderIdFk, collectOrderRequest.getBillNo()));

60
src/main/resources/application-hzt.yml
Unescape Escape View File

@ -1,60 +0,0 @@
server:
port: 9991
spring:
datasource:
driver-class-name: com.p6spy.engine.spy.P6SpyDriver
jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root
password: Glxp@6066
hikari:
connection-timeout: 60000
maximum-pool-size: 20
minimum-idle: 10
redis:
database: 8
host: 127.0.0.1
port: 6379
# password: 123456
timeout: 300
jedis:
pool:
max-active: 8
max-wait: -1
max-idle: 8
min-idle: 0
jackson:
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
servlet:
multipart:
max-file-size: 500MB
max-request-size: 500MB
ok:
http:
connect-timeout: 3000
read-timeout: 3000
write-timeout: 3000
max-idle-connections: 200
keep-alive-duration: 300
logging:
level:
com.glxp.api.dao: debug
file_path: E:/udi/udiwms/udiwmsfile/
file_lpath: /udiwms/image/register/file/getImage
file_url: http://127.0.0.1:9991
UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
back_file_path: E:/share/udisps/back/
SPMS_WEBSOCKET_TOKEN: 07rKFDFkQvBkbxgc7aUBlONo4gWNdx8b
API_KEY: 1101
API_SECRET: zBITspLNvuoEd4FaamlSoqxRHmNsmQ6L
WEB_TITLE: 平潭协和医院

61
src/main/resources/application-wj.yml
Unescape Escape View File

@ -1,61 +0,0 @@
server:
port: 9991
spring:
datasource:
driver-class-name: com.p6spy.engine.spy.P6SpyDriver
jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3333/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root
password: 123456
hikari:
connection-timeout: 60000
maximum-pool-size: 20
minimum-idle: 10
redis:
database: 8
host: 127.0.0.1
port: 6377
password: 123456
timeout: 300
jedis:
pool:
max-active: 8
max-wait: -1
max-idle: 8
min-idle: 0
jackson:
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
servlet:
multipart:
max-file-size: 500MB
max-request-size: 500MB
ok:
http:
connect-timeout: 3000
read-timeout: 3000
write-timeout: 3000
max-idle-connections: 200
keep-alive-duration: 300
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:9991
UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
back_file_path: D:/share/udisps/back/
API_KEY: 1101
API_SECRET: zBITspLNvuoEd4FaamlSoqxRHmNsmQ6L
WEB_TITLE: 平潭协和医院
SPMS_WEBSOCKET_TOKEN: 07rKFDFkQvBkbxgc7aUBlONo4gWNdx8b

56
src/main/resources/application-wmd.yml
Unescape Escape View File

@ -1,56 +0,0 @@
server:
port: 9991
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
jdbc-url: jdbc:mysql://192.168.0.66:3364/udi_wms_glxp?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root
password: Glxp@6066
hikari:
connection-timeout: 60000
maximum-pool-size: 60
minimum-idle: 10
redis:
database: 8
host: 127.0.0.1
port: 6401
# password: 123456
timeout: 300
jedis:
pool:
max-active: 8
max-wait: -1
max-idle: 8
min-idle: 0
jackson:
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
servlet:
multipart:
max-file-size: 500MB
max-request-size: 500MB
ok:
http:
connect-timeout: 3000
read-timeout: 3000
write-timeout: 3000
max-idle-connections: 200
keep-alive-duration: 300
logging:
level:
com.glxp.api.dao: debug
file_path: D:/udi/udiwms/udiwmsfile/
UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
back_file_path: D:/share/udisps/back/
API_KEY: 1101
API_SECRET: zBITspLNvuoEd4FaamlSoqxRHmNsmQ9L
WEB_TITLE: 平潭协和医院
SPMS_WEBSOCKET_TOKEN: 07rKFDFkQvBkbxgc7aUBlONo4gWNdx8b
Write Preview
Loading…
Cancel
Save