diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/RecycleOrderProductMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/RecycleOrderProductMapper.xml
new file mode 100644
index 0000000..e54475d
--- /dev/null
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/RecycleOrderProductMapper.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/RecycleOrderProductMapper.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/RecycleOrderProductMapper.java
new file mode 100644
index 0000000..a969ecb
--- /dev/null
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/RecycleOrderProductMapper.java
@@ -0,0 +1,16 @@
+package jnpf.mapper;
+
+
+import jnpf.entity.RecycleOrderProductEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * RecycleOrder
+ * 版本: V3.5
+ * 版权: 引迈信息技术有限公司(https://www.jnpfsoft.com)
+ * 作者: JNPF开发平台组
+ * 日期: 2024-05-20
+ */
+public interface RecycleOrderProductMapper extends BaseMapper {
+
+}
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleOrderProductService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleOrderProductService.java
new file mode 100644
index 0000000..d4b8a53
--- /dev/null
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleOrderProductService.java
@@ -0,0 +1,18 @@
+package jnpf.service;
+
+import jnpf.model.recycleorder.*;
+import jnpf.entity.*;
+import java.util.*;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+/**
+ * RecycleOrder
+ * 版本: V3.5
+ * 版权: 引迈信息技术有限公司(https://www.jnpfsoft.com)
+ * 作者: JNPF开发平台组
+ * 日期: 2024-05-20
+ */
+public interface RecycleOrderProductService extends IService {
+ QueryWrapper getChild(RecycleOrderPagination pagination,QueryWrapper recycleOrderProductQueryWrapper);
+}
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleOrderService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleOrderService.java
index 9010c69..474ab28 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleOrderService.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleOrderService.java
@@ -27,6 +27,9 @@ public interface RecycleOrderService extends IService {
boolean update(String id, RecycleOrderEntity entity);
//子表方法
+ List getRecycleOrderProductList(String id,RecycleOrderPagination recycleOrderPagination);
+
+ List getRecycleOrderProductList(String id);
//副表数据方法
String checkForm(RecycleOrderForm form,int i);
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleOrderProductServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleOrderProductServiceImpl.java
new file mode 100644
index 0000000..0fc73d2
--- /dev/null
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleOrderProductServiceImpl.java
@@ -0,0 +1,59 @@
+package jnpf.service.impl;
+
+import jnpf.entity.*;
+import jnpf.mapper.RecycleOrderProductMapper;
+import jnpf.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.model.recycleorder.*;
+import java.math.BigDecimal;
+import cn.hutool.core.util.ObjectUtil;
+import jnpf.permission.model.authorize.AuthorizeConditionModel;
+import jnpf.util.GeneraterSwapUtil;
+import jnpf.database.model.superQuery.SuperQueryJsonModel;
+import jnpf.database.model.superQuery.ConditionJsonModel;
+import jnpf.database.model.superQuery.SuperQueryConditionModel;
+import jnpf.model.QueryModel;
+import java.util.stream.Collectors;
+import jnpf.base.model.ColumnDataModel;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import jnpf.database.model.superQuery.SuperJsonModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import java.text.SimpleDateFormat;
+import jnpf.util.*;
+import java.util.*;
+import jnpf.base.UserInfo;
+import jnpf.permission.entity.UserEntity;
+/**
+ *
+ * RecycleOrder
+ * 版本: V3.5
+ * 版权: 引迈信息技术有限公司(https://www.jnpfsoft.com)
+ * 作者: JNPF开发平台组
+ * 日期: 2024-05-20
+ */
+@Service
+public class RecycleOrderProductServiceImpl extends ServiceImpl implements RecycleOrderProductService{
+ @Autowired
+ private GeneraterSwapUtil generaterSwapUtil;
+
+ @Autowired
+ private UserProvider userProvider;
+
+ //子表过滤方法
+ @Override
+ public QueryWrapper getChild(RecycleOrderPagination pagination, QueryWrapper recycleOrderProductQueryWrapper){
+ boolean pcPermission = false;
+ boolean appPermission = false;
+ boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
+ String ruleQueryJson = isPc?RecycleOrderConstant.getColumnData():RecycleOrderConstant.getAppColumnData();
+ ColumnDataModel dataModel = JsonUtil.getJsonToBean(ruleQueryJson,ColumnDataModel.class);
+ String ruleJson = isPc?JsonUtil.getObjectToString(dataModel.getRuleList()):JsonUtil.getObjectToString(dataModel.getRuleListApp());
+ if(isPc){
+ }
+ return recycleOrderProductQueryWrapper;
+ }
+}
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleOrderServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleOrderServiceImpl.java
index 7bd2542..0c87d7a 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleOrderServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleOrderServiceImpl.java
@@ -51,6 +51,8 @@ public class RecycleOrderServiceImpl extends ServiceImpl getList(RecycleOrderPagination recycleOrderPagination){
@@ -426,6 +428,26 @@ public class RecycleOrderServiceImpl extends ServiceImpl getRecycleOrderProductList(String id,RecycleOrderPagination recycleOrderPagination){
+ Map newtabMap=RecycleOrderConstant.TABLEFIELDKEY.entrySet()
+ .stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
+ String tableName="recycleOrderProduct";
+ tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString();
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper = recycleOrderProductService.getChild(recycleOrderPagination,queryWrapper);
+ queryWrapper.lambda().eq(RecycleOrderProductEntity::getRecycleOrderId, id);
+ generaterSwapUtil.wrapperHandle(RecycleOrderConstant.getColumnData(), RecycleOrderConstant.getAppColumnData(), queryWrapper,RecycleOrderProductEntity.class,"sub",tableName);
+ return recycleOrderProductService.list(queryWrapper);
+ }
+ /** RecycleOrderProduct子表方法 */
+ @Override
+ public List getRecycleOrderProductList(String id){
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.lambda().eq(RecycleOrderProductEntity::getRecycleOrderId, id);
+ return recycleOrderProductService.list(queryWrapper);
+ }
/** 验证表单唯一字段,正则,非空 i-0新增-1修改*/
@Override
public String checkForm(RecycleOrderForm form,int i) {
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleOrderController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleOrderController.java
index 5d42851..661e72a 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleOrderController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleOrderController.java
@@ -163,6 +163,8 @@ public class RecycleOrderController {
recycleOrderMap.put("id", recycleOrderMap.get("id"));
//副表数据
//子表数据
+ List recycleOrderProductList = recycleOrderService.getRecycleOrderProductList(entity.getId());
+ recycleOrderMap.put("tableField172",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(recycleOrderProductList)));
recycleOrderMap = generaterSwapUtil.swapDataDetail(recycleOrderMap,RecycleOrderConstant.getFormData(),"520255187403674181",false);
return ActionResult.success(recycleOrderMap);
}
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecycleOrderProductEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecycleOrderProductEntity.java
new file mode 100644
index 0000000..5fc857c
--- /dev/null
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecycleOrderProductEntity.java
@@ -0,0 +1,51 @@
+package jnpf.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+/**
+ * 回收订单-废品信息表
+ *
+ * @版本: V3.5
+ * @版权: 引迈信息技术有限公司(https://www.jnpfsoft.com)
+ * @作者: JNPF开发平台组
+ * @日期: 2024-05-20
+ */
+@Data
+@TableName("nx_recycle_order_product")
+public class RecycleOrderProductEntity {
+ @TableId(value ="ID" )
+ private String id;
+ @TableField(value = "RECYCLE_ORDER_ID" , updateStrategy = FieldStrategy.IGNORED)
+ private String recycleOrderId;
+ @TableField(value = "PRODUCT_ID" , updateStrategy = FieldStrategy.IGNORED)
+ private String productId;
+ @TableField("PRODUCT_NAME")
+ private String productName;
+ @TableField("PRODUCT_WEIGHT")
+ private String productWeight;
+ @TableField(value = "PRODUCT_ACTUAL_WEIGHT" , updateStrategy = FieldStrategy.IGNORED)
+ private Double productActualWeight;
+ @TableField(value = "RECOVERY_PRICE" , updateStrategy = FieldStrategy.IGNORED)
+ private BigDecimal recoveryPrice;
+ @TableField(value = "ACTUAL_RECOVERY_PRICE" , updateStrategy = FieldStrategy.IGNORED)
+ private BigDecimal actualRecoveryPrice;
+ @TableField("F_CREATOR_TIME")
+ private Date creatorTime;
+ @TableField("F_CREATOR_USER_ID")
+ private String creatorUserId;
+ @TableField("F_LAST_MODIFY_TIME")
+ private Date lastModifyTime;
+ @TableField("F_LAST_MODIFY_USER_ID")
+ private String lastModifyUserId;
+ @TableField("F_DELETE_TIME")
+ private Date deleteTime;
+ @TableField("F_DELETE_USER_ID")
+ private String deleteUserId;
+ @TableField("F_DELETE_MARK")
+ private Integer deleteMark;
+ @TableField("F_TENANT_ID")
+ private String tenantId;
+}
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycleorder/RecycleOrderProductModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycleorder/RecycleOrderProductModel.java
new file mode 100644
index 0000000..d1633cd
--- /dev/null
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycleorder/RecycleOrderProductModel.java
@@ -0,0 +1,37 @@
+package jnpf.model.recycleorder;
+
+import lombok.Data;
+import java.util.List;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.alibaba.fastjson.annotation.JSONField;
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ *
+ * RecycleOrder
+ * 版本: V3.5
+ * 版权: 引迈信息技术有限公司(https://www.jnpfsoft.com)
+ * 作者: JNPF开发平台组
+ * 日期: 2024-05-20
+ */
+@Data
+public class RecycleOrderProductModel {
+ /** 订单id **/
+ @JSONField(name = "recycleOrderId")
+ private String recycleOrderId;
+ /** 商品id **/
+ @JSONField(name = "productId")
+ private Object productId;
+
+ /** 废品实际重量 **/
+ @JSONField(name = "productActualWeight")
+ private String productActualWeight;
+ /** 下单时回收单价 **/
+ @JSONField(name = "recoveryPrice")
+ private String recoveryPrice;
+ /** 实际回收单价 **/
+ @JSONField(name = "actualRecoveryPrice")
+ private String actualRecoveryPrice;
+}
diff --git a/jnpf-java-boot/jnpf-web/src/views/recycleorder/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/recycleorder/Detail.vue
index 5591393..ea73aea 100644
--- a/jnpf-java-boot/jnpf-web/src/views/recycleorder/Detail.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/recycleorder/Detail.vue
@@ -1,352 +1,349 @@
-
-
-
-
-
+