预留单转储出库接口 bug修改

src/main/java/com/neotel/smfcore/core/inList/rest/InListController.java

@@ -253,9 +253,12 @@ public class InListController {
         if (inList == null) {
         if (inList == null) {
             //从接口获取入库单
             //从接口获取入库单
             ApiResult apiResult = HikApi.transferOrderApi(SecurityUtils.getCurrentUsername(), name, type.toString());
             ApiResult apiResult = HikApi.transferOrderApi(SecurityUtils.getCurrentUsername(), name, type.toString());
-            if (ObjectUtil.isNotEmpty(apiResult.getMsg())) {
+            if (apiResult.getCode()!=0) {
                 return ResultBean.newErrorResult(1, "smfcore.apiError", "错误码{0}：{1}", new String[]{apiResult.getCode() + "", apiResult.getMsg()});
                 return ResultBean.newErrorResult(1, "smfcore.apiError", "错误码{0}：{1}", new String[]{apiResult.getCode() + "", apiResult.getMsg()});
             }
             }
+            if (apiResult.getData()==null) {
+                return ResultBean.newErrorResult(1, "smfcore.inlist.notFound", "未找到单据号[{0}]", new String[]{name});
+            }
             List<TransferOrderInfo> inOrderLists = (List<TransferOrderInfo>)apiResult.getData();
             List<TransferOrderInfo> inOrderLists = (List<TransferOrderInfo>)apiResult.getData();
             if (inOrderLists == null || inOrderLists.size() <= 0) {
             if (inOrderLists == null || inOrderLists.size() <= 0) {
                 return ResultBean.newErrorResult(1, "smfcore.inlist.notFound", "未找到单据号[{0}]", new String[]{name});
                 return ResultBean.newErrorResult(1, "smfcore.inlist.notFound", "未找到单据号[{0}]", new String[]{name});

src/main/java/com/neotel/smfcore/core/outList/rest/OutListController.java

@@ -157,11 +157,14 @@ public class OutListController {
         OutList outList = outListCache.getOutList(name);
         OutList outList = outListCache.getOutList(name);
         if (outList == null) {
         if (outList == null) {
             //从接口获取出库单
             //从接口获取出库单
-          ApiResult apiResult= HikApi.reservedOrderApi(SecurityUtils.getCurrentUsername(), name, type);
-          if(ObjectUtil.isNotEmpty(apiResult.getMsg())) {
-              return ResultBean.newErrorResult(1, "smfcore.apiError", "错误码{0}：{1}", new String[]{apiResult.getCode() + "", apiResult.getMsg()});
-          }
-            List<ReservedOrderItem> outOrderLists =null;
+            ApiResult apiResult = HikApi.reservedOrderApi(SecurityUtils.getCurrentUsername(), name, type);
+            if (apiResult.getCode() != 0) {
+                return ResultBean.newErrorResult(1, "smfcore.apiError", "错误码{0}：{1}", new String[]{apiResult.getCode() + "", apiResult.getMsg()});
+            }
+            if (apiResult.getData() == null  ) {
+                return ResultBean.newErrorResult(1, "smfcore.inlist.notFound", "未找到单据号[{0}]", new String[]{name});
+            }
+            List<ReservedOrderItem> outOrderLists = (List<ReservedOrderItem>)apiResult.getData();
             if (outOrderLists == null || outOrderLists.size() <= 0) {
             if (outOrderLists == null || outOrderLists.size() <= 0) {
                 return ResultBean.newErrorResult(1, "smfcore.inlist.notFound", "未找到单据号[{0}]", new String[]{name});
                 return ResultBean.newErrorResult(1, "smfcore.inlist.notFound", "未找到单据号[{0}]", new String[]{name});
             }
             }

src/main/java/com/neotel/smfcore/hikvision/HikApi.java

@@ -310,6 +310,7 @@ public class HikApi {
         String apiName="Hik 入库上架过账接口 (putInApi): ";
         String apiName="Hik 入库上架过账接口 (putInApi): ";
         String url = getUrl( config.addr_5_putInApi,"putInApi");
         String url = getUrl( config.addr_5_putInApi,"putInApi");
 //        warehousingType	Integer		是	入库类型(0普通入库1退料入库2并盘入库3截料入库)
 //        warehousingType	Integer		是	入库类型(0普通入库1退料入库2并盘入库3截料入库)
+//        jobNo	String	32	否	入库类型为退料入库的需要提供工单号
 //        trayId	String	41	是	料盘ID/唯一码
 //        trayId	String	41	是	料盘ID/唯一码
 //        qty	Integer		是	数量
 //        qty	Integer		是	数量
 //        baseCode	String	16	是	基地
 //        baseCode	String	16	是	基地
@@ -602,19 +603,19 @@ public class HikApi {
      * 7.10 预留单转储出库接口
      * 7.10 预留单转储出库接口
      * @param userName
      * @param userName
      * @param docNo 预留单号
      * @param docNo 预留单号
-     * @param businessType 单据类型(0 线边仓间转储，1 )
+     * @param docType 单据类型(0 线边仓间转储 )
      * @return 返回预留单详情列表
      * @return 返回预留单详情列表
      */
      */
-    public static ApiResult reservedOrderApi(String userName, String docNo , Integer businessType){
+    public static ApiResult reservedOrderApi(String userName, String docNo , Integer docType){
         String apiName="Hik 预留单转储出库接口 (reservedOrderApi): ";
         String apiName="Hik 预留单转储出库接口 (reservedOrderApi): ";
         String url = getUrl( config.addr_10_reservedOrderApi,"reservedOrderApi");
         String url = getUrl( config.addr_10_reservedOrderApi,"reservedOrderApi");
 //        接口名	预留单转储出库接口
 //        接口名	预留单转储出库接口
-//        data	docNo	String	16	是	预留单号
-//        BusinessType	Integer		是	单据类型(0 线边仓间转储，1 )
+//        docNo	String	16	是	预留单号
+//        docType	Integer		是	单据类型(0 线边仓间转储)
 
 
         Map<String,Object> dataMap=new HashMap<>();
         Map<String,Object> dataMap=new HashMap<>();
         dataMap.put("docNo",docNo);
         dataMap.put("docNo",docNo);
-        dataMap.put("BusinessType",businessType);
+        dataMap.put("docType",0);
 //        String data=JsonUtil.toJsonStr(dataMap);
 //        String data=JsonUtil.toJsonStr(dataMap);
 
 
         RequestParam info = new RequestParam(getReqCode(), userName, dataMap);
         RequestParam info = new RequestParam(getReqCode(), userName, dataMap);