From e9a6fa394883c547199666ddc2ab0b7c9b902622 Mon Sep 17 00:00:00 2001
From: zhc077 <565291854>
Date: Mon, 13 Feb 2023 10:06:39 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E5=90=8A=E6=8C=82=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=90=8A=E6=8C=82=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF-?=
 =?UTF-8?q?=E7=AE=A1=E9=9D=A2=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96=202.13?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ant-design-vue-jeecg/src/views/hanger/HangerManage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ant-design-vue-jeecg/src/views/hanger/HangerManage.vue b/ant-design-vue-jeecg/src/views/hanger/HangerManage.vue
index 27d3b560..8c3952d2 100644
--- a/ant-design-vue-jeecg/src/views/hanger/HangerManage.vue
+++ b/ant-design-vue-jeecg/src/views/hanger/HangerManage.vue
@@ -264,7 +264,7 @@ export default {
       console.log("handleSelectRowChange-event:", event)
       const {type, row, column, value, target, $table} = event
       console.log("stationIdList", JSON.stringify(this.stationIdList));
-      target.$refs.vxe.columns[6].options = this.stationIdList;
+      target.$refs.vxe.columns[7].options = this.stationIdList;
     },
 
     /** 当选项被改变时，联动其他组件 */

From e7bf12157ea05473531e8a0ec0adbb57922a2033 Mon Sep 17 00:00:00 2001
From: zhc077 <565291854>
Date: Mon, 13 Feb 2023 17:58:26 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E5=90=8A=E6=8C=82=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E8=AE=B0=E5=BD=95=E6=95=B0=E6=8D=AE=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=202.13?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/hanger/HangerManage.vue         |  6 +-
 .../controller/HangRecordController.java      | 13 +++
 .../controller/ZyHangPointController.java     |  8 --
 .../hanger/service/IHangRecordService.java    |  2 +-
 .../hanger/service/IZyHangPointService.java   |  2 -
 .../service/impl/HangRecordServiceImpl.java   | 79 +++++++++++++++++++
 .../service/impl/ZyHangPointServiceImpl.java  | 13 ---
 7 files changed, 96 insertions(+), 27 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/hanger/HangerManage.vue b/ant-design-vue-jeecg/src/views/hanger/HangerManage.vue
index 8c3952d2..1331b845 100644
--- a/ant-design-vue-jeecg/src/views/hanger/HangerManage.vue
+++ b/ant-design-vue-jeecg/src/views/hanger/HangerManage.vue
@@ -33,7 +33,7 @@
 import '@/assets/less/TableExpand.less'
 import {mixinDevice} from '@/utils/mixin'
 import {JeecgListMixin} from '@/mixins/JeecgListMixin'
-import {getAction, postAction} from "@api/manage";
+import {getAction, postAction, putAction} from "@api/manage";
 import {filterObj, pushIfNotExist, randomNumber, randomUUID} from "@/utils/util";
 import {JVXETypes} from '@/components/jeecg/JVxeTable'
 
@@ -130,7 +130,7 @@ export default {
       url: {
         list: "/org.jeecg.modules.hanger/zyHang/getPointById",
         getStationList: "/jeecg-boot/org.jeecg.modules.hanger/zyHang/getStationList",
-        syncHangRecord: "/org.jeecg.modules.productplan/zyPlanProcess/syncHangRecord",
+        syncHangRecord: "/org.jeecg.modules.hanger/hangRecord/syncHangRecord",
         addBatch: "/org.jeecg.modules.hanger/zyHangPoint/addBatch",
       },
       loadRouteType: false,
@@ -195,7 +195,7 @@ export default {
     //同步生产记录到吊挂运行记录表
     syncHangRecord() {
       this.loading = true;
-      getAction(this.url.syncHangRecord, {"code": this.code}).then((res) => {
+      putAction(this.url.syncHangRecord, {"hangCode": this.code}).then((res) => {
         if (res.success) {
           this.$message.success("操作成功");
         } else {
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/controller/HangRecordController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/controller/HangRecordController.java
index 6dff3325..3b7ddada 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/controller/HangRecordController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/controller/HangRecordController.java
@@ -11,6 +11,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.hanger.entity.HangRecord;
+import org.jeecg.modules.hanger.entity.ZyHangPoint;
 import org.jeecg.modules.hanger.service.IHangRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -56,6 +57,18 @@ public class HangRecordController extends JeecgController<HangRecord, IHangRecor
         return Result.OK(pageList);
     }
 
+    /**
+     * 根据吊挂编号-增量同步吊挂运行记录
+     * @param hangRecord
+     * @return
+     */
+    @ApiOperation(value = "吊挂工位表-同步生产记录表数据到吊挂运行记录表", notes = "吊挂工位表-同步生产记录表数据到吊挂运行记录表")
+    @PutMapping(value = "/syncHangRecord")
+    public Result<?> syncHangRecord(@RequestBody HangRecord hangRecord) {
+        hangRecordService.syncHangRecord(hangRecord);
+        return Result.OK();
+    }
+
     /**
      * 添加
      *
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/controller/ZyHangPointController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/controller/ZyHangPointController.java
index 71b9df59..ca6c66dd 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/controller/ZyHangPointController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/controller/ZyHangPointController.java
@@ -65,14 +65,6 @@ public class ZyHangPointController extends JeecgController<ZyHangPoint, IZyHangP
         return Result.OK(zyHangPointService.getLastPointCode());
     }
 
-    @ApiOperation(value = "吊挂工位表-同步生产记录表数据到吊挂运行记录表", notes = "吊挂工位表-同步生产记录表数据到吊挂运行记录表")
-    @GetMapping(value = "/syncHangRecord")
-    public Result<?> syncHangRecord(ZyHangPoint zyHangPoint) {
-        zyHangPointService.syncHangRecord(zyHangPoint);
-        return Result.OK();
-    }
-
-
     @ApiOperation(value = "吊挂工位表-工站、工位绑定批量添加", notes = "吊挂工位表-工站、工位绑定批量添加")
     @PostMapping(value = "/addBatch")
     public Result<?> addBatch(@RequestBody List<ZyHangPoint> pointList) {
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/IHangRecordService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/IHangRecordService.java
index 7599dca0..da40da0e 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/IHangRecordService.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/IHangRecordService.java
@@ -11,5 +11,5 @@ import org.jeecg.modules.hanger.entity.HangRecord;
  * @Version: V1.0
  */
 public interface IHangRecordService extends IService<HangRecord> {
-
+    void syncHangRecord(HangRecord hangRecord);
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/IZyHangPointService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/IZyHangPointService.java
index 6b591a85..e865e726 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/IZyHangPointService.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/IZyHangPointService.java
@@ -17,6 +17,4 @@ public interface IZyHangPointService extends IService<ZyHangPoint> {
     String getLastPointCode();
 
     void addBatch(List<ZyHangPoint> pointList);
-
-    void syncHangRecord(ZyHangPoint zyHangPoint);
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/HangRecordServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/HangRecordServiceImpl.java
index 9c222347..96ecd0e9 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/HangRecordServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/HangRecordServiceImpl.java
@@ -1,11 +1,30 @@
 package org.jeecg.modules.hanger.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import io.github.classgraph.utils.VersionFinder;
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.modules.demo.productrecord.entity.ProductRecord;
+import org.jeecg.modules.demo.productrecord.service.IProductRecordService;
 import org.jeecg.modules.hanger.entity.HangRecord;
+import org.jeecg.modules.hanger.entity.ZyHang;
+import org.jeecg.modules.hanger.entity.ZyHangPoint;
 import org.jeecg.modules.hanger.mapper.HangRecordMapper;
 import org.jeecg.modules.hanger.service.IHangRecordService;
+import org.jeecg.modules.hanger.service.IZyHangPointService;
+import org.jeecg.modules.hanger.service.IZyHangService;
+import org.jeecg.modules.team.service.IStationService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Optional;
 
 /**
  * @Description: 吊挂运行记录表
@@ -16,4 +35,64 @@ import org.springframework.stereotype.Service;
 @Service
 public class HangRecordServiceImpl extends ServiceImpl<HangRecordMapper, HangRecord> implements IHangRecordService {
 
+    @Autowired
+    private IStationService iStationService;
+
+    @Autowired
+    private IZyHangService iZyHangService;
+
+    @Autowired
+    private IZyHangPointService iZyHangPointService;
+
+    @Autowired
+    private IProductRecordService iProductRecordService;
+
+    @Override
+    @Transactional(readOnly = false, rollbackFor = Exception.class)
+    public void syncHangRecord(HangRecord hangRecord) {
+        ZyHang one = iZyHangService.getOne(new LambdaQueryWrapper<ZyHang>().eq(ZyHang::getCode, hangRecord.getHangCode()));
+        Optional.ofNullable(one).orElseThrow(() -> new JeecgBootException("吊挂不存在!"));
+
+        List<ZyHangPoint> pointList = iZyHangPointService.list(new LambdaQueryWrapper<ZyHangPoint>().eq(ZyHangPoint::getCode, hangRecord.getHangCode()));
+        //没有配置工站时，不同步运行记录
+        if (ObjectUtils.isEmpty(pointList)) return;
+
+        //查询每一工站是否已有同步过的工站运行记录数据，
+        // 有同步过则根据生产记录表创建时间为条件增量同步，
+        // 未同步过则全量同步
+        pointList.forEach(e -> {
+            List<HangRecord> saveList;
+            List<HangRecord> pointRecordList = this.list(new LambdaQueryWrapper<HangRecord>()
+                    .eq(HangRecord::getHangCode, hangRecord.getHangCode())
+                    .eq(HangRecord::getPoint, e.getPoint())
+                    .orderByDesc(HangRecord::getCreateTime)
+            );
+            if (!ObjectUtils.isEmpty(pointRecordList)) {//该工站已同步过，增量同步
+                Date createTime = pointRecordList.get(0).getCreateTime();
+                List<ProductRecord> productRecords = iProductRecordService.list(new LambdaQueryWrapper<ProductRecord>()
+                        .eq(ProductRecord::getStationId, e.getStationId())
+                        .gt(ProductRecord::getCreateTime, createTime)
+                );
+                saveList = this.convertHangRecord(one.getCode(), e.getPoint(), productRecords);
+            } else {//该工站未同步过
+                List<ProductRecord> productRecords = iProductRecordService.list(new LambdaQueryWrapper<ProductRecord>()
+                        .eq(ProductRecord::getStationId, e.getStationId())
+                );
+                saveList = this.convertHangRecord(one.getCode(), e.getPoint(), productRecords);
+            }
+            this.saveBatch(saveList);
+        });
+    }
+
+    private List<HangRecord> convertHangRecord(final String hangCode, final String point, List<ProductRecord> productRecords) {
+        List<HangRecord> saveList = new LinkedList<>();
+        Optional.ofNullable(productRecords).orElse(new LinkedList<>()).forEach(obj -> {
+            HangRecord hangRecord1 = new HangRecord();
+            BeanUtils.copyProperties(obj, hangRecord1);
+            hangRecord1.setHangCode(hangCode);
+            hangRecord1.setPoint(point);
+            saveList.add(hangRecord1);
+        });
+        return saveList;
+    }
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/ZyHangPointServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/ZyHangPointServiceImpl.java
index 10d3d79f..a6efbe98 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/ZyHangPointServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/ZyHangPointServiceImpl.java
@@ -4,12 +4,9 @@ package org.jeecg.modules.hanger.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;
-import org.jeecg.common.exception.JeecgBootException;
-import org.jeecg.modules.hanger.entity.ZyHang;
 import org.jeecg.modules.hanger.entity.ZyHangPoint;
 import org.jeecg.modules.hanger.mapper.ZyHangPointMapper;
 import org.jeecg.modules.hanger.service.IZyHangPointService;
-import org.jeecg.modules.hanger.service.IZyHangService;
 import org.jeecg.modules.team.entity.Station;
 import org.jeecg.modules.team.service.IStationService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,9 +29,6 @@ public class ZyHangPointServiceImpl extends ServiceImpl<ZyHangPointMapper, ZyHan
     @Autowired
     private IStationService iStationService;
 
-    @Autowired
-    private IZyHangService iZyHangService;
-
     @Override
     public String getLastPointCode() {
         List<ZyHangPoint> pointList = this.list(new LambdaQueryWrapper<ZyHangPoint>().orderByDesc(ZyHangPoint::getPoint));
@@ -63,11 +57,4 @@ public class ZyHangPointServiceImpl extends ServiceImpl<ZyHangPointMapper, ZyHan
         });
         this.saveOrUpdateBatch(pointList);
     }
-
-    @Override
-    public void syncHangRecord(ZyHangPoint zyHangPoint) {
-        ZyHang zyHang = iZyHangService.getOne(new LambdaQueryWrapper<ZyHang>().eq(ZyHang::getCode, zyHangPoint.getCode()));
-        Optional.ofNullable(zyHang).orElseThrow(() -> new JeecgBootException(zyHangPoint.getCode() + "不存在"));
-        //TODO
-    }
 }

From 66c5a60f4fff06deb21243be3c11aa9aee3b019e Mon Sep 17 00:00:00 2001
From: zhc077 <565291854>
Date: Mon, 13 Feb 2023 18:00:26 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E5=90=8A=E6=8C=82=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E8=AE=B0=E5=BD=95=E6=95=B0=E6=8D=AE=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=202.13?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/hanger/service/impl/HangRecordServiceImpl.java   | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/HangRecordServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/HangRecordServiceImpl.java
index 96ecd0e9..80678e25 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/HangRecordServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/HangRecordServiceImpl.java
@@ -3,7 +3,6 @@ package org.jeecg.modules.hanger.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import io.github.classgraph.utils.VersionFinder;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.modules.demo.productrecord.entity.ProductRecord;
 import org.jeecg.modules.demo.productrecord.service.IProductRecordService;
@@ -14,7 +13,6 @@ import org.jeecg.modules.hanger.mapper.HangRecordMapper;
 import org.jeecg.modules.hanger.service.IHangRecordService;
 import org.jeecg.modules.hanger.service.IZyHangPointService;
 import org.jeecg.modules.hanger.service.IZyHangService;
-import org.jeecg.modules.team.service.IStationService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -35,9 +33,6 @@ import java.util.Optional;
 @Service
 public class HangRecordServiceImpl extends ServiceImpl<HangRecordMapper, HangRecord> implements IHangRecordService {
 
-    @Autowired
-    private IStationService iStationService;
-
     @Autowired
     private IZyHangService iZyHangService;
 

From 48cd4dedd9a35a4e4eafd44f8fa2ea8dbb0b188b Mon Sep 17 00:00:00 2001
From: shenyuan <shenyuan2825@163.com>
Date: Tue, 14 Feb 2023 17:58:38 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=B8=8B=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shopping/components/Order/placeOrder.vue  | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/ant-design-vue-jeecg/src/views/shopping/components/Order/placeOrder.vue b/ant-design-vue-jeecg/src/views/shopping/components/Order/placeOrder.vue
index c7d1b5c0..8c96315c 100644
--- a/ant-design-vue-jeecg/src/views/shopping/components/Order/placeOrder.vue
+++ b/ant-design-vue-jeecg/src/views/shopping/components/Order/placeOrder.vue
@@ -148,6 +148,19 @@
             <span class="f_14 c_31">总计</span>
             <span class="f_20 c_31">￥35,500</span>
           </p>
+          <div class="btnDiv">
+            <div type="primary" class="dialogButton primary   f_14">立即购买</div>
+          </div>
+          <p  class="explain f_12 c_999">说明</p>
+          <p  class="f_12 c_999">在线支付订单提交之后15分钟内未付款，订单将被系统自动取消，请您尽快完成支付以确保商品能及时送达，避免取消订单带来不必要的麻烦。</p>
+        </div>
+        <div class="time">
+          <p  class="f_20 c_333">预计配送时间</p>
+          <p  class="f_12 c_333">我们将会在第一时间为您发货</p>
+          <p  class="f_12 c_333">所有现货商品在1-2个工作日发货，门店调货商品会视货品情况进行发货。</p>
+          <p  class="f_12 c_333">*定制商品除外</p>
+          <p  class="f_16 c_333">需要多长时间能够送达 ？</p>
+          <p  class="f_12 c_333">中国大陆：2-5个工作日（视货品情况而定）</p>
         </div>
       </div>
     </div>
@@ -201,6 +214,28 @@
   };
 </script>
 <style lang="less" scoped>
+  .btnDiv{
+    border-bottom: 1px solid #E7E7E7;
+    padding-bottom: 30px;
+    padding-top: 20px;
+    .dialogButton {
+      height: 44px;
+      text-align: center;
+      line-height: 44px;
+      transition: all 0.2s;
+    }
+    .primary {
+      background: #1b1b1b;
+      border: 2px solid #1b1b1b;
+      color: #e5dfd9;
+      &:hover {
+        // border-color: #1b1b1b;
+        // color: #1b1b1b;
+        // background-color: #fff;
+        opacity: 0.8;
+      }
+    }
+  }
   .placeOrder{
     padding-top: 54px;
     padding-bottom: 80px;
@@ -266,6 +301,7 @@
         .order{
           background: #FFFFFF;
           padding: 24px 43px;
+          margin-bottom: 24px;
           .d-flex{
             justify-content: space-between;
             .left{
@@ -288,6 +324,27 @@
               width: 60px;
               height: 77px;
             }
+          }
+            .explain{
+              padding-top: 25px;
+              padding-bottom: 10px;
+            }
+        }
+        .time{
+          background: #fff;
+          padding: 24px 43px;
+          p{
+            margin-bottom: 5px;
+          }
+          .f_20{
+            font-weight: 500;
+            margin-bottom: 30px;
+          }
+          .f_16{
+            font-weight: 500;
+            margin-top: 45px;
+            margin-bottom: 25px;
+
           }
         }
       }

From 4876dc4b813ee883e4fcc271f75c65a2d8e12fc4 Mon Sep 17 00:00:00 2001
From: zhc077 <565291854>
Date: Tue, 14 Feb 2023 18:00:30 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E5=90=8A=E6=8C=82=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=90=8A=E6=8C=82=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF-?=
 =?UTF-8?q?=E7=AE=A1=E9=9D=A2=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96=202.13?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/hanger/HangRecordList.vue       | 10 +++++
 .../src/views/hanger/HangerManage.vue         | 37 ++++++++++---------
 .../views/productplan/ProductplanManage.vue   |  1 +
 .../modules/hanger/entity/HangRecord.java     |  4 +-
 .../service/impl/HangRecordServiceImpl.java   |  1 +
 5 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/hanger/HangRecordList.vue b/ant-design-vue-jeecg/src/views/hanger/HangRecordList.vue
index 41d12dc2..8976d2d3 100644
--- a/ant-design-vue-jeecg/src/views/hanger/HangRecordList.vue
+++ b/ant-design-vue-jeecg/src/views/hanger/HangRecordList.vue
@@ -106,6 +106,11 @@ export default {
             return parseInt(index) + 1;
           }
         },
+        {
+          title: '工单编号',
+          align: "center",
+          dataIndex: 'orderCode'
+        },
         {
           title: '吊挂编号',
           align: "center",
@@ -131,6 +136,11 @@ export default {
           align: "center",
           dataIndex: 'duration'
         },
+        {
+          title: '创建时间',
+          align: "center",
+          dataIndex: 'createTime'
+        },
         {
           title: '状态',
           align: "center",
diff --git a/ant-design-vue-jeecg/src/views/hanger/HangerManage.vue b/ant-design-vue-jeecg/src/views/hanger/HangerManage.vue
index 1331b845..7a8cb1d3 100644
--- a/ant-design-vue-jeecg/src/views/hanger/HangerManage.vue
+++ b/ant-design-vue-jeecg/src/views/hanger/HangerManage.vue
@@ -6,6 +6,7 @@
     <div>
       <j-vxe-table
         ref="xTable"
+        bordered
         toolbar
         :toolbarConfig="toolbarConfig"
         row-number
@@ -53,12 +54,12 @@ export default {
         {
           title: '车间',
           key: 'workshopName',
-          width: '220px',
+          // width: '220px',
         },
         {
           title: '吊挂编号',
           key: 'code',
-          width: '220px',
+          // width: '220px',
         },
         {
           title: '工站数量',
@@ -69,7 +70,7 @@ export default {
           title: '工站编号',
           key: 'point',
           type: JVXETypes.input,
-          width: '220px',
+          // width: '220px',
           /*validateRules: [
             {
               required: true, // 必填
@@ -144,23 +145,25 @@ export default {
   },
   created() {
     this.loadParameter();
-    // this.getStationList();
   },
-  methods: {
 
-    async getStationList() {
-      const {data: res} = await this.$axios.get(this.url.getStationList, {params: {id: this.id}})
-      if (res.success) {
-        // this.dataSource = res.result.records || res.result;
-        this.stationIdList = JSON.stringify(res.result);
-        console.log("the getStationList=" + this.stationIdList)
-        console.log("this.columns[6].options------------:" + this.columns[6].options);
-        this.columns[6].options = this.stationIdList;
-      } else {
-        this.$message.warning(res.message)
-      }
-    },
+/*  updated() {
+    console.log("beforeUpdate-------",JSON.stringify(this.stationIdList));
+    console.log("this.$refs.vxe.columns[5].options-------",this.$refs.xTable.columns);
+    // this.$data.columns[5].options = this.stationIdList;
+    if (this.$refs.xTable.columns.concat('stationName2')) {
+    // this.$refs.xTable.columns[5].options = this.stationIdList
+      console.log("concat")
+      this.$refs.xTable.columns[5].options= this.stationIdList;
+      this.$refs.xTable.columns[4].options= this.stationIdList;
+    }
+    // this.$forceUpdate();
+    // this.$refs.xTable.columns[6].options = this.stationIdList
+    // this.$refs.xTable.columns[7].options = this.stationIdList
+  },*/
 
+
+  methods: {
     // 【整体保存】点击保存按钮时触发的事件
     handleTableSave({$table, target}) {
       console.log("生产计划工序保存开始-----------------")
diff --git a/ant-design-vue-jeecg/src/views/productplan/ProductplanManage.vue b/ant-design-vue-jeecg/src/views/productplan/ProductplanManage.vue
index e92dcd14..77870d39 100644
--- a/ant-design-vue-jeecg/src/views/productplan/ProductplanManage.vue
+++ b/ant-design-vue-jeecg/src/views/productplan/ProductplanManage.vue
@@ -33,6 +33,7 @@
       <j-vxe-table
         ref="xTable"
         toolbar
+        bordered
         :toolbarConfig="toolbarConfig"
         row-number
         row-selection
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/entity/HangRecord.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/entity/HangRecord.java
index f4eea4fc..1b0e4d66 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/entity/HangRecord.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/entity/HangRecord.java
@@ -100,12 +100,12 @@ public class HangRecord implements Serializable {
      */
     @Excel(name = "时长", width = 15)
     @ApiModelProperty(value = "时长")
-    private Integer duration;
+    private String duration;
     /**
      * 状态
      */
     @Excel(name = "状态", width = 15)
     @ApiModelProperty(value = "状态")
     @Dict(dicCode = "hang_record_status")
-    private Integer status;
+    private String status;
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/HangRecordServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/HangRecordServiceImpl.java
index 80678e25..c0d692df 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/HangRecordServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/HangRecordServiceImpl.java
@@ -86,6 +86,7 @@ public class HangRecordServiceImpl extends ServiceImpl<HangRecordMapper, HangRec
             BeanUtils.copyProperties(obj, hangRecord1);
             hangRecord1.setHangCode(hangCode);
             hangRecord1.setPoint(point);
+            hangRecord1.setId(null);
             saveList.add(hangRecord1);
         });
         return saveList;

From e9dfa60227db9a7b3716a6509fd092b662f90e8f Mon Sep 17 00:00:00 2001
From: mors <3067699729@qq.com>
Date: Wed, 15 Feb 2023 16:41:22 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pdaccessories/ProductAccessoriesList.vue  |   4 +-
 .../product/pdfabric/ProductFabricList.vue    |   4 +-
 .../productModule/ProductModuleList.vue       | 240 ++++++++----------
 .../modules/ProductModuleDetail.vue           | 112 ++++++++
 .../productProcess/ZyProductProcessList.vue   |   2 +-
 .../src/views/zyWorkProduct/ZyProductList.vue |   2 +-
 .../productModule/entity/ProductModule.java   |  38 +--
 7 files changed, 250 insertions(+), 152 deletions(-)
 create mode 100644 ant-design-vue-jeecg/src/views/product/productModule/modules/ProductModuleDetail.vue

diff --git a/ant-design-vue-jeecg/src/views/product/pdaccessories/ProductAccessoriesList.vue b/ant-design-vue-jeecg/src/views/product/pdaccessories/ProductAccessoriesList.vue
index 17a12e2c..9f8ba355 100644
--- a/ant-design-vue-jeecg/src/views/product/pdaccessories/ProductAccessoriesList.vue
+++ b/ant-design-vue-jeecg/src/views/product/pdaccessories/ProductAccessoriesList.vue
@@ -28,7 +28,7 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="fanhui" type="primary" icon="plus">返回</a-button>
+      <a-button @click="fanhui" type="primary" icon="rollback">返回</a-button>
 <!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
 <!--      <a-button type="primary" icon="download" @click="handleExportXls('产品辅料表')">导出</a-button>-->
 <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
@@ -194,7 +194,7 @@
           deleteBatch: "/pdaccessories/productAccessories/deleteBatch",
           exportXlsUrl: "/pdaccessories/productAccessories/exportXls",
           importExcelUrl: "pdaccessories/productAccessories/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
diff --git a/ant-design-vue-jeecg/src/views/product/pdfabric/ProductFabricList.vue b/ant-design-vue-jeecg/src/views/product/pdfabric/ProductFabricList.vue
index ca848817..9a9faa28 100644
--- a/ant-design-vue-jeecg/src/views/product/pdfabric/ProductFabricList.vue
+++ b/ant-design-vue-jeecg/src/views/product/pdfabric/ProductFabricList.vue
@@ -42,7 +42,7 @@
 <!--        </a-menu>-->
 <!--        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
 <!--      </a-dropdown>-->
-      <a-button @click="fanhui" type="primary" icon="plus">返回</a-button>
+      <a-button @click="fanhui" type="primary" icon="rollback">返回</a-button>
     </div>
 
     <!-- table区域-begin -->
@@ -189,7 +189,7 @@
           deleteBatch: "/pdfabric/productFabric/deleteBatch",
           exportXlsUrl: "/pdfabric/productFabric/exportXls",
           importExcelUrl: "pdfabric/productFabric/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
diff --git a/ant-design-vue-jeecg/src/views/product/productModule/ProductModuleList.vue b/ant-design-vue-jeecg/src/views/product/productModule/ProductModuleList.vue
index a8f1e04f..dfd1c047 100644
--- a/ant-design-vue-jeecg/src/views/product/productModule/ProductModuleList.vue
+++ b/ant-design-vue-jeecg/src/views/product/productModule/ProductModuleList.vue
@@ -42,11 +42,6 @@
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
       <a-table
         ref="table"
         size="middle"
@@ -61,31 +56,12 @@
         class="j-table-force-nowrap"
         @change="handleTableChange">
 
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
-
         <span slot="action" slot-scope="text, record">
-<!--          <a @click="handleEdit(record)">编辑</a>-->
-          <a-divider type="vertical" />
-          <a @click="handleDetail(record)">详情</a>
-          <a-divider type="vertical" />
+          <!--<a @click="handleEdit(record)">编辑</a>-->
+
+          <!--<a @click="handleDetail(record)">详情</a>-->
+          <a @click="openDetail(record.id)">详情</a>
+          <a-divider type="vertical"/>
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
@@ -94,123 +70,125 @@
       </a-table>
     </div>
 
+    <product-module-detail ref="ProductModuleDetail"/>
     <product-module-modal ref="modalForm" @ok="modalFormOk"></product-module-modal>
   </a-card>
 </template>
 
 <script>
 
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import ProductModuleModal from './modules/ProductModuleModal'
+import '@/assets/less/TableExpand.less'
+import {mixinDevice} from '@/utils/mixin'
+import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+import ProductModuleModal from './modules/ProductModuleModal'
+import ProductModuleDetail from '@/views/product/productModule/modules/ProductModuleDetail'
 
-  export default {
-    name: 'ProductModuleList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      ProductModuleModal
-    },
-    data () {
-      return {
-        description: '工单管理下面的产品模块管理页面',
-        biaoTi:'',
-        loadRouteType: false,
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'产品id',
-            align:"center",
-            dataIndex: 'productId'
-          },
-          {
-            // title:'款式模块id',
-            title:'模块编号',
-            align:"center",
-            dataIndex: 'styleModuleId'
-          },
-          {
-            title:'模块名称',
-            align:"center",
-            dataIndex: 'moduleId'
-          },
-          {
-            title:'部位',
-            align:"center",
-            dataIndex: 'place'
-          },
-          {
-            title: '创建时间',
-            align: "center",
-            dataIndex: 'createTime'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
+export default {
+  name: 'ProductModuleList',
+  mixins: [JeecgListMixin, mixinDevice],
+  components: {
+    ProductModuleDetail,
+    ProductModuleModal
+  },
+  data() {
+    return {
+      description: '工单管理下面的产品模块管理页面',
+      biaoTi: '',
+      loadRouteType: false,
+      // 表头
+      columns: [
+        {
+          title: '#',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: "center",
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1;
           }
-        ],
-        url: {
-          list: "/productModule/productModule/list",
-          delete: "/productModule/productModule/delete",
-          deleteBatch: "/productModule/productModule/deleteBatch",
-          exportXlsUrl: "/productModule/productModule/exportXls",
-          importExcelUrl: "productModule/productModule/importExcel",
-
         },
-        dictOptions:{},
-        superFieldList:[],
-      }
-    },
-    created() {
+        {
+          title: '产品编号',
+          align: "center",
+          dataIndex: 'productId'
+        },
+        {
+          // title:'款式模块id',
+          title: '模块编号',
+          align: "center",
+          dataIndex: 'styleModuleId'
+        },
+        {
+          title: '模块名称',
+          align: "center",
+          dataIndex: 'moduleId'
+        },
+        {
+          title: '创建时间',
+          align: "center",
+          dataIndex: 'createTime'
+        },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          align: "center",
+          fixed: "right",
+          width: 147,
+          scopedSlots: {customRender: 'action'}
+        }
+      ],
+      url: {
+        list: "/productModule/productModule/list",
+        delete: "/productModule/productModule/delete",
+        deleteBatch: "/productModule/productModule/deleteBatch",
+        exportXlsUrl: "/productModule/productModule/exportXls",
+        importExcelUrl: "productModule/productModule/importExcel",
+
+      },
+      dictOptions: {},
+      superFieldList: [],
+    }
+  },
+  created() {
     // this.getSuperFieldList();
-      this.loadParameter();
+    this.loadParameter();
+  },
+  computed: {
+    importExcelUrl: function () {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
     },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
+  },
+  methods: {
+    openDetail(id) {
+      this.$refs.ProductModuleDetail.showModal(id)
+      // this.$children[0].showModal(id)
     },
-    methods: {
-      fanHui(){
-        this.$router.push({
-          /*返回产品*/
-          path: '/WorkProduct',/*在引号中填写返回vue*/
-        });
-      },
-      loadParameter() {
-        if (this.loadRouteType === false) {
-          this.biaoTi=this.$route.query.productName+" 产品模块管理";
-          console.log("***********",this.$route.query.productName)
-          this.loadRouteType = true;
-        }
-      },
-      initDictConfig(){
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'productId',text:'产品id',dictCode:''})
-        fieldList.push({type:'string',value:'styleModuleId',text:'款式模块id',dictCode:''})
-        fieldList.push({type:'string',value:'moduleId',text:'模块id',dictCode:''})
-        fieldList.push({type:'string',value:'place',text:'部位',dictCode:''})
-        this.superFieldList = fieldList
+    fanHui() {
+      this.$router.push({
+        /*返回产品*/
+        path: '/WorkProduct',/*在引号中填写返回vue*/
+      });
+    },
+    loadParameter() {
+      if (this.loadRouteType === false) {
+        this.biaoTi = this.$route.query.productName + " 产品模块管理";
+        //console.log("***********", this.$route.query.productName)
+        this.loadRouteType = true;
       }
+    },
+    initDictConfig() {
+    },
+    getSuperFieldList() {
+      let fieldList = [];
+      fieldList.push({type: 'string', value: 'productId', text: '产品id', dictCode: ''})
+      fieldList.push({type: 'string', value: 'styleModuleId', text: '款式模块id', dictCode: ''})
+      fieldList.push({type: 'string', value: 'moduleId', text: '模块id', dictCode: ''})
+      fieldList.push({type: 'string', value: 'place', text: '部位', dictCode: ''})
+      this.superFieldList = fieldList
     }
   }
+}
 </script>
 <style scoped>
-  @import '~@assets/less/common.less';
+@import '~@assets/less/common.less';
 </style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/product/productModule/modules/ProductModuleDetail.vue b/ant-design-vue-jeecg/src/views/product/productModule/modules/ProductModuleDetail.vue
new file mode 100644
index 00000000..bc449d7c
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/product/productModule/modules/ProductModuleDetail.vue
@@ -0,0 +1,112 @@
+<template>
+
+  <div>
+    <a-modal
+      title="模块管理-详情"
+      :visible="visible"
+      :confirm-loading="confirmLoading"
+      :width='1200'
+      @ok="handleOk"
+      @cancel="handleCancel"
+      style="display:flex;"
+    >
+      <div style="width: 96%;margin:0 auto 40px;padding-bottom: 30px">
+        <h1 style="text-align: center;margin-bottom: 0px;padding-bottom: 20px">黄淮学院服装智能制造管理平台 - <span>模块管理</span></h1>
+        <div>
+          <el-descriptions class="margin-top" :column="4" border style="margin-top: 50px">
+            <el-descriptions-item>
+              <template slot="label"><i class="el-icon-receiving"></i>产品名称</template>
+              {{model.productId}}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label"><i class="el-icon-coin"></i>模块编号</template>
+              {{model.styleModuleId}}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label"><i class="el-icon-postcard"></i>模块名称</template>
+              {{model.moduleId}}
+            </el-descriptions-item>
+<!--            <el-descriptions-item>-->
+<!--              <template slot="label"><i class="el-icon-copy-document"></i>颜色</template>-->
+<!--              {{model.color}}-->
+<!--            </el-descriptions-item>-->
+            <el-descriptions-item>
+              <template slot="label"><i class="el-icon-copy-document"></i>创建时间</template>
+              {{model.createTime}}
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
+    </a-modal>
+  </div>
+
+</template>
+
+<script>
+
+
+export default {
+  name: "ProductModuleDetail.vue",
+  components: {
+  },
+  props: {
+    //表单禁用
+    disabled: {
+      type: Boolean,
+      default: false,
+      required: false
+    }
+  },
+  data() {
+    return {
+      model: {},
+      labelCol: {xs: {span: 24}, sm: {span: 5}},
+      wrapperCol: {xs: {span: 24}, sm: {span: 16}},
+      confirmLoading: false,
+
+      url: {
+        add: "/fabric/zyFabric/add",
+        edit: "/fabric/zyFabric/edit",
+        queryById: "/fabric/zyFabric/queryById"
+      },
+      visible: false
+    }
+  },
+  computed: {
+    formDisabled() {
+      return this.disabled
+    },
+  },
+  created() {
+    //备份model原始值
+    this.modelDefault = JSON.parse(JSON.stringify(this.model));
+  },
+  methods: {
+    showModal(id) {
+      this.visible = true;
+      this.$http.get('/productModule/productModule/queryById?id=' + id).then(
+        res => {
+          this.model = res.result
+          console.log(this.model)
+        }
+      )
+    },
+    handleOk() {
+      this.ModalText = 'The modal will be closed after two seconds';
+      this.confirmLoading = true;
+      setTimeout(() => {
+        this.visible = false;
+        this.confirmLoading = false;
+      }, 1);
+    },
+    handleCancel() {
+      this.visible = false;
+    },
+
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/product/productProcess/ZyProductProcessList.vue b/ant-design-vue-jeecg/src/views/product/productProcess/ZyProductProcessList.vue
index 903dff23..276ac22c 100644
--- a/ant-design-vue-jeecg/src/views/product/productProcess/ZyProductProcessList.vue
+++ b/ant-design-vue-jeecg/src/views/product/productProcess/ZyProductProcessList.vue
@@ -28,7 +28,7 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="fanhui" type="primary" icon="plus">返回</a-button>
+      <a-button @click="fanhui" type="primary" icon="rollback">返回</a-button>
 <!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
 <!--      <a-button type="primary" icon="download" @click="handleExportXls('产品工序')">导出</a-button>-->
 <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
diff --git a/ant-design-vue-jeecg/src/views/zyWorkProduct/ZyProductList.vue b/ant-design-vue-jeecg/src/views/zyWorkProduct/ZyProductList.vue
index 788fc37b..40635641 100644
--- a/ant-design-vue-jeecg/src/views/zyWorkProduct/ZyProductList.vue
+++ b/ant-design-vue-jeecg/src/views/zyWorkProduct/ZyProductList.vue
@@ -356,7 +356,7 @@
       },
 
       //操作：工序、模块、面料、辅料、设备、工具，提供入口，具体功能由相关功能负责人完成
-      //跳转-模块
+      //跳转-工序
       jumpProcesses(record)
       {
         this.$router.push({
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/productModule/entity/ProductModule.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/productModule/entity/ProductModule.java
index 534f93ce..e9c9b529 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/productModule/entity/ProductModule.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/productModule/entity/ProductModule.java
@@ -2,6 +2,7 @@ package org.jeecg.modules.product.productModule.entity;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -43,31 +44,38 @@ public class ProductModule implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建日期")
     private Date createTime;
-//	/**更新人*/
-//    @ApiModelProperty(value = "更新人")
-//    private String updateBy;
-//	/**更新日期*/
-//	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-//    @ApiModelProperty(value = "更新日期")
-//    private Date updateTime;
-//	/**所属部门*/
-//    @ApiModelProperty(value = "所属部门")
-//    private String sysOrgCode;
-	/**产品id*/
+
+	/**
+     * 产品id 应该是产品编号
+     * 关联产品表 zy_product ZyProductList.vue ZyProduct.java
+     */
 	@Excel(name = "产品id", width = 15)
     @ApiModelProperty(value = "产品id")
     private String productId;
-	/**款式模块id*/
+
+	@TableField(exist = false)
+    private String productName;
+	/**
+     * 款式模块id 应该是模块编号
+     * 关联款式模块表 zy_style_module
+     * 款式表联动，筛选款式模块表数据
+     */
 	@Excel(name = "款式模块id", width = 15)
     @ApiModelProperty(value = "款式模块id")
     private String styleModuleId;
-	/**模块id*/
+	/**
+     * 模块id 应该是模块名称
+     * 关联制衣模块表 zy_cloths_modular
+     * 从款式模块表同步读取
+     */
 	@Excel(name = "模块名称", width = 15)
     @Dict(dictTable = "zy_cloths_modular ", dicText = "modular_name", dicCode = "id")
     @ApiModelProperty(value = "模块名称")
     private String moduleId;
-	/**部位*/
+	/**
+     * 暂时弃用
+     * 部位
+     */
 	@Excel(name = "部位", width = 15)
     @ApiModelProperty(value = "部位")
     private String place;

From 816a435dd3a2d094307fbe622d37d6e97c9ce6e0 Mon Sep 17 00:00:00 2001
From: shenyuan <shenyuan2825@163.com>
Date: Thu, 16 Feb 2023 11:14:24 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/shopping/pages/pay.vue          | 201 +++++++++++++++++-
 1 file changed, 196 insertions(+), 5 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/pay.vue b/ant-design-vue-jeecg/src/views/shopping/pages/pay.vue
index 9ec4fac7..4f1ea933 100644
--- a/ant-design-vue-jeecg/src/views/shopping/pages/pay.vue
+++ b/ant-design-vue-jeecg/src/views/shopping/pages/pay.vue
@@ -5,23 +5,120 @@
       <Header></Header>
       <h1 class="c_fff">感谢您的订购</h1>
     </div>
+    <a-modal v-model="visible"  class="toPay">
+      <template slot="title">
+        <div class="c_1B f_20" style="text-align: center;padding: 5px;font-weight: 500">支付宝支付</div>
+      </template>
+      <div class="d-flex"
+           style="
+            width: 450px;
+            padding: 30px 10px;
+            margin: 0 auto;">
+        <div class="l"
+             style="
+                width: 120px;
+                height: 120px;
+                background-color: grey;
+                margin-right: 20px;">
+
+        </div>
+        <div class="r" style="width:290px">
+          <p class="f_16 c_4B">总计: ￥9,900</p>
+          <p class="f_14 c_4B">请使用支付宝扫描左图二维码进行支付</p>
+          <p class="f_14 c_4B">请您在15分钟内付款以免订单被取消，如有疑问，请联系客服。</p>
+          <p class="f_14 c_4B">订单发货后您将收到订单发货通知短信</p>
+        </div>
+      </div>
+      <template slot="footer">
+        <div class="d-flex" style="justify-content: center;align-items:center">
+          <a-button style="margin-right: 30px;border:none;font-size: 12px" @click="handleOk">手机不在身边？ 登录账号付款</a-button>
+          <a-button style="font-size: 12px"   size="small" @click="handleCancel">
+            返回
+          </a-button>
+        </div>
+
+      </template>
+    </a-modal>
     <div class="jz">
+      <a-button style="border: none" @click="handleBack">
+        <a-icon type="left" />返回
+      </a-button>
       <div class="success">
         <p class="c_1B f_24">您的订单已提交成功</p>
         <p class="c_999 f_14">请继续支付，15分钟内未付款，订单将自动取消</p>
         <p class="c_999 f_14">如有疑问，请联系客服</p>
-        <p class="c_1B f_16"><span>1</span><span>4</span><span>:</span><span>5</span><span>2</span></p>
+        <p class="c_1B f_16">
+<!--          letter-spacing-->
+          <span>1</span>
+          <span>4</span>
+          <span>:</span>
+          <span>5</span>
+          <span>2</span>
+        </p>
         <div class="d-flex btnDiv">
           <div class="dialogButton default c_1B f_12">修改支付方式</div>
-          <div type="primary" class="dialogButton primary   f_12">立即支付</div></div>
+          <div type="primary" class="dialogButton primary   f_12" @click="showModal">立即支付</div></div>
       </div>
       <p class="orderNum f_16"><span class="f_16">订单编号 # </span>GU202301052604844</p>
       <p class="date f_16 d-flex">
         <span class="f_16 c_31">下单日期：  <span>2023/01/05</span></span>
         <span  class="f_12 c_888">订单状态： 待付款</span>
-        <span class="f_12 c_31">数量: 1</span>
-        <span  class="f_12 c_31">总计： ￥9,900</span>
+        <span class="r d-flex">
+          <span class="f_12 c_31">数量: 1</span>
+          <span  class="f_12 c_31">总计： ￥9,900</span>
+        </span>
       </p>
+      <div class="table d-flex">
+        <div class="tableImg"></div>
+        <div class="tableTitle">
+          <div class="title c_31 f_16">中国新年系列针织慢跑裤</div>
+          <div class="c_999 f_12">款式： 象牙白色和多色</div>
+          <div class="c_999 f_12">主辅料： 主料1，辅料1，叮叮叮，辅料n主辅料： 主料1，辅料1，叮叮叮，辅料n主辅料： 主料1，辅料1，叮叮叮，辅料n</div>
+          <div class="c_999 f_12">尺码： S</div>
+        </div>
+        <div class="fahuo c_31 f_12">预计发货后1-4个工作日送达</div>
+        <div class="r d-flex">
+          <div class="tableNum c_31 f_12">数量 : 1</div>
+          <div class="tablePrice c_31 f_12">￥9,900</div>
+        </div>
+
+      </div>
+      <div class="total d-flex">
+        <div class="d-flex">
+          <span>商品总计</span>
+          <span>￥9,900</span>
+        </div>
+        <div class="d-flex">
+          <span>运费</span>
+          <span>免费</span>
+        </div>
+        <div class="d-flex">
+          <span>总计</span>
+          <span>￥9,900</span>
+        </div>
+      </div>
+      <div class="addr d-flex">
+        <div class="f_16 c_31 title">配送地址</div>
+        <div class="addrDiv">
+          <p  class="f_14 c_31">是的发财树是</p>
+          <p class="f_12 c_4B">天津天津市和平区水擦拭订餐撒上天津天津市和平区水擦拭订餐撒上天津天津市和平区水擦拭订餐撒上天津天津市和平区水擦拭订餐撒上天津天津市和平区水擦拭订餐撒上天津天津市和平区水擦拭订餐撒上</p>
+          <p class="f_12 c_4B">17766667777</p>
+        </div>
+        <div class="express">
+          <p class="f_14 c_31">普通快递</p>
+          <p class="f_12 c_4B">免费</p>
+          <p class="f_12 c_4B">预计发货后1-4个工作日送达</p>
+        </div>
+      </div>
+      <div class="payDiv">
+        <span class="title f_16 c_31">支付方式</span>
+        <span class="payWay f_12 c_1B" v-if="payWay ==0">
+          <a-icon type="alipay" />支付宝</span>
+        <span class="payWay f_12 c_1B" v-if="payWay ==1">
+          <a-icon type="wechat" />微信</span>
+        <span class=" f_12 c_31" v-if="!invoice">不需要发票</span>
+        <span class=" f_12 c_31" v-if="invoice">需要发票</span>
+      </div>
     </div>
     <Footer></Footer>
   </div>
@@ -34,10 +131,24 @@
     components: { Header,Footer },
     data() {
       return {
+        visible: false,
+        payWay:'0',//支付方式
+        invoice:true,//是否需要发票
       };
     },
     methods: {
-
+      handleBack(){
+        this.$router.go(-1)
+      },
+      showModal() {
+        this.visible = true;
+      },
+      handleOk(e) {
+        console.log('--')
+      },
+      handleCancel(e) {
+        this.visible = false;
+      },
     },
   };
 </script>
@@ -54,6 +165,9 @@
   .c_31{
     color: #313131;
   }
+  .c_4B{
+    color: #4B4B4B;
+  }
   .btnDiv{
     justify-content: space-around;
     .dialogButton {
@@ -83,6 +197,7 @@
       }
     }
   }
+
 .pay{
   .bg{
     background-image: url("../assets/bg06.png");
@@ -94,6 +209,8 @@
     }
   }
   .jz{
+    padding-top: 20px;
+    padding-bottom: 100px;
     .success{
       width: 500px;
       margin: 60px auto;
@@ -124,11 +241,85 @@
     }
     .date{
       justify-content: space-between;
+      margin-bottom: 20px;
       .f_16{
         font-weight: 600;
       }
+      .r{
+        width:300px;
+        justify-content: space-between;
+      }
 
     }
+    .table{
+      justify-content: space-between;
+      padding: 30px 0 30px 20px;
+      border-bottom: 2px solid #F2F2F2;
+      .tableImg{
+        width: 80px;
+        height: 80px;
+        background-color: grey;
+      }
+      .tableTitle{
+        max-width: 500px;
+        .title{
+          font-weight: 600;
+          margin-bottom: 8px;
+        }
+        .c_999{
+          margin-bottom: 2px;
+        }
+      }
+      .r{
+        width:300px;
+        justify-content: space-between;
+      }
+    }
+    .total{
+      flex-direction: column;
+      align-items: flex-end;
+      padding-top: 48px;
+      padding-bottom: 27px;
+      border-bottom: 2px solid #F2F2F2;
+      .d-flex{
+        width: 300px;
+        justify-content: space-between;
+        margin-bottom: 12px;
+      }
+    }
+    .addr{
+      padding: 32px 10px;
+      font-weight: 600;
+      border-bottom: 2px solid #F2F2F2;
+      .title{
+      }
+      .addrDiv{
+        margin: 0 80px;
+        max-width: 500px;
+      }
+    }
+    .payDiv{
+      padding: 32px 10px;
+      .title{
+        font-weight: 600;
+      }
+      .payWay{
+        margin: 0 80px;
+        i{
+          border-radius: 2px;
+          padding:1px;
+          margin-right: 5px;
+        }
+        .anticon-alipay{
+          background:#08AAFF;
+          color:#fff;
+        }
+        .anticon-wechat{
+          background:#00B40C;
+          color:#fff;
+        }
+      }
+    }
   }
 }
 </style>