From 2958725a39e15f1752bb94d63dd68c5bdfb6f5f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Wed, 15 Feb 2023 10:53:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchase/PurApplyController.java          |  1 +
 .../purchase/PurPlanController.java           | 98 +------------------
 .../api/res/purchase/PurPlanResponse.java     |  5 +-
 .../mybatis/mapper/purchase/PurPlanDao.xml    |  4 +-
 4 files changed, 9 insertions(+), 99 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java
index 5a66ffae9..4a2a839ed 100644
--- a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java
+++ b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java
@@ -166,6 +166,7 @@ public class PurApplyController {
             purPlanEntity.setBillDate(new Date());
             purPlanEntity.setInvCode(purApplyEntity.getInvCode());
             purPlanEntity.setDeptCode(purApplyEntity.getDeptCode());
+            purApplyEntity.setCreateUser(customerService.getUserId()+"");
             purPlanEntity.setUpdateUser(purApplyEntity.getUpdateUser());
             purPlanEntity.setStatus(ConstantStatus.APPLY_DRAFT);
             purPlanEntity.setBillType("purPlan");
diff --git a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java
index c9246f3e3..dd429b0fa 100644
--- a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java
+++ b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java
@@ -80,16 +80,7 @@ public class PurPlanController {
     @Resource
     IoOrderDetailBizService ioOrderDetailBizService;
 
-//    @Resource
-//    BasicCorpService basicCorpService;
-//    @Resource
-//    UdiRelevanceService udiRelevanceService;
-//    @Resource
-//    StockOrderDetailService stockOrderDetailService;
-//
-//    @Resource
-//    StockOrderService stockOrderService;
-//
+
     /**
      * 新增采购计划
      */
@@ -234,30 +225,8 @@ public class PurPlanController {
         }
         return ResultVOUtils.success("更新成功！");
     }
-//
-//
-//    /**
-//     * 新增采购计划
-//     */
-//    @RepeatSubmit()
-//    @PostMapping("/purchase/plan")
-//    public BaseResponse add(@RequestBody PurPlanEntity purApplyRequest) {
-//
-//        purPlanService.insert(purApplyRequest);
-//        return ResultVOUtils.success("新增成功！");
-//    }
-//
-//    /**
-//     * 修改采购计划
-//     */
-//    @RepeatSubmit()
-//    @PutMapping("/purchase/plan")
-//    public BaseResponse edit(@RequestBody PurPlanEntity purApplyRequest) {
-//        purPlanService.update(purApplyRequest);
-//        return ResultVOUtils.success("删除成功");
-//    }
-//
-//
+
+
     /**
      * 查询采购计划列表
      */
@@ -273,64 +242,6 @@ public class PurPlanController {
         return ResultVOUtils.success(pageSimpleResponse);
 
     }
-//
-//
-//    /**
-//     * 删除采购计划
-//     *
-//     * @param ids 主键串
-//     */
-//    @DeleteMapping("/purchase/plan/{ids}")
-//    public BaseResponse remove(@NotEmpty(message = "主键不能为空")
-//                               @PathVariable Integer[] ids) {
-//
-//
-//        List<Integer> idArray = Arrays.asList(ids);
-//        if (CollUtil.isNotEmpty(idArray)) {
-//            purPlanService.deleteByIds(idArray);
-//            for (Integer id : idArray) {
-//                purPlanDetailService.deleteByOrderId(id + "");
-//            }
-//        }
-//        return ResultVOUtils.success("删除成功");
-//
-//    }
-//
-//
-//    /**
-//     * 新增采购计划
-//     */
-//    @RepeatSubmit()
-//    @PostMapping("/purchase/plan/detail")
-//    public BaseResponse detailAdd(@RequestBody PurPlanDetailEntity purPlanDetailRequest) {
-//
-//        purPlanDetailService.insert(purPlanDetailRequest);
-//        return ResultVOUtils.success("新增成功");
-//    }
-//
-//    /**
-//     * 修改采购计划
-//     */
-//    @RepeatSubmit()
-//    @PutMapping("/purchase/plan/detail")
-//    public BaseResponse detailEdit(@RequestBody PurPlanDetailEntity purPlanDetailRequest) {
-//        purPlanDetailService.update(purPlanDetailRequest);
-//        return ResultVOUtils.success("修改成功");
-//    }
-//
-//    /**
-//     * 删除采购计划
-//     *
-//     * @param ids 主键串
-//     */
-//    @DeleteMapping("/purchase/plan/detail/{ids}")
-//    public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空")
-//                                     @PathVariable Long[] ids) {
-//
-//        purPlanDetailService.deleteByIds(Arrays.asList(ids));
-//        return ResultVOUtils.success("删除成功");
-//    }
-
 
     /**
      * 添加申购单到采购单里面
@@ -379,9 +290,6 @@ public class PurPlanController {
             purPlanDetailService.deleteByIds(ids);
         }
 
-
-
-
         boolean falg= purPlanDetailService.insertPurPlanDetailEntity(purPlanDetailEntityList);
         if(falg){
             //查询申购单
diff --git a/src/main/java/com/glxp/api/res/purchase/PurPlanResponse.java b/src/main/java/com/glxp/api/res/purchase/PurPlanResponse.java
index f21d81e0e..8cdeeb2fe 100644
--- a/src/main/java/com/glxp/api/res/purchase/PurPlanResponse.java
+++ b/src/main/java/com/glxp/api/res/purchase/PurPlanResponse.java
@@ -54,8 +54,6 @@ public class PurPlanResponse {
 
     private Date updateTime;
 
-    private String createByName;
-    private String auditByName;
     private String invName;
     private String subInvName;
     private String deptName;
@@ -70,4 +68,7 @@ public class PurPlanResponse {
 
     private String createUser;
     private String updateUser;
+
+    private String createUserName;
+    private String auditUserName;
 }
diff --git a/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml b/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml
index b0f47b4cf..3c2a129f7 100644
--- a/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml
@@ -8,8 +8,8 @@
 
         SELECT
         pur_plan.*,
-        cb.employeeName createByName,
-        ab.employeeName auditByName,
+        cb.employeeName createUserName,
+        ab.employeeName auditUserName,
         auth_warehouse.NAME invName,
         auth_dept.`name` deptName
         FROM