diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java index 3c97b5639..6846bd400 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java @@ -79,7 +79,7 @@ public class IoCollectOriginController extends BaseController { public BaseResponse filterOrder(CollectOrderRequest collectOrderRequest) { List workPlaceCodes = null; - List sysWorkplaceDocumentResponses = null; + List sysWorkplaceDocumentResponses = null; List page; WorkBindBusTypeRequest workBindBusTypeRequest = new WorkBindBusTypeRequest(); if (collectOrderRequest.getWorkPlaceCode() == null) { @@ -97,13 +97,13 @@ public class IoCollectOriginController extends BaseController { //通过工位列表 获取出 业务列表 workBindBusTypeRequest.setWorkPlaceCodes(workPlaceCodes); sysWorkplaceDocumentResponses = sysWorkplaceDocumentService.filterListByWorkplace(workBindBusTypeRequest); - }else { + } else { workBindBusTypeRequest.setWorkplaceCode(collectOrderRequest.getWorkPlaceCode()); sysWorkplaceDocumentResponses = sysWorkplaceDocumentService.filterListByWorkplace(workBindBusTypeRequest); collectOrderRequest.setWorkPlaceCode(null); } - if (CollUtil.isNotEmpty(sysWorkplaceDocumentResponses)){ + if (CollUtil.isNotEmpty(sysWorkplaceDocumentResponses)) { Set uniqueDocumentTypeCodesLinkedHashSet = sysWorkplaceDocumentResponses.stream() .map(SysWorkplaceDocumentResponse::getDocumentTypeCode) .collect(Collectors.toCollection(LinkedHashSet::new)); diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index 4f4231521..57184e587 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -480,35 +480,36 @@ public class IoCollectOrderService extends ServiceImpl sysWorkplaces = sysWorkplaceService.getAllByBusType(addr); - if (CollUtil.isNotEmpty(sysWorkplaces)) { - if (sysWorkplaces.size() == 1) { - defaultWorkplace[0] = sysWorkplaces.get(0).getWorkplaceId(); - } else { - List addWorkplace = new ArrayList<>(); - for (SysWorkplaceResponse sysWorkplace : sysWorkplaces) { - //获取是否有正在处理的工位 - List collectOrderList1 = collectOrderMapper.selectList(new LambdaQueryWrapper() - .eq(IoCollectOrder::getWorkPlaceCode, sysWorkplace.getWorkplaceId()).in(IoCollectOrder::getTagStatus, -1, 1, 2)); - sysWorkplace.setOrderCount(collectOrderList1.size()); - if (IntUtil.value(sysWorkplace.getOrderCount()) > 0) { - addWorkplace.add(sysWorkplace); - } - } - if (addWorkplace.size() > 0) { - Optional minCountObject = addWorkplace.stream() - .min((o1, o2) -> Integer.compare(o1.getOrderCount(), o2.getOrderCount())); - minCountObject.ifPresent(sysWorkplace -> defaultWorkplace[0] = sysWorkplace.getWorkplaceId()); - } else { - defaultWorkplace[0] = sysWorkplaces.get(0).getWorkplaceId(); - } - } - } - collectOrder.setWorkPlaceCode(defaultWorkplace[0]); - } + //暂时不自动分配工位 +// if (collectOrder.getWorkPlaceCode() == null) { +// //自动分配工位 +// final Long[] defaultWorkplace = {null}; +// List sysWorkplaces = sysWorkplaceService.getAllByBusType(addr); +// if (CollUtil.isNotEmpty(sysWorkplaces)) { +// if (sysWorkplaces.size() == 1) { +// defaultWorkplace[0] = sysWorkplaces.get(0).getWorkplaceId(); +// } else { +// List addWorkplace = new ArrayList<>(); +// for (SysWorkplaceResponse sysWorkplace : sysWorkplaces) { +// //获取是否有正在处理的工位 +// List collectOrderList1 = collectOrderMapper.selectList(new LambdaQueryWrapper() +// .eq(IoCollectOrder::getWorkPlaceCode, sysWorkplace.getWorkplaceId()).in(IoCollectOrder::getTagStatus, -1, 1, 2)); +// sysWorkplace.setOrderCount(collectOrderList1.size()); +// if (IntUtil.value(sysWorkplace.getOrderCount()) > 0) { +// addWorkplace.add(sysWorkplace); +// } +// } +// if (addWorkplace.size() > 0) { +// Optional minCountObject = addWorkplace.stream() +// .min((o1, o2) -> Integer.compare(o1.getOrderCount(), o2.getOrderCount())); +// minCountObject.ifPresent(sysWorkplace -> defaultWorkplace[0] = sysWorkplace.getWorkplaceId()); +// } else { +// defaultWorkplace[0] = sysWorkplaces.get(0).getWorkplaceId(); +// } +// } +// } +// collectOrder.setWorkPlaceCode(defaultWorkplace[0]); +// } collectOrder.setBusType(sysWorkplaceDocumentEntity.getDocumentTypeCode()); collectOrder.setOrderCirType(sysWorkplaceDocumentEntity.getOrderCirType()); diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java index d42b7cf98..e45c25b61 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java @@ -110,7 +110,7 @@ public class IoCollectOriginService { collectOrderRequest.setBusType(item.getDocumentTypeCode()); downloadFactory.downloadOrder(collectOrderRequest); } - }else{ + } else { return ResultVOUtils.error("未配置业务类型"); } return ResultVOUtils.success("下载成功"); @@ -137,9 +137,6 @@ public class IoCollectOriginService { if (StrUtil.isBlank(collectOrderRequest.getBusType())) { throw new JsonException(500, "单据类型不能为空"); } - if (collectOrderRequest.getWorkPlaceCode() == null) { - throw new JsonException(500, "工位号不能为空"); - } //删除异常单据 collectOrderBizService.remove(new LambdaQueryWrapper() .eq(IoCollectOrderBiz::getOrderIdFk, collectOrderRequest.getBillNo())); diff --git a/src/main/resources/application-hzt.yml b/src/main/resources/application-hzt.yml deleted file mode 100644 index c2992225f..000000000 --- a/src/main/resources/application-hzt.yml +++ /dev/null @@ -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: 平潭协和医院 diff --git a/src/main/resources/application-wj.yml b/src/main/resources/application-wj.yml deleted file mode 100644 index 9120c60f7..000000000 --- a/src/main/resources/application-wj.yml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/src/main/resources/application-wmd.yml b/src/main/resources/application-wmd.yml deleted file mode 100644 index ae600f03b..000000000 --- a/src/main/resources/application-wmd.yml +++ /dev/null @@ -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 -