yunxi
/
ningxiaWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix():自测问题修改;

Browse Source
master
jiyufei 4 months ago
parent ab37633dc5
commit 7b4ec0b439
14 changed files with 1464 additions and 1416 deletions
Show Stats Download Patch File Download Diff File

7
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleBucketServiceImpl.java
Unescape View File

@ -26,6 +26,7 @@ import jnpf.model.QueryModel;
import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.database.model.superQuery.SuperJsonModel;
@ -301,9 +302,11 @@ public class RecycleBucketServiceImpl extends ServiceImpl<RecycleBucketMapper, R
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(RecycleBucketEntity entity) {
if (entity != null) {
this.removeById(entity.getId());
if (StringUtils.isBlank(entity.getId())) {
entity.setDeleteMark("1");
this.saveOrUpdate(entity);
}
}

7
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleCameraServiceImpl.java
Unescape View File

@ -26,6 +26,7 @@ import jnpf.model.QueryModel;
import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.database.model.superQuery.SuperJsonModel;
@ -286,9 +287,11 @@ public class RecycleCameraServiceImpl extends ServiceImpl<RecycleCameraMapper, R
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(RecycleCameraEntity entity) {
if (entity != null) {
this.removeById(entity.getId());
if (StringUtils.isBlank(entity.getId())) {
entity.setDeleteMark("1");
this.saveOrUpdate(entity);
}
}

7
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleCleanOrderServiceImpl.java
Unescape View File

@ -28,6 +28,7 @@ import jnpf.model.QueryModel;
import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.database.model.superQuery.SuperJsonModel;
@ -273,9 +274,11 @@ public class RecycleCleanOrderServiceImpl extends ServiceImpl<RecycleCleanOrderM
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(RecycleCleanOrderEntity entity) {
if (entity != null) {
this.removeById(entity.getId());
if (StringUtils.isBlank(entity.getId())) {
entity.setDeleteMark("1");
this.saveOrUpdate(entity);
}
}

9
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeliveryOrderServiceImpl.java
Unescape View File

@ -19,6 +19,7 @@ import jnpf.permission.entity.UserEntity;
import jnpf.service.*;
import jnpf.util.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -419,9 +420,11 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl<RecycleDelivery
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(RecycleDeliveryOrderEntity entity) {
if (entity != null) {
this.removeById(entity.getId());
if (StringUtils.isBlank(entity.getId())) {
entity.setDeleteMark("1");
this.saveOrUpdate(entity);
}
}
@ -437,7 +440,7 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl<RecycleDelivery
id = form.getId();
}
//主表字段验证
if (StringUtil.isEmpty(form.getPhone())) {
if (StringUtil.isEmpty(form.getPhone().toString())) {
return "投递人手机不能为空";
}
if (StringUtil.isEmpty(form.getReportWeight())) {

30
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceConfigServiceImpl.java
Unescape View File

@ -29,6 +29,7 @@ import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.database.model.superQuery.SuperJsonModel;
@ -54,7 +55,7 @@ import jnpf.permission.entity.UserEntity;
* 日期： 2024-06-20
*/
@Service
public class RecycleDeviceConfigServiceImpl extends ServiceImpl<RecycleDeviceConfigMapper, RecycleDeviceConfigEntity> implements RecycleDeviceConfigService{
public class RecycleDeviceConfigServiceImpl extends ServiceImpl<RecycleDeviceConfigMapper, RecycleDeviceConfigEntity> implements RecycleDeviceConfigService {
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@ -255,10 +256,10 @@ public class RecycleDeviceConfigServiceImpl extends ServiceImpl<RecycleDeviceCon
}
@Override
public void create(RecycleDeviceConfigEntity entity){
public void create(RecycleDeviceConfigEntity entity) {
String organizeJsonId = entity.getOrganizeJsonId();
RecycleDeviceConfigEntity config = getByOrganize(organizeJsonId);
if(config!=null){
if (config != null) {
// throw new ("该组织下已存在回收设备配置");
}
this.save(entity);
@ -270,9 +271,11 @@ public class RecycleDeviceConfigServiceImpl extends ServiceImpl<RecycleDeviceCon
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(RecycleDeviceConfigEntity entity) {
if (entity != null) {
this.removeById(entity.getId());
if (StringUtils.isBlank(entity.getId())) {
entity.setDeleteMark("1");
this.saveOrUpdate(entity);
}
}
@ -365,7 +368,7 @@ public class RecycleDeviceConfigServiceImpl extends ServiceImpl<RecycleDeviceCon
public RecycleDeviceConfigEntity getByOrganize(String organizeJsonId) {
QueryWrapper<RecycleDeviceConfigEntity> query = new QueryWrapper<>();
query.lambda()
.eq(RecycleDeviceConfigEntity::getOrganizeJsonId,organizeJsonId)
.eq(RecycleDeviceConfigEntity::getOrganizeJsonId, organizeJsonId)
.isNull(RecycleDeviceConfigEntity::getDeleteMark)//删除标记
.last("LIMIT 1");
RecycleDeviceConfigEntity one = this.getOne(query);
@ -387,8 +390,14 @@ public class RecycleDeviceConfigServiceImpl extends ServiceImpl<RecycleDeviceCon
recycleDeviceConfigForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(RecycleDeviceConfigConstant.getFormData(), recycleDeviceConfigForm), RecycleDeviceConfigForm.class);
RecycleDeviceConfigEntity entity = JsonUtil.getJsonToBean(recycleDeviceConfigForm, RecycleDeviceConfigEntity.class);
//唯一性验证
LambdaQueryWrapper<RecycleDeviceConfigEntity> wrapper = new LambdaQueryWrapper<>(RecycleDeviceConfigEntity.class)
.eq(RecycleDeviceConfigEntity::getCompanyId, generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
List<RecycleDeviceConfigEntity> list = this.list(wrapper);
if (isSave) {
if (CollectionUtils.isNotEmpty(list)) {
throw new RuntimeException("已存在该组织架构！");
}
String mainId = RandomUtil.uuId();
entity.setLastModifyUserId(null);
entity.setLastModifyTime(null);
@ -399,12 +408,11 @@ public class RecycleDeviceConfigServiceImpl extends ServiceImpl<RecycleDeviceCon
} else {
entity.setLastModifyUserId(null);
entity.setLastModifyTime(null);
entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
entity.setCompanyId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
entity.setDepartmentId(userEntity.getPositionId());
// entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
// entity.setCompanyId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
// entity.setDepartmentId(userEntity.getPositionId());
}
this.saveOrUpdate(entity);
}
@Override

7
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceServiceImpl.java
Unescape View File

@ -27,6 +27,7 @@ import jnpf.util.*;
import okhttp3.*;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@ -366,9 +367,11 @@ public class RecycleDeviceServiceImpl extends ServiceImpl<RecycleDeviceMapper, R
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(RecycleDeviceEntity entity) {
if (entity != null) {
this.removeById(entity.getId());
if (StringUtils.isBlank(entity.getId())) {
entity.setDeleteMark(1);
this.saveOrUpdate(entity);
}
}

7
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/SimCardServiceImpl.java
Unescape View File

@ -26,6 +26,7 @@ import jnpf.model.QueryModel;
import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.database.model.superQuery.SuperJsonModel;
@ -319,9 +320,11 @@ public class SimCardServiceImpl extends ServiceImpl<SimCardMapper, SimCardEntity
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(SimCardEntity entity) {
if (entity != null) {
this.removeById(entity.getId());
if (StringUtils.isBlank(entity.getId())) {
entity.setDeleteMark(1);
this.saveOrUpdate(entity);
}
}

18
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleCleanOrderController.java
Unescape View File

@ -8,18 +8,22 @@ import jnpf.base.vo.PaginationVO;
import jnpf.entity.RecycleCleanOrderEntity;
import jnpf.model.recyclecleanorder.*;
import jnpf.service.RecycleCleanOrderService;
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,8 @@ public class RecycleCleanOrderController {
@Autowired
private RecycleCleanOrderService recycleCleanOrderService;
@Resource
private RecycleDeviceService recycleDeviceService;
/**
* 列表
@ -90,6 +96,12 @@ public class RecycleCleanOrderController {
return ActionResult.fail(b);
}
try {
//查询设备 所绑定的商户 赋值
List<String> companyId = recycleDeviceService.getInfoByDeviceCode(Collections.singletonList(recycleCleanOrderForm.getDeviceCode()));
if (CollectionUtils.isNotEmpty(companyId)) {
//只会查询出来一个
recycleCleanOrderForm.setCompanyId(companyId.get(0));
}
recycleCleanOrderService.saveOrUpdate(recycleCleanOrderForm, null, true);
} catch (Exception e) {
return ActionResult.fail("新增数据失败");
@ -118,6 +130,12 @@ public class RecycleCleanOrderController {
RecycleCleanOrderEntity entity = recycleCleanOrderService.getInfo(id);
if (entity != null) {
try {
//查询设备 所绑定的商户 赋值
List<String> companyId = recycleDeviceService.getInfoByDeviceCode(Collections.singletonList(recycleCleanOrderForm.getDeviceCode()));
if (CollectionUtils.isNotEmpty(companyId)) {
//只会查询出来一个
recycleCleanOrderForm.setCompanyId(companyId.get(0));
}
recycleCleanOrderService.saveOrUpdate(recycleCleanOrderForm, id, false);
} catch (Exception e) {
return ActionResult.fail("修改数据失败");

4
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recyclecleanorder/RecycleCleanOrderForm.java
Unescape View File

@ -92,4 +92,8 @@ public class RecycleCleanOrderForm {
/** 租户id **/
@JsonProperty("tenantId")
private Object tenantId;
/** 公司id **/
@JsonProperty("companyId")
private String companyId;
}

14
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledeliveryorder/RecycleDeliveryOrderConstant.java
View File

File diff suppressed because one or more lines are too long

194
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledeliveryorder/RecycleDeliveryOrderForm.java
Unescape View File

@ -1,119 +1,187 @@
package jnpf.model.recycledeliveryorder;
import lombok.Data;
import java.util.List;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
/**
* 投递清单
*
* @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组
* @日期： 2024-06-27
* @日期： 2024-07-02
*/
@Data
public class RecycleDeliveryOrderForm {
/** 主键 */
public class RecycleDeliveryOrderForm {
/**
* 主键
*/
private String id;
/** 投递单号 **/
/**
* 投递单号
**/
@JsonProperty("orderNo")
private String orderNo;
/** 投递机柜 **/
/**
* 投递机柜
**/
@JsonProperty("deviceCode")
private Object deviceCode;
/** 投递人手机 **/
private String deviceCode;
/**
* 回收品大类
**/
@JsonProperty("productCode")
private String productCode;
/**
* 桶编码
**/
@JsonProperty("bucketCode")
private String bucketCode;
/**
* 投递人手机
**/
@JsonProperty("phone")
private String phone;
/** 桶编号 **/
private Object phone;
/**
* 桶编号
**/
@JsonProperty("doorNum")
private Object doorNum;
/** 回收品大类 **/
@JsonProperty("productCode")
private Object productCode;
/** 回收品子类 **/
private String doorNum;
/**
* 回收品子类
**/
@JsonProperty("productSubCode")
private Object productSubCode;
/** 上报重量 **/
@JsonProperty("reportWeight")
private String reportWeight;
/** 单价 **/
/**
* 单价
**/
@JsonProperty("price")
private String price;
/** 总价 **/
/**
* 上报重量
**/
@JsonProperty("reportWeight")
private String reportWeight;
/**
* 总价
**/
@JsonProperty("totalPrice")
private String totalPrice;
/** 桶内原重 **/
/**
* 桶内原重
**/
@JsonProperty("originalWeight")
private String originalWeight;
/** 审核重量 **/
/**
* 审核重量
**/
@JsonProperty("adjustWeight")
private String adjustWeight;
/** 审核总价 **/
/**
* 审核总价
**/
@JsonProperty("adjustPrice")
private String adjustPrice;
/** 审核状态 **/
/**
* 审核状态
**/
@JsonProperty("adjustStatus")
private String adjustStatus;
/** 审核设置 **/
/**
* 审核设置
**/
@JsonProperty("adjustSet")
private String adjustSet;
/** 投递员 **/
@JsonProperty("deliverId")
private String deliverId;
/** 审核说明 **/
/**
* 审核说明
**/
@JsonProperty("adjustComm")
private String adjustComm;
/** 投递照片 **/
/**
* 投递照片
**/
@JsonProperty("photo")
private Object photo;
/** 开始时间 **/
private String photo;
/**
* 机柜单号
**/
@JsonProperty("deviceOrderNo")
private String deviceOrderNo;
/**
* 投递员
**/
@JsonProperty("deliverId")
private String deliverId;
/**
* 登录方式
**/
@JsonProperty("loginType")
private String loginType;
/**
* 上报时间
**/
@JsonProperty("reportTime")
private String reportTime;
/**
* 开始时间
**/
@JsonProperty("startTime")
private String startTime;
/** 完成时间 **/
/**
* 完成时间
**/
@JsonProperty("finishTime")
private String finishTime;
/** 登录方式 **/
@JsonProperty("loginType")
private String loginType;
/** 机柜单号 **/
@JsonProperty("deviceOrderNo")
private String deviceOrderNo;
/** 桶编号 **/
@JsonProperty("bucketCode")
private Object bucketCode;
/** 垃圾袋编号 **/
/**
* 垃圾袋编号
**/
@JsonProperty("bagNo")
private String bagNo;
/** 上报时间 **/
@JsonProperty("reportTime")
private String reportTime;
/** 清运单号 **/
/**
* 清运单号
**/
@JsonProperty("cleanNo")
private String cleanNo;
/** 清运员手机号 **/
/**
* 清运员手机号
**/
@JsonProperty("cleanerPhone")
private String cleanerPhone;
/** 清运状态 **/
/**
* 清运状态
**/
@JsonProperty("cleanStatus")
private String cleanStatus;
/** 公司id **/
@JsonProperty("companyId")
private Object companyId;
/** 修改时间 **/
@JsonProperty("lastModifyTime")
private String lastModifyTime;
/** 修改用户 **/
/**
* 修改用户
**/
@JsonProperty("lastModifyUserId")
private String lastModifyUserId;
/** 组织JSONID **/
@JsonProperty("organizeJsonId")
private Object organizeJsonId;
/** 创建时间 **/
/**
* 修改时间
**/
@JsonProperty("lastModifyTime")
private String lastModifyTime;
/**
* 创建时间
**/
@JsonProperty("creatorTime")
private String creatorTime;
/** 创建用户 **/
/**
* 创建用户
**/
@JsonProperty("creatorUserId")
private String creatorUserId;
/**
* 组织JSONID
**/
@JsonProperty("organizeJsonId")
private String organizeJsonId;
/**
* 所属公司
**/
@JsonProperty("companyId")
private String companyId;
}

20
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledeliveryorder/RecycleDeliveryOrderPagination.java
Unescape View File

@ -11,7 +11,7 @@ import java.util.List;
* @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组
* @日期： 2024-06-27
* @日期： 2024-07-02
*/
@Data
public class RecycleDeliveryOrderPagination extends Pagination {
@ -30,34 +30,34 @@ public class RecycleDeliveryOrderPagination extends Pagination {
/** 投递单号 */
@JsonProperty("orderNo")
private Object orderNo;
/** 审核状态 */
@JsonProperty("adjustStatus")
private Object adjustStatus;
/** 投递员手机 */
@JsonProperty("phone")
private Object phone;
/** 机柜编码 */
@JsonProperty("deviceCode")
private Object deviceCode;
/** 桶编号 */
@JsonProperty("doorNum")
private Object doorNum;
/** 桶编码 */
@JsonProperty("bucketCode")
private Object bucketCode;
/** 审核状态 */
@JsonProperty("adjustStatus")
private Object adjustStatus;
/** 垃圾袋编号 */
@JsonProperty("bagNo")
private Object bagNo;
/** 桶编号 */
@JsonProperty("doorNum")
private Object doorNum;
/** 所属商户 */
@JsonProperty("companyId")
private Object companyId;
/** 清运员手机 */
@JsonProperty("cleanerPhone")
private Object cleanerPhone;
/** 清运状态 */
@JsonProperty("cleanStatus")
private Object cleanStatus;
/** 清运单号 */
@JsonProperty("cleanNo")
private Object cleanNo;
/** 清运员手机 */
@JsonProperty("cleanerPhone")
private Object cleanerPhone;
}

1621
jnpf-java-boot/jnpf-web/src/views/recycledeviceconfig/form.vue
View File

File diff suppressed because it is too large Load Diff

935
jnpf-java-boot/jnpf-web/src/views/recycledeviceconfig/index.vue
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save