From bfca9034eb2df8126c419829f469e7bd4fa36151 Mon Sep 17 00:00:00 2001
From: youjie <j.you@huahengweld.com>
Date: Wed, 24 Feb 2021 10:10:27 +0800
Subject: [PATCH] 收货入库的时候 连续点组盘 需要多进程锁定
---
src/main/java/com/huaheng/framework/web/controller/BaseController.java | 2 +-
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java | 2 +-
src/main/java/com/huaheng/pc/receipt/receiving/controller/ReceivingController.java | 9 ++++++---
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/huaheng/framework/web/controller/BaseController.java b/src/main/java/com/huaheng/framework/web/controller/BaseController.java
index 66b7c68..883b84c 100644
--- a/src/main/java/com/huaheng/framework/web/controller/BaseController.java
+++ b/src/main/java/com/huaheng/framework/web/controller/BaseController.java
@@ -207,7 +207,7 @@ public class BaseController
ajaxResult = multiProcessListener.doProcess();
} catch (Exception e) {
e.printStackTrace();
- ajaxResult = AjaxResult.error(e.toString());
+ ajaxResult = AjaxResult.error(e.getMessage());
} finally {
semaphore.release(1);
}
diff --git a/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java b/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java
index 9a1083b..b16ae39 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java
@@ -192,7 +192,7 @@ public class ReceiptContainerHeaderController extends BaseController {
*/
@GetMapping("/positioning/{ids}")
public String positioning(@PathVariable("ids")String ids, ModelMap mmap){
- mmap.put("ids", ids);;
+ mmap.put("ids", ids);
return "receipt/receiving" + "/positioning";
}
}
diff --git a/src/main/java/com/huaheng/pc/receipt/receiving/controller/ReceivingController.java b/src/main/java/com/huaheng/pc/receipt/receiving/controller/ReceivingController.java
index fc4ba87..0b8bde0 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiving/controller/ReceivingController.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiving/controller/ReceivingController.java
@@ -119,9 +119,12 @@ public class ReceivingController extends BaseController {
if(qty.intValue() <= 0) {
return AjaxResult.error("配盘数量必须大于0");
}
- AjaxResult result = receiptContainerHeaderService.saveContainer(receiptCode, containerCode, receiptDetailId,
- locationCode, qty, locatingRule);
- return result;
+ AjaxResult ajaxResult = AjaxResult.error("123");
+ synchronized (new Object()) {
+ ajaxResult = receiptContainerHeaderService.saveContainer(receiptCode, containerCode, receiptDetailId,
+ locationCode, qty, locatingRule);
+ }
+ return ajaxResult;
}
--
libgit2 0.22.2