src/main/java/com/zy/asrs/controller/OpenController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/entity/param/LabellerCompleteParam.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/entity/param/LabellerMatParam.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/entity/param/SingleMountUnstackingCompleteParam.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/entity/param/SingleUnstackingCompleteParam.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/OpenService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/OpenController.java
@@ -199,10 +199,10 @@ @PostMapping("/labeller/complete/auth/v1") @AppAuth(memo = "贴标机贴标完成") public synchronized R labellerComplete(@RequestHeader(required = false) String appkey, @RequestBody OpenOrderPakinParam param, @RequestBody LabellerCompleteParam param, HttpServletRequest request) { auth(appkey, param, request); openService.labellerComplete(param); return R.ok(); } @@ -212,10 +212,10 @@ @PostMapping("/labeller/mat/auth/v1") @AppAuth(memo = "贴标机申请获取货物信息") public synchronized R labellerMat(@RequestHeader(required = false) String appkey, @RequestBody OpenOrderPakinParam param, @RequestBody LabellerMatParam param, HttpServletRequest request) { auth(appkey, param, request); openService.labellerMat(param); return R.ok(); } @@ -225,10 +225,10 @@ @PostMapping("/palletizing/complete/auth/v1") @AppAuth(memo = "中控:码垛完成下发入库信息") public synchronized R palletizingComplete(@RequestHeader(required = false) String appkey, @RequestBody OpenOrderPakinParam param, @RequestBody PalletizingCompleteParam param, HttpServletRequest request) { auth(appkey, param, request); openService.palletizingComplete(param); return R.ok(); } @@ -239,10 +239,10 @@ @PostMapping("/single/unstacking/complete/auth/v1") @AppAuth(memo = "桁架上位软件:单次拆垛完成通知") public synchronized R singleUnstackingComplete(@RequestHeader(required = false) String appkey, @RequestBody OpenOrderPakoutParam param, @RequestBody SingleUnstackingCompleteParam param, HttpServletRequest request) { auth(appkey, param, request); openService.singleUnstackingComplete(param); return R.ok(); } @@ -252,10 +252,10 @@ @PostMapping("/single/mount/unstacking/complete/auth/v1") @AppAuth(memo = "桁架上位软件:单托拆垛完成通知") public synchronized R singleMountUnstackingComplete(@RequestHeader(required = false) String appkey, @RequestBody OpenOrderPakoutParam param, @RequestBody SingleMountUnstackingCompleteParam param, HttpServletRequest request) { auth(appkey, param, request); openService.singleMountUnstackingComplete(param); return R.ok(); } src/main/java/com/zy/asrs/entity/param/LabellerCompleteParam.java
New file @@ -0,0 +1,13 @@ package com.zy.asrs.entity.param; import lombok.Data; @Data public class LabellerCompleteParam { private Integer devNo; // 是 int 站点号 private String labNo; // 是 字符串 贴标机号 private String WrkNo; // 是 字符串 工作号(用于信息确认) private String labResult; // 是 字符串 贴标结果:OK/NG private String requestTime; // 是 字符串 请求时间, yyyy-MM-dd HH:mm:ss } src/main/java/com/zy/asrs/entity/param/LabellerMatParam.java
New file @@ -0,0 +1,35 @@ package com.zy.asrs.entity.param; import lombok.Data; @Data public class LabellerMatParam { /* *站点号 */ private Integer devNo; /* *贴标机号 */ private String labNo; /* *请求时间, yyyy-MM-dd HH:mm:ss */ private String requestTime; private String labTemplate; // 贴标模板号(贴标机系统定) private String WrkNo; // 字符串 工作号 (贴标机保存,贴标完成请求附带) private String orderNo; // 字符串 订单号 private String labellingTime; // 字符串 贴标日期 yyyy-MM-dd HH:mm:ss private String matnr; // 字符串 商品编号 private String maktx; // 字符串 商品名称 private String specs; // 字符串 规格 private String batch; // 字符串 批次 private String unit ; //字符串 单位 private String anfme; // 字符串 数量 private String temp1; // 字符串 备用 private String temp2; // 字符串 备用 private String temp3; // 字符串 备用 private String temp4; // 字符串 备用 } src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java
New file @@ -0,0 +1,29 @@ package com.zy.asrs.entity.param; import lombok.Data; import java.util.List; @Data public class PalletizingCompleteParam { private String barcode;// 是 字符串 托盘码 private String palletizingNo;// 是 字符串 码垛位编号 private String createTime;// 是 字符串 创建时间 private List<PalletizingCompleteParam.MatList> matLists;// 是 列表 拆垛货物信息(2箱,尾箱可能1箱) @Data public class MatList{ private String matnr;// 是 字符串 物料编码 private String maktx;// 是 字符串 物料名称 private String boxNo;// 是 字符串 木箱编号(唯一字段,出库依据,出库时按照木箱编号出库) private String position;// 是 字符串 木箱码垛位置(拆垛时需要) private Double weight;// 是 小数型 重量 private Integer anfme;// 是 数字型 木箱中铜箔数量 private String batch;// (是否分批) 字符串 批次号 private String specs;// (是否需要) 字符串 规格 } } src/main/java/com/zy/asrs/entity/param/SingleMountUnstackingCompleteParam.java
New file @@ -0,0 +1,19 @@ package com.zy.asrs.entity.param; import lombok.Data; import java.util.List; public class SingleMountUnstackingCompleteParam { private String barcode;// 是 字符串 托盘码 private String palletizingNo;// 是 字符串 拆垛位编号 private String createTime;// 是 字符串 创建时间 private String uuid;// 是 字符串 时间戳 private List<SingleMountUnstackingCompleteParam.MatList> matLists;// 是 列表 拆垛货物信息(2箱,尾箱可能1箱) @Data public class MatList{ private String position;// 是 字符串 木箱码垛位置 private String boxNo;// 是 字符串 木箱编号(唯一字段,出库依据,出库时按照木箱编号出库) } } src/main/java/com/zy/asrs/entity/param/SingleUnstackingCompleteParam.java
New file @@ -0,0 +1,21 @@ package com.zy.asrs.entity.param; import lombok.Data; import java.util.List; @Data public class SingleUnstackingCompleteParam { private String barcode;// 是 字符串 托盘码 private String palletizingNo;// 是 字符串 拆垛位编号 private String createTime;// 是 字符串 创建时间 private String uuid;// 是 字符串 时间戳 private List<SingleUnstackingCompleteParam.MatList> matLists;// 是 列表 拆垛货物信息(2箱,尾箱可能1箱) @Data public class MatList{ private String position;// 是 字符串 木箱码垛位置 private String boxNo;// 是 字符串 木箱编号(唯一字段,出库依据,出库时按照木箱编号出库) } } src/main/java/com/zy/asrs/service/OpenService.java
@@ -43,4 +43,15 @@ * @param param */ void syncMat(MatSyncParam param); void labellerComplete(LabellerCompleteParam param); void labellerMat(LabellerMatParam param); void palletizingComplete(PalletizingCompleteParam param); void singleUnstackingComplete(SingleUnstackingCompleteParam param); void singleMountUnstackingComplete(SingleMountUnstackingCompleteParam param); } src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -543,5 +543,32 @@ } } @Override @Transactional public void labellerComplete(LabellerCompleteParam param) { } @Override @Transactional public void labellerMat(LabellerMatParam param){ } @Override @Transactional public void palletizingComplete(PalletizingCompleteParam param) { } @Override @Transactional public void singleUnstackingComplete(SingleUnstackingCompleteParam param) { } @Override @Transactional public void singleMountUnstackingComplete(SingleMountUnstackingCompleteParam param) { } }