Commit bfca9034eb2df8126c419829f469e7bd4fa36151
1 parent
6ce6570d
收货入库的时候 连续点组盘 需要多进程锁定
Showing
3 changed files
with
8 additions
and
5 deletions
src/main/java/com/huaheng/framework/web/controller/BaseController.java
@@ -207,7 +207,7 @@ public class BaseController | @@ -207,7 +207,7 @@ public class BaseController | ||
207 | ajaxResult = multiProcessListener.doProcess(); | 207 | ajaxResult = multiProcessListener.doProcess(); |
208 | } catch (Exception e) { | 208 | } catch (Exception e) { |
209 | e.printStackTrace(); | 209 | e.printStackTrace(); |
210 | - ajaxResult = AjaxResult.error(e.toString()); | 210 | + ajaxResult = AjaxResult.error(e.getMessage()); |
211 | } finally { | 211 | } finally { |
212 | semaphore.release(1); | 212 | semaphore.release(1); |
213 | } | 213 | } |
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java
@@ -192,7 +192,7 @@ public class ReceiptContainerHeaderController extends BaseController { | @@ -192,7 +192,7 @@ public class ReceiptContainerHeaderController extends BaseController { | ||
192 | */ | 192 | */ |
193 | @GetMapping("/positioning/{ids}") | 193 | @GetMapping("/positioning/{ids}") |
194 | public String positioning(@PathVariable("ids")String ids, ModelMap mmap){ | 194 | public String positioning(@PathVariable("ids")String ids, ModelMap mmap){ |
195 | - mmap.put("ids", ids);; | 195 | + mmap.put("ids", ids); |
196 | return "receipt/receiving" + "/positioning"; | 196 | return "receipt/receiving" + "/positioning"; |
197 | } | 197 | } |
198 | } | 198 | } |
src/main/java/com/huaheng/pc/receipt/receiving/controller/ReceivingController.java
@@ -119,9 +119,12 @@ public class ReceivingController extends BaseController { | @@ -119,9 +119,12 @@ public class ReceivingController extends BaseController { | ||
119 | if(qty.intValue() <= 0) { | 119 | if(qty.intValue() <= 0) { |
120 | return AjaxResult.error("配盘数量必须大于0"); | 120 | return AjaxResult.error("配盘数量必须大于0"); |
121 | } | 121 | } |
122 | - AjaxResult result = receiptContainerHeaderService.saveContainer(receiptCode, containerCode, receiptDetailId, | ||
123 | - locationCode, qty, locatingRule); | ||
124 | - return result; | 122 | + AjaxResult ajaxResult = AjaxResult.error("123"); |
123 | + synchronized (new Object()) { | ||
124 | + ajaxResult = receiptContainerHeaderService.saveContainer(receiptCode, containerCode, receiptDetailId, | ||
125 | + locationCode, qty, locatingRule); | ||
126 | + } | ||
127 | + return ajaxResult; | ||
125 | } | 128 | } |
126 | 129 | ||
127 | 130 |