From 72cd3f7beb2035fa0af05513383ba57334563157 Mon Sep 17 00:00:00 2001 From: DOUDOU <877258667@qq.com> Date: Mon, 16 Jan 2023 17:04:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=8B=E6=80=BB=20=E8=A6=81=E6=B1=82?= =?UTF-8?q?=E4=BF=AE=E6=94=B9sap=E5=BA=93=E4=BD=8D=E7=9A=84=E6=96=B0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=20=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/pda/controller/SapController.java | 34 ++++++++----------- .../modules/pda/service/SapService.java | 2 +- .../pda/service/impl/SapServiceImpl.java | 9 +++-- .../static/pda/js/sap/sap_part_location.js | 22 ++++++++++-- 4 files changed, 39 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/gaotao/modules/pda/controller/SapController.java b/src/main/java/com/gaotao/modules/pda/controller/SapController.java index c0236df..3eb5bb0 100644 --- a/src/main/java/com/gaotao/modules/pda/controller/SapController.java +++ b/src/main/java/com/gaotao/modules/pda/controller/SapController.java @@ -2,6 +2,7 @@ package com.gaotao.modules.pda.controller; import com.gaotao.common.annotation.RepeatSubmit; +import com.gaotao.common.utils.R; import com.gaotao.modules.pda.config.XuJieConfig; import com.gaotao.modules.pda.service.SapService; import com.gaotao.modules.pda.utils.ResponseData; @@ -54,29 +55,22 @@ public class SapController { } return responseData; } - + /** - * - * @Title: endCurrentScan - * @Description: 结束当前扫描任务 - * @author lirui - * @date 2018年4月7日 - * @throws - */ + * + * @Title: endCurrentScan + * @Description: 结束当前扫描任务 + * @author lirui + * @date 2018年4月7日 + * @throws + */ @PostMapping(value="/endCurrentScan") @ResponseBody - @RepeatSubmit - public Object endCurrentScan(String partNo, String locationNo){ - ResponseData responseData = new ResponseData(); - try { - responseData = sapService.endCurrentScan(partNo, locationNo); - responseData.setCode("200"); - responseData.setMsg("操作成功!"); - } catch (Exception e) { - responseData.setCode("500"); - responseData.setMsg(e.getMessage()); - } - return responseData; + public Object endCurrentScan(String partNo, String locationNo, String checkFlag){ + sapService.endCurrentScan(partNo, locationNo, checkFlag); + return R.ok() + .put("code", 200) + .put("msg", "操作成功!"); } } \ No newline at end of file diff --git a/src/main/java/com/gaotao/modules/pda/service/SapService.java b/src/main/java/com/gaotao/modules/pda/service/SapService.java index 5ce47ca..73e4c56 100644 --- a/src/main/java/com/gaotao/modules/pda/service/SapService.java +++ b/src/main/java/com/gaotao/modules/pda/service/SapService.java @@ -34,6 +34,6 @@ public interface SapService { * @return ResponseData 返回类型 * @throws */ - ResponseData endCurrentScan(String partNo, String locationNo); + void endCurrentScan(String partNo, String locationNo, String checkFlag); } diff --git a/src/main/java/com/gaotao/modules/pda/service/impl/SapServiceImpl.java b/src/main/java/com/gaotao/modules/pda/service/impl/SapServiceImpl.java index 23dcb21..1eab238 100644 --- a/src/main/java/com/gaotao/modules/pda/service/impl/SapServiceImpl.java +++ b/src/main/java/com/gaotao/modules/pda/service/impl/SapServiceImpl.java @@ -63,17 +63,15 @@ public class SapServiceImpl implements SapService { @Override @Transactional - public ResponseData endCurrentScan(String partNo, String locationNo) { - ResponseData responseData = new ResponseData(); + public void endCurrentScan(String partNo, String locationNo, String checkFlag) { //调用存储过程 处理SAP的库位信息 - Map resultMap = this.processSapPartLocation(partNo, locationNo); + Map resultMap = this.processSapPartLocation(partNo, locationNo, checkFlag); //判断是否检验成功 String resultCode = String.valueOf(resultMap.get("resultCode")); if (!"200".equalsIgnoreCase(resultCode)) { String msg = String.valueOf(resultMap.get("resultMsg")); throw new XJException(msg, Integer.parseInt(resultCode)); } - return responseData; } /** @@ -82,10 +80,11 @@ public class SapServiceImpl implements SapService { * @date 2023/1/13 17:54 * @version 1.0 */ - public Map processSapPartLocation(String partNo, String locationNo) { + public Map processSapPartLocation(String partNo, String locationNo, String checkFlag) { List params = new ArrayList<>(); params.add(partNo); params.add(locationNo); + params.add(checkFlag); //调用存储过程 List> resultList = procedureMapper.getProcedureData("processSapPartLocation", params); //处理返回的结果 diff --git a/src/main/resources/static/pda/js/sap/sap_part_location.js b/src/main/resources/static/pda/js/sap/sap_part_location.js index 8e23a37..a9338d9 100644 --- a/src/main/resources/static/pda/js/sap/sap_part_location.js +++ b/src/main/resources/static/pda/js/sap/sap_part_location.js @@ -1,3 +1,4 @@ +let checkFlag = 'Y'; //为内部卷号绑定一个失去焦点事件 $("#rollNo").bind("keydown",function(event){ if (event.keyCode == 13) { @@ -95,7 +96,7 @@ function endCurrentScan(){ $.ajax({ url : "/sap/endCurrentScan", type : "POST", - data : {"partNo": $("#part_no").val(), "locationNo": $("#location_no").val()}, + data : {"partNo": $("#part_no").val(), "locationNo": $("#location_no").val(), "checkFlag": checkFlag}, dataType : "json", beforeSend: function(request) { request.setRequestHeader("token", $.cookie("token")); @@ -105,7 +106,22 @@ function endCurrentScan(){ if(code=='200'){ layer.msg(data.msg); clear(); - }else if(code=='500'){ + }else if(code=='201'){ + layer.confirm(data.msg, { + btn : [ '确认', '取消' ] + // 按钮 + }, function() { + layer.closeAll('dialog'); + //重置当前的参数 + checkFlag = 'N'; + endCurrentScan(); + }, function(index) { + layer.close(index); + layer.closeAll('dialog'); + clear(); + $("#rollNo").focus(); + }); + }else{ layer.msg(data.msg); } }, @@ -113,4 +129,6 @@ function endCurrentScan(){ layer.alert(data.msg); } }); + //重置标记 + checkFlag = 'Y'; } \ No newline at end of file