砍单回库增加odn参数

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/controller/CancelRestockController.java

@@ -73,7 +73,7 @@ public class CancelRestockController {
     @ApiOperation("砍单回库")
     @ApiOperation("砍单回库")
     @RequestMapping("/shipCancelUpshelf")
     @RequestMapping("/shipCancelUpshelf")
     @AnonymousAccess
     @AnonymousAccess
-    public ResultBean shipCancelUpshelf(String boxStr) {
+    public ResultBean shipCancelUpshelf(String boxStr,String odn) {
 
 
         if (StringUtils.isEmpty(boxStr)) {
         if (StringUtils.isEmpty(boxStr)) {
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"料箱信息"});
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"料箱信息"});
@@ -89,11 +89,12 @@ public class CancelRestockController {
         //2.判断栈板号和odn是否存在
         //2.判断栈板号和odn是否存在
         String palletId = barcode.getPalletId();
         String palletId = barcode.getPalletId();
         if (StringUtils.isEmpty(palletId)) {
         if (StringUtils.isEmpty(palletId)) {
-            throw new ValidateException("smfcore.valueNotFind", "未找到{0}[{1}]", new String[]{"料箱", "标签码"});
+            return ResultBean.newErrorResult(-1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"栈板id"});
         }
         }
-        String odn = barcode.getOdn();
+
+        //String odn = barcode.getOdn();
         if (StringUtils.isEmpty(odn)) {
         if (StringUtils.isEmpty(odn)) {
-            throw new ValidateException("smfcore.valueNotFind", "未找到{0}[{1}]", new String[]{"料箱", "odn"});
+            return ResultBean.newErrorResult(-1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"ODN"});
         }
         }
 
 
         //3.调用接口,判断是否可以回库
         //3.调用接口,判断是否可以回库