From 4c6b92bd4f684709f930d4a023b12f3aa8ede9c6 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期二, 09 七月 2024 09:29:52 +0800 Subject: [PATCH] #MES接口 --- src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 4 ++++ src/main/java/com/zy/asrs/entity/param/MesPakoutReportParam.java | 26 ++++++++++++++++++++++++++ src/main/java/com/zy/asrs/entity/param/MesPakinReportParam.java | 24 ++++++++++++++++++++++++ src/main/resources/application.yml | 6 ++++-- 4 files changed, 58 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/param/MesPakinReportParam.java b/src/main/java/com/zy/asrs/entity/param/MesPakinReportParam.java new file mode 100644 index 0000000..a291f39 --- /dev/null +++ b/src/main/java/com/zy/asrs/entity/param/MesPakinReportParam.java @@ -0,0 +1,24 @@ +package com.zy.asrs.entity.param; + +import lombok.Data; + +@Data +public class MesPakinReportParam { + private String bizType; + private String inboundOrderCode; + private String remark; + + @Data + public static class InventoryAttr{ + private String batchNo; + private String materialCode; + private String storageLocationCode; + } + + @Data + public static class NoQrCodeExecAmount{ + private Double amount; + private String unitName; + private String unitCode; + } +} diff --git a/src/main/java/com/zy/asrs/entity/param/MesPakoutReportParam.java b/src/main/java/com/zy/asrs/entity/param/MesPakoutReportParam.java new file mode 100644 index 0000000..a90c13d --- /dev/null +++ b/src/main/java/com/zy/asrs/entity/param/MesPakoutReportParam.java @@ -0,0 +1,26 @@ +package com.zy.asrs.entity.param; + +import lombok.Data; + +@Data +public class MesPakoutReportParam { + //鐗╂枡缂栫爜 + private String materialCode; + //澶囨敞 + private String remark; + //浠撲綅缂栧彿 + private String storageCode; + //浠撳簱缂栧彿 + private String wareHouseCode; + + private Amount amount; + + @Data + public static class Amount{ + private Double amount; + //鍗曚綅缂栧彿(缂栧彿鍜屽悕绉板繀濉竴涓�,涓よ�呬笉涓�鑷翠笖閮芥湁鏁堜互缂栧彿涓哄噯) + private String unitCode; + //鍗曚綅鍚嶇О(缂栧彿鍜屽悕绉板繀濉竴涓�,涓よ�呬笉涓�鑷翠笖閮芥湁鏁堜互缂栧彿涓哄噯) + private String unitName; + } +} diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java index 027e913..0d2f99b 100644 --- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java @@ -33,6 +33,10 @@ private String url; @Value("${mes.orderReportPath}") private String orderReportPath; + @Value("${mes.pakinReportPath}") + private String pakinReportPath; + @Value("${mes.pakoutReportPath}") + private String pakoutReportPath; @Value("${mes.getTokenPath}") private String getTokenPath; @Value("${mes.appKey}") diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index d9e5741..e916c8c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -91,8 +91,10 @@ url: http://39.184.149.30:8877 orderReportPath: /DBMS/U8/CM/add mes: - url: https://v3-ali.blacklake.cn - orderReportPath: /api/openapi/domain/web/v1/route/inventory/open/v2/transfer_order/ordinary/_execute + url: https://v3-ali.blacklake.cn/api/openapi/domain/web/v1/route + orderReportPath: /inventory/open/v2/transfer_order/ordinary/_execute + pakinReportPath: /inventory/open/v2/inbound_order/execute/_inbound + pakoutReportPath: /inventory/open/v2/outbound_order/_outbound_by_suggest getTokenPath: /api/openapi/domain/api/v1/access_token/_get_access_token appKey: cli_1712644281065780 appSecret: 6710d24e31e64adc963d4c213b2c9b8e -- Gitblit v1.9.1