From 12fe4055d7b5ba5dbd9a2d5f83f885e0112f0b17 Mon Sep 17 00:00:00 2001
From: zxf <1532322479@qq.com>
Date: Fri, 27 Mar 2026 08:56:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/.env.production                         |  2 +-
 .../purchase/order/OrderDetailList.vue        |  2 +-
 .../src/views/pm/daily/menu/DispatchList.vue  |  1 -
 .../PmCanteenPlanOrderRelController.java      | 58 ++++++++++++++++++-
 .../PmCanteenPurchasePlanController.java      |  4 --
 .../entity/PmCanteenPlanOrderRel.java         | 21 +++++++
 .../PmCanteenPlanOrderRelServiceImpl.java     |  6 +-
 7 files changed, 80 insertions(+), 14 deletions(-)

diff --git a/admin/.env.production b/admin/.env.production
index 73ce5ae..542466c 100644
--- a/admin/.env.production
+++ b/admin/.env.production
@@ -3,5 +3,5 @@ ENV = 'production'
 
 # base api
 # VUE_APP_BASE_API = 'http://124.71.134.146:18091'
-VUE_APP_BASE_API = 'http://119.45.21.129:18091'
+VUE_APP_BASE_API = 'https://fzbfwy.com/prod-api'
 
diff --git a/admin/src/views/pm/canteen/purchase/order/OrderDetailList.vue b/admin/src/views/pm/canteen/purchase/order/OrderDetailList.vue
index ada843e..284f4b4 100644
--- a/admin/src/views/pm/canteen/purchase/order/OrderDetailList.vue
+++ b/admin/src/views/pm/canteen/purchase/order/OrderDetailList.vue
@@ -19,7 +19,7 @@
       </el-table-column>
       <el-table-column prop="orderQuantity" header-align="center" align="center" label="订单数量"  style="width: 100px">
         <template slot-scope="scope">
-          <template v-if="editingRow === scope.row.id">
+          <template v-if="editingRow == scope.row.id">
             <el-input
               v-model.number="editForm.orderQuantity"
               type="number"
diff --git a/admin/src/views/pm/daily/menu/DispatchList.vue b/admin/src/views/pm/daily/menu/DispatchList.vue
index 05c8284..9326b21 100644
--- a/admin/src/views/pm/daily/menu/DispatchList.vue
+++ b/admin/src/views/pm/daily/menu/DispatchList.vue
@@ -9,7 +9,6 @@
       v-loading="dataListLoading"
       :row-key="'id'"
       style="width: 100%;">
-
       <el-table-column prop="itemName" header-align="center" align="center" label="菜品名称">
         <template slot-scope="scope">
           <template v-if="editingRow === scope.row.id">
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmCanteenPlanOrderRelController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmCanteenPlanOrderRelController.java
index 2824e25..34dbfd6 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmCanteenPlanOrderRelController.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmCanteenPlanOrderRelController.java
@@ -1,6 +1,7 @@
 package com.zbkj.modules.autogencode.controller;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 import cn.hutool.core.util.StrUtil;
@@ -8,6 +9,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zbkj.common.request.PageParamRequest;
 import com.zbkj.common.response.CommonResult;
 import com.zbkj.common.page.CommonPage;
+import com.zbkj.modules.autogencode.entity.CmCustProduct;
+import com.zbkj.modules.autogencode.service.CmCustProductService;
+import com.zbkj.modules.autogencode.entity.PmCanteenPurchaseDetail;
+import com.zbkj.modules.autogencode.service.PmCanteenPurchaseDetailService;
+import com.zbkj.modules.autogencode.entity.PmCanteenPurchasePlan;
+import com.zbkj.modules.autogencode.service.PmCanteenPurchasePlanService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -32,7 +39,12 @@ import com.zbkj.modules.autogencode.service.PmCanteenPlanOrderRelService;
 public class PmCanteenPlanOrderRelController {
     @Autowired
     private PmCanteenPlanOrderRelService pmCanteenPlanOrderRelService;
-
+    @Autowired
+    private CmCustProductService cmCustProductService;
+    @Autowired
+    private PmCanteenPurchaseDetailService pmCanteenPurchaseDetailService;
+    @Autowired
+    private PmCanteenPurchasePlanService pmCanteenPurchasePlanService;
 
 
     /**
@@ -137,8 +149,48 @@ public class PmCanteenPlanOrderRelController {
         
         // 应用搜索条件
         condition(queryWrapper, request);
-        
-        CommonPage<PmCanteenPlanOrderRel> page = CommonPage.restPage(pmCanteenPlanOrderRelService.pageList(queryWrapper, pageParamRequest));
+        List<PmCanteenPlanOrderRel> pmCanteenPlanOrderRels = pmCanteenPlanOrderRelService.pageList(queryWrapper, pageParamRequest);
+        if (null != pmCanteenPlanOrderRels && pmCanteenPlanOrderRels.size() > 0 ) {
+            for (PmCanteenPlanOrderRel rel : pmCanteenPlanOrderRels) {
+                // 如果有detailId，查询PmCanteenPurchaseDetail进行字段赋值
+                if (rel.getDetailId() != null) {
+                    PmCanteenPurchaseDetail detail = pmCanteenPurchaseDetailService.getById(rel.getDetailId());
+                    if (detail != null) {
+                        // 从采购明细表中获取字段值  还要有计划编号
+                        rel.setGoodsId(detail.getGoodsId());
+                        rel.setGoodsName(detail.getGoodsName());
+                        rel.setGoodsCode(detail.getGoodsCode());
+                        rel.setSpec(detail.getSpec());
+                        rel.setUnit(detail.getUnit());
+                        rel.setSupplierId(detail.getCustId());
+                        rel.setSupplierName(detail.getCustName());
+                        
+                        // 查询计划编号
+                        if (detail.getPlanId() != null) {
+                            PmCanteenPurchasePlan plan = pmCanteenPurchasePlanService.getById(detail.getPlanId());
+                            if (plan != null) {
+                                rel.setPlanNo(plan.getPlanNo());
+                            }
+                        }
+                    }
+                }
+                if (rel.getGoodsId() != null) {
+                    // 从商品表中查询商品信息
+                    CmCustProduct goodsDetail = cmCustProductService.getById(rel.getGoodsId());
+                    if (goodsDetail != null) {
+                        rel.setGoodsCode(goodsDetail.getGoodsCode());
+                        rel.setSpec(goodsDetail.getSpec());
+                        rel.setUnit(goodsDetail.getUnit());
+                        rel.setSupplierId(goodsDetail.getCustId());
+                        rel.setSupplierName(goodsDetail.getCustName());
+                        rel.setGoodsName(goodsDetail.getGoodsName());
+                    }
+                }
+            }
+        }
+
+
+        CommonPage<PmCanteenPlanOrderRel> page = CommonPage.restPage(pmCanteenPlanOrderRels);
         return CommonResult.success(page);
     }
 
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmCanteenPurchasePlanController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmCanteenPurchasePlanController.java
index 5c8dac3..17f7ce5 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmCanteenPurchasePlanController.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/controller/PmCanteenPurchasePlanController.java
@@ -585,10 +585,6 @@ public class PmCanteenPurchasePlanController {
 
 }
 
-//  描写 去吃饭之前，请求帮助  巴麻美答应帮忙，其他人也答应帮忙
-//  因为枫在昨晚也帮助过其他人
-//  鹤乃表示大家一起帮忙，很快就可以解决了。
-//  前往中央电波塔
 
 
 
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmCanteenPlanOrderRel.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmCanteenPlanOrderRel.java
index db0b4e3..16895c3 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmCanteenPlanOrderRel.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmCanteenPlanOrderRel.java
@@ -1,7 +1,10 @@
 package com.zbkj.modules.autogencode.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
@@ -102,4 +105,22 @@ public class PmCanteenPlanOrderRel implements Serializable {
     @ApiModelProperty(value = "租户ID")
     private String tenantId;
 
+    @TableField(exist = false)
+    private String goodsCode;
+
+    @TableField(exist = false)
+    private String spec;
+
+    @TableField(exist = false)
+    private String unit;
+
+    @TableField(exist = false)
+    private String supplierName;
+
+    @TableField(exist = false)
+    private Long supplierId;
+
+    @TableField(exist = false)
+    private String planNo;
+
 }
diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/impl/PmCanteenPlanOrderRelServiceImpl.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/impl/PmCanteenPlanOrderRelServiceImpl.java
index f3d680e..6ac2d25 100644
--- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/impl/PmCanteenPlanOrderRelServiceImpl.java
+++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/service/impl/PmCanteenPlanOrderRelServiceImpl.java
@@ -18,20 +18,18 @@ public class PmCanteenPlanOrderRelServiceImpl extends ServiceImpl<PmCanteenPlanO
 
     @Resource
     private PmCanteenPlanOrderRelDao dao;
-    @Resource
-    private PmCanteenPlanOrderRelService pmCanteenPlanOrderRelService;
     @Override
     public List<PmCanteenPlanOrderRel> getByOrderId(Long orderId) {
         LambdaQueryWrapper<PmCanteenPlanOrderRel> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(PmCanteenPlanOrderRel::getOrderId, orderId);
-        return pmCanteenPlanOrderRelService.list(queryWrapper);
+        return this.list(queryWrapper);
     }
 
     @Override
     public boolean deleteByOrderId(Long orderId) {
         LambdaQueryWrapper<PmCanteenPlanOrderRel> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(PmCanteenPlanOrderRel::getOrderId, orderId);
-        return pmCanteenPlanOrderRelService.remove(queryWrapper);
+        return this.remove(queryWrapper);
     }
 
     /**