同一库位分配多次问题修改

myproject/src/main/java/com/myproject/webapp/controller/custom803/XLController.java

@@ -124,7 +124,7 @@ public class XLController extends BaseController {
      * @return
      */
     @RequestMapping("/boxPutIn")
-    public ResultBean boxPutIn(@RequestBody Map<String,Object> bodyParamMap, HttpServletRequest request){
+    public synchronized ResultBean boxPutIn(@RequestBody Map<String,Object> bodyParamMap, HttpServletRequest request){
         log.info("收到料箱到位顶起到位入库请求:" + bodyParamMap.toString());
         ResultBean resultBean = ResultBean.newErrorResult(-1,"箱子放入失败");
         Object djhObj = bodyParamMap.get("djh");
@@ -405,6 +405,7 @@ public class XLController extends BaseController {
                         storagePosManager.save(pos);
                     } catch (ValidateException e) {
                         log.error("保存库位出错",e);
+                        return ResultBean.newErrorResult(-100, "保存库位出错");
                     }
 
                     if(!excludePosIds.contains(pos.getId())){
@@ -425,10 +426,14 @@ public class XLController extends BaseController {
                         taskService.addTaskToExecute(hostOutTask);
                         log.info("出库" + serialNo + "时, 在库位["+pos.getPosName()+"]中找到物料所在箱子["+pos.getBarcode().getBarcode()+"],执行出库");
                     }else{
-                        log.info("出库" + serialNo + "时, 物料所在箱子["+pos.getBarcode().getBarcode()+"]已在出库列表中, 不再出库");
+                        String errorMsg = "出库" + serialNo + "时, 物料所在箱子["+pos.getBarcode().getBarcode()+"]已在出库列表中, 不再出库";
+                        log.info(errorMsg);
+//                        return ResultBean.newErrorResult(-101, errorMsg);
                     }
                 }else{
-                    log.info("出库" + serialNo + "时, 未找到库存");
+                    String errorMsg = "出库" + serialNo + "时, 未找到库存";
+                    log.info(errorMsg);
+                    return ResultBean.newErrorResult(-102, errorMsg);
                 }
             }