1.解绑时 展示错误信息

2.bug修改

src/main/java/com/neotel/smfcore/custom/luxsan/api/LuxsanApi.java

@@ -1054,7 +1054,7 @@ public class LuxsanApi extends DefaultSmfApiListener {
 
 
             LuxsanApiResult apiResult = JSONObject.parseObject(resultStr, LuxsanApiResult.class);
             LuxsanApiResult apiResult = JSONObject.parseObject(resultStr, LuxsanApiResult.class);
             if (LuxsanApiEnum.ERROR.equals(apiResult.getMSGTY())) {
             if (LuxsanApiEnum.ERROR.equals(apiResult.getMSGTY())) {
-                result = apiResult.getMSGTY();
+                result = apiResult.getMSGTX();
             }
             }
         } catch (ApiException e) {
         } catch (ApiException e) {
             e.printStackTrace();
             e.printStackTrace();

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/manual/ManualGrPutInController.java

@@ -164,7 +164,7 @@ public class ManualGrPutInController {
 
 
         Component component = componentManager.findByPartNumberAndProvider(noDbBarcode.getPartNumber(), noDbBarcode.getProvider());
         Component component = componentManager.findByPartNumberAndProvider(noDbBarcode.getPartNumber(), noDbBarcode.getProvider());
         if (component == null) {
         if (component == null) {
-            BrandQtyResult result = LuxsanApi.brandQtyUrl(new BrandQtyRequest(noDbBarcode.getPartNumber(), noDbBarcode.getPartNumber()));
+            BrandQtyResult result = LuxsanApi.brandQtyUrl(new BrandQtyRequest(noDbBarcode.getPartNumber(), noDbBarcode.getProvider()));
             if (result == null) {
             if (result == null) {
                 return ResultBean.newErrorResult(-1, "", "未找到对应的尺寸信息");
                 return ResultBean.newErrorResult(-1, "", "未找到对应的尺寸信息");
             }
             }

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

@@ -131,7 +131,7 @@ public class RestoreReplaceController {
 
 
         //如果不是补箱作业
         //如果不是补箱作业
         StoragePos pos = null;
         StoragePos pos = null;
-        if (!replaceBox){
+        if (replaceBox){
 
 
         } else {
         } else {
             //找一个料号相同,数量相同的箱子
             //找一个料号相同,数量相同的箱子
@@ -145,7 +145,7 @@ public class RestoreReplaceController {
             Sort s = Sort.by(Sort.Direction.ASC, "barcode.amount", "barcode.putInDate");
             Sort s = Sort.by(Sort.Direction.ASC, "barcode.amount", "barcode.putInDate");
             pos = storagePosDao.findOne(new Query(c).with(s));
             pos = storagePosDao.findOne(new Query(c).with(s));
             if (pos == null) {
             if (pos == null) {
-                return ResultBean.newErrorResult(-1, "", boxStr+"未找到对应的可补的料箱");
+                return ResultBean.newErrorResult(-1, "", boxStr+"未找到对应的可补的料箱,栈板id为:"+palletId);
             }
             }
         }
         }