王总 要求修改sap库位的新功能 添加

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", "操作成功!");
 	}
 	
 }

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);
 
 }

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<String, Object> resultMap = this.processSapPartLocation(partNo, locationNo);
+		Map<String, Object> 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<String, Object> processSapPartLocation(String partNo, String locationNo) {
+	public Map<String, Object> processSapPartLocation(String partNo, String locationNo, String checkFlag) {
 		List<Object> params = new ArrayList<>();
 		params.add(partNo);
 		params.add(locationNo);
+		params.add(checkFlag);
 		//调用存储过程
 		List<Map<String, Object>> resultList = procedureMapper.getProcedureData("processSapPartLocation", params);
 		//处理返回的结果

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';
 }