| src/main/java/com/zy/asrs/controller/MatController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/controller/MobileController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/controller/WaitPakinController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/MatController.java
@@ -330,5 +330,42 @@ return R.ok().add(valueVos); } @RequestMapping(value = "/mat/list/pda/page/auth") @ManagerAuth public R pdaPageList(@RequestParam(required = true)Long tagId, @RequestParam(defaultValue = "1")Integer curr, @RequestParam(defaultValue = "10")Integer limit){ EntityWrapper<Mat> wrapper = new EntityWrapper<>(); wrapper.eq("tag_id", tagId); wrapper.orderBy("create_time", false); return R.ok().add(matService.selectPage(new Page<>(curr, limit), wrapper)); } @RequestMapping(value = "/mat/split") @ManagerAuth public R split(@RequestParam("matnr") String matnr) { if (Cools.isEmpty(matnr)) { return R.error("数据为空"); } String[] split = matnr.split(","); if (split.length != 8) { return R.error("数据错误"); } Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", split[0])); if (Cools.isEmpty(mat)){ return R.error("未查询到物料信息,"+split[0]); } Map<String, Object> map = new HashMap<>(); map.put("matnr", split[0]); map.put("batch", split[1]); map.put("specs", split[2].substring(0,split[2].length()-1)); map.put("manuDate", split[3]); map.put("model", split[4].substring(0,split[4].length()-1)); map.put("weight", split[5].substring(0,split[5].length()-2)); map.put("length", split[6]); map.put("volume", split[7]); return R.ok().add(map); } //0205040001,K44132-09-0724,PE@,20240724,HD-233L@,70@@,2816,53908.56626 80000001 } src/main/java/com/zy/asrs/controller/MobileController.java
@@ -56,6 +56,12 @@ @Autowired private WrkDetlLogService wrkDetlLogService; @PostMapping("/inbound/auth") @ManagerAuth public R inbound(@RequestBody JSONObject param){ return R.ok(); } // 商品上架 @RequestMapping("/mat/onSale/auth") src/main/java/com/zy/asrs/controller/WaitPakinController.java
@@ -10,6 +10,7 @@ import com.core.common.Cools; import com.core.common.DateUtils; import com.core.common.R; import com.zy.asrs.entity.Mat; import com.zy.asrs.entity.WaitPakin; import com.zy.asrs.entity.WrkDetl; import com.zy.asrs.entity.WrkMast; @@ -150,4 +151,16 @@ return R.ok(); } @RequestMapping(value = "/waitPakin/selectByBarcode/list") @ManagerAuth public R pdaPageList(@RequestParam String barcode){ EntityWrapper<WaitPakin> wrapper = new EntityWrapper<>(); wrapper.eq("zpallet", barcode); Page<WaitPakin> waitPakinPage = waitPakinService.selectPage(new Page<>(1, 10), wrapper); if (Cools.isEmpty(waitPakinPage.getRecords())){ return R.error("未查询到相关组托信息"); } return R.ok().add(waitPakinPage); } }