fix():自测问题修复;

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleDeviceConfigService.java

@@ -34,7 +34,7 @@ public interface RecycleDeviceConfigService extends IService<RecycleDeviceConfig
 
     RecycleDeviceConfigEntity getByOrganize(String organizeJsonId);
 
-    void saveOrUpdate(RecycleDeviceConfigForm recycleDeviceConfigForm, String id, boolean isSave) throws Exception;
+    String saveOrUpdate(RecycleDeviceConfigForm recycleDeviceConfigForm, String id, boolean isSave);
 
     /**
      * 查询统一配置

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeliveryOrderServiceImpl.java

@@ -513,7 +513,7 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl<RecycleDelivery
         if (isSave) {
             String mainId = RandomUtil.uuId();
             entity.setOrderNo(generaterSwapUtil.getBillNumber("deliveryOrderCode", false));
-            entity.setCompanyId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
+//            entity.setCompanyId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
             entity.setLastModifyTime(null);
             entity.setLastModifyUserId(null);
             entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
@@ -521,11 +521,11 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl<RecycleDelivery
             entity.setCreatorUserId(userInfo.getUserId());
             entity.setId(mainId);
         } else {
-            entity.setOrderNo(generaterSwapUtil.getBillNumber("deliveryOrderCode", false));
+//            entity.setOrderNo(generaterSwapUtil.getBillNumber("deliveryOrderCode", false));
-            entity.setCompanyId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
+//            entity.setCompanyId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
             entity.setLastModifyTime(null);
             entity.setLastModifyUserId(null);
-            entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
+//            entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
             entity.setCreatorTime(DateUtil.getNowDate());
             entity.setCreatorUserId(userInfo.getUserId());
         }

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceConfigServiceImpl.java

@@ -386,7 +386,8 @@ public class RecycleDeviceConfigServiceImpl extends ServiceImpl<RecycleDeviceCon
      */
     @Override
     @Transactional
-    public void saveOrUpdate(RecycleDeviceConfigForm recycleDeviceConfigForm, String id, boolean isSave) throws Exception {
+    public String saveOrUpdate(RecycleDeviceConfigForm recycleDeviceConfigForm, String id, boolean isSave) {
+        String result;
         UserInfo userInfo = userProvider.get();
         UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
         recycleDeviceConfigForm = JsonUtil.getJsonToBean(
@@ -398,7 +399,8 @@ public class RecycleDeviceConfigServiceImpl extends ServiceImpl<RecycleDeviceCon
         List<RecycleDeviceConfigEntity> list = this.list(wrapper);
         if (isSave) {
             if (CollectionUtils.isNotEmpty(list)) {
-                throw new RuntimeException("已存在该组织架构！");
+                result = "已存在该组织架构！";
+                return result;
             }
             String mainId = RandomUtil.uuId();
             entity.setLastModifyUserId(null);
@@ -414,7 +416,13 @@ public class RecycleDeviceConfigServiceImpl extends ServiceImpl<RecycleDeviceCon
 //                entity.setCompanyId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
 //            entity.setDepartmentId(userEntity.getPositionId());
         }
-        this.saveOrUpdate(entity);
+        boolean saveOrUpdate = this.saveOrUpdate(entity);
+        if (saveOrUpdate) {
+            result = "新增成功";
+            return result;
+        }
+        result = "新增失败";
+        return result;
     }
 
     @Override

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleDeliveryOrderController.java

@@ -8,18 +8,22 @@ import jnpf.base.vo.PaginationVO;
 import jnpf.entity.RecycleDeliveryOrderEntity;
 import jnpf.model.recycledeliveryorder.*;
 import jnpf.service.RecycleDeliveryOrderService;
+import jnpf.service.RecycleDeviceService;
 import jnpf.util.GeneraterSwapUtil;
 import jnpf.util.JsonUtil;
 import jnpf.util.StringUtil;
 import jnpf.util.UserProvider;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -46,6 +50,9 @@ public class RecycleDeliveryOrderController {
     @Autowired
     private RecycleDeliveryOrderService recycleDeliveryOrderService;
 
+    @Resource
+    private RecycleDeviceService recycleDeviceService;
+
 
     /**
      * 列表
@@ -90,6 +97,12 @@ public class RecycleDeliveryOrderController {
             return ActionResult.fail(b);
         }
         try {
+            //查询设备 所绑定的商户 赋值
+            List<String> companyId = recycleDeviceService.getInfoByDeviceCode(Collections.singletonList(recycleDeliveryOrderForm.getDeviceCode()));
+            if (CollectionUtils.isNotEmpty(companyId)) {
+                //只会查询出来一个
+                recycleDeliveryOrderForm.setCompanyId(companyId.get(0));
+            }
             recycleDeliveryOrderService.saveOrUpdate(recycleDeliveryOrderForm, null, true);
         } catch (Exception e) {
             return ActionResult.fail("新增数据失败");

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleDeviceConfigController.java

@@ -15,22 +15,27 @@ import jnpf.model.recycledeviceconfig.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
 import java.util.*;
+
 import jnpf.annotation.JnpfField;
 import jnpf.base.vo.PageListVO;
 import jnpf.base.vo.PaginationVO;
 import jnpf.base.vo.DownloadVO;
 import jnpf.config.ConfigValueUtil;
 import jnpf.base.entity.ProvinceEntity;
+
 import java.io.IOException;
 import java.util.stream.Collectors;
+
 import jnpf.engine.entity.FlowTaskEntity;
 import jnpf.exception.WorkFlowException;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 投递柜配置
+ *
  * @版本： V3.5
  * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * @作者： JNPF开发平台组
@@ -52,7 +57,6 @@ public class RecycleDeviceConfigController {
     private RecycleDeviceConfigService recycleDeviceConfigService;
 
 
-
     /**
      * 列表
      *
@@ -81,6 +85,7 @@ public class RecycleDeviceConfigController {
         vo.setPagination(page);
         return ActionResult.success(vo);
     }
+
     /**
      * 创建
      *
@@ -94,15 +99,13 @@ public class RecycleDeviceConfigController {
         if (StringUtil.isNotEmpty(b)) {
             return ActionResult.fail(b);
         }
-        try{
+        String result = recycleDeviceConfigService.saveOrUpdate(recycleDeviceConfigForm, null, true);
-            recycleDeviceConfigService.saveOrUpdate(recycleDeviceConfigForm, null ,true);
+        return ActionResult.success(result);
-        }catch(Exception e){
-            return ActionResult.fail("新增数据失败");
-        }
-        return ActionResult.success("创建成功");
     }
+
     /**
      * 编辑
+     *
      * @param id
      * @param recycleDeviceConfigForm
      * @return
@@ -130,8 +133,10 @@ public class RecycleDeviceConfigController {
             return ActionResult.fail("更新失败，数据不存在");
         }
     }
+
     /**
      * 删除
+     *
      * @param id
      * @return
      */
@@ -146,9 +151,11 @@ public class RecycleDeviceConfigController {
         }
         return ActionResult.success("删除成功");
     }
+
     /**
      * 表单信息(详情页)
      * 详情页面使用-转换数据
+     *
      * @param id
      * @return
      */
@@ -166,9 +173,11 @@ public class RecycleDeviceConfigController {
         recycleDeviceConfigMap = generaterSwapUtil.swapDataDetail(recycleDeviceConfigMap, RecycleDeviceConfigConstant.getFormData(), "565858748388610501", false);
         return ActionResult.success(recycleDeviceConfigMap);
     }
+
     /**
      * 获取详情(编辑页)
      * 编辑页面使用-不转换数据
+     *
      * @param id
      * @return
      */

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledeliveryorder/RecycleDeliveryOrderForm.java

@@ -103,7 +103,7 @@ public class RecycleDeliveryOrderForm {
      * 投递照片
      **/
     @JsonProperty("photo")
-    private String photo;
+    private Object photo;
     /**
      * 机柜单号
      **/