设备配置

4 months ago · 208187743e
parent bce324b42e
commit 208187743e
11 changed files with 33 additions and 33 deletions
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/RecycleDeviceConfigMapper.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/RecycleDeviceConfigMapper.java
@ -5,11 +5,11 @@ import jnpf.entity.RecycleDeviceConfigEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

 /**
- * 商户设备配置
+ * 投递柜配置
 * 版本： V3.5
 * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
 * 作者： JNPF开发平台组
- * 日期： 2024-06-17
+ * 日期： 2024-06-20
 */
 public interface RecycleDeviceConfigMapper extends BaseMapper<RecycleDeviceConfigEntity> {

--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleDeviceConfigService.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleDeviceConfigService.java
@ -7,11 +7,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

 /**
- * 商户设备配置
+ * 投递柜配置
 * 版本： V3.5
 * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
 * 作者： JNPF开发平台组
- * 日期： 2024-06-17
+ * 日期： 2024-06-20
 */
 public interface RecycleDeviceConfigService extends IService<RecycleDeviceConfigEntity> {
    List<RecycleDeviceConfigEntity> getList(RecycleDeviceConfigPagination recycleDeviceConfigPagination);
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceConfigServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceConfigServiceImpl.java
@ -32,11 +32,11 @@ import jnpf.base.UserInfo;
 import jnpf.permission.entity.UserEntity;
 /**
 *
- * 商户设备配置
+ * 投递柜配置
 * 版本： V3.5
 * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
 * 作者： JNPF开发平台组
- * 日期： 2024-06-17
+ * 日期： 2024-06-20
 */
@Service
 public class RecycleDeviceConfigServiceImpl extends ServiceImpl<RecycleDeviceConfigMapper, RecycleDeviceConfigEntity> implements RecycleDeviceConfigService{
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleDeviceConfigController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleDeviceConfigController.java
@ -30,15 +30,15 @@ import jnpf.exception.WorkFlowException;
 import org.springframework.transaction.annotation.Transactional;

 /**
- * 商户设备配置
+ * 投递柜配置
 * @版本： V3.5
 * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
 * @作者： JNPF开发平台组
- * @日期： 2024-06-17
+ * @日期： 2024-06-20
 */
@Slf4j
@RestController
-@Tag(name = "商户设备配置" , description = "scm")
+@Tag(name = "投递柜配置" , description = "scm")
@RequestMapping("/api/scm/RecycleDeviceConfig")
 public class RecycleDeviceConfigController {

--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecycleDeviceConfigEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecycleDeviceConfigEntity.java
@ -23,7 +23,7 @@ import java.math.BigDecimal;
 * @版本： V3.5
 * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
 * @作者： JNPF开发平台组
- * @日期： 2024-06-17
+ * @日期： 2024-06-20
 */
@Data
@TableName("nx_recycle_device_config")
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledeviceconfig/RecycleDeviceConfigConstant.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledeviceconfig/RecycleDeviceConfigConstant.java
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledeviceconfig/RecycleDeviceConfigForm.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledeviceconfig/RecycleDeviceConfigForm.java
@ -6,11 +6,11 @@ import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonProperty;

 /**
- * 商户设备配置
+ * 投递柜配置
 * @版本： V3.5
 * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
 * @作者： JNPF开发平台组
- * @日期： 2024-06-17
+ * @日期： 2024-06-20
 */
@Data
 public class RecycleDeviceConfigForm  {
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledeviceconfig/RecycleDeviceConfigPagination.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledeviceconfig/RecycleDeviceConfigPagination.java
@ -7,11 +7,11 @@ import java.util.List;

 /**
 *
- * 商户设备配置
+ * 投递柜配置
 * @版本： V3.5
 * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
 * @作者： JNPF开发平台组
- * @日期： 2024-06-17
+ * @日期： 2024-06-20
 */
@Data
 public class RecycleDeviceConfigPagination extends Pagination {
--- a/jnpf-java-boot/jnpf-web/src/views/recycledeviceconfig/Detail.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/recycledeviceconfig/Detail.vue
@ -13,7 +13,7 @@
 <el-form ref="formRef" :model="dataForm" size="medium" label-width="150px" label-position="right" >
    <template v-if="!loading">
            <el-col :span="24">
-                <el-collapse :accordion="false" v-model="activesvflpo" class="mb-20">
+                <el-collapse :accordion="false" v-model="activecburrz" class="mb-20">
                <el-collapse-item title="价格配置" name="1">
            <el-col :span="8"  >
                <jnpf-form-tip-item  label="统一投递价格"  
@ -237,16 +237,16 @@
                            companyId : "",
                            departmentId : "",
            },
-                            activesvflpo:["1","2"],
+                            activecburrz:["1","2","BwNYw72"],
                            deliveryAdjustSetOptions:[{"fullName":"即时自动","id":"1"},{"fullName":"24H自动","id":"2"},{"fullName":"48H自动","id":"3"}],
                        deliveryAdjustSetProps:{"label":"fullName","value":"id"  },
                        allowPhoneLoginProps:{"label":"fullName","value":"enCode"  },
-                        cleanLockProps:{"label":"fullName","value":"id"  },
+                        cleanLockProps:{"label":"fullName","value":"enCode"  },
                            cleanAdjustSetOptions:[{"fullName":"自动","id":"1"},{"fullName":"手动","id":"2"}],
                        cleanAdjustSetProps:{"label":"fullName","value":"id"  },
-                        smogSetProps:{"label":"fullName","value":"id"  },
-                        fullSetProps:{"label":"fullName","value":"id"  },
-                        promotionSetProps:{"label":"fullName","value":"id"  },
+                        smogSetProps:{"label":"fullName","value":"enCode"  },
+                        fullSetProps:{"label":"fullName","value":"enCode"  },
+                        promotionSetProps:{"label":"fullName","value":"enCode"  },

        }
        },
--- a/jnpf-java-boot/jnpf-web/src/views/recycledeviceconfig/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/recycledeviceconfig/form.vue
@ -35,7 +35,7 @@
    <template v-if="!loading">
        <!-- 具体表单 -->
                    <el-col :span="24">
-                        <el-collapse :accordion="false" v-model="activesvflpo" class="mb-20">
+                        <el-collapse :accordion="false" v-model="activecburrz" class="mb-20">
                        <el-collapse-item title="价格配置" name="1">
        <el-col :span="8" >
        <jnpf-form-tip-item
@ -332,7 +332,7 @@
                                    departmentId : undefined,
            },
            tableRequiredData: {},
-                                activesvflpo:["1","2"],
+                                activecburrz:["1","2","BwNYw72"],
            dataRule:
            {
                            deliveryPrice: [
@ -488,15 +488,15 @@
                    allowPhoneLoginOptions:[],
                            allowPhoneLoginProps:{"label":"fullName","value":"enCode"  },
                    cleanLockOptions:[],
-                            cleanLockProps:{"label":"fullName","value":"id"  },
+                            cleanLockProps:{"label":"fullName","value":"enCode"  },
                            cleanAdjustSetOptions:[{"fullName":"自动","id":"1"},{"fullName":"手动","id":"2"}],
                            cleanAdjustSetProps:{"label":"fullName","value":"id"  },
                    smogSetOptions:[],
-                            smogSetProps:{"label":"fullName","value":"id"  },
+                            smogSetProps:{"label":"fullName","value":"enCode"  },
                    fullSetOptions:[],
-                            fullSetProps:{"label":"fullName","value":"id"  },
+                            fullSetProps:{"label":"fullName","value":"enCode"  },
                    promotionSetOptions:[],
-                            promotionSetProps:{"label":"fullName","value":"id"  },
+                            promotionSetProps:{"label":"fullName","value":"enCode"  },
            childIndex:-1,
                    isEdit:false,
                    interfaceRes: {
--- a/jnpf-java-boot/jnpf-web/src/views/recycledeviceconfig/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/recycledeviceconfig/index.vue
@ -278,15 +278,15 @@
                            allowPhoneLoginOptions:[],
                        allowPhoneLoginProps:{"label":"fullName","value":"enCode"  },
                            cleanLockOptions:[],
-                        cleanLockProps:{"label":"fullName","value":"id"  },
+                        cleanLockProps:{"label":"fullName","value":"enCode"  },
                            cleanAdjustSetOptions:[{"fullName":"自动","id":"1"},{"fullName":"手动","id":"2"}],
                        cleanAdjustSetProps:{"label":"fullName","value":"id"  },
                            smogSetOptions:[],
-                        smogSetProps:{"label":"fullName","value":"id"  },
+                        smogSetProps:{"label":"fullName","value":"enCode"  },
                            fullSetOptions:[],
-                        fullSetProps:{"label":"fullName","value":"id"  },
+                        fullSetProps:{"label":"fullName","value":"enCode"  },
                            promotionSetOptions:[],
-                        promotionSetProps:{"label":"fullName","value":"id"  },
+                        promotionSetProps:{"label":"fullName","value":"enCode"  },
            interfaceRes: {
                },
            }