From 704bdf296dfe7ecd8699369d29816b9af574f3b0 Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期五, 08 十二月 2023 09:18:51 +0800 Subject: [PATCH] #出库强制预留小车给入库任务 --- src/main/java/com/zy/asrs/controller/SiteController.java | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java index b6ae251..5706a21 100644 --- a/src/main/java/com/zy/asrs/controller/SiteController.java +++ b/src/main/java/com/zy/asrs/controller/SiteController.java @@ -103,6 +103,25 @@ vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 鍏ュ簱鏍囪 vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿 vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔� + vo.setLocType1(staProtocol.getLocType1()==null?"-":staProtocol.getLocType1().toString()); // 楂樹綆淇″彿 + + String outInModel = "-"; + if (staProtocol.getOutInModel() != null) { + switch (staProtocol.getOutInModel().intValue()) { + case 0: + outInModel = "default"; + break; + case 1: + outInModel = "in"; + break; + case 2: + outInModel = "out"; + break; + default: + outInModel = "-"; + } + } + vo.setOutInModel(outInModel); // 鍑哄叆搴撴ā寮� } return R.ok().add(list); } -- Gitblit v1.9.1