采购计划代码提交

src/main/java/com/glxp/api/controller/purchase/PurApplyController.java

@@ -1,6 +1,7 @@
 package com.glxp.api.controller.purchase;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.annotation.RepeatSubmit;
@@ -181,9 +182,9 @@ public class PurApplyController {
             purPlanEntity.setCreateTime(new Date());
             purPlanEntity.setUpdateTime(new Date());
             purPlanEntity.setApplyBillNo(purApplyEntity.getBillNo());
-            purPlanEntity.setApplyCreateBy(purApplyEntity.getCreateUser());
+            purPlanEntity.setApplyCreateUser(purApplyEntity.getCreateUser());
             purPlanEntity.setApplyRemark(purApplyEntity.getRemark());
-            purPlanEntity.setApplyAuditBy(purApplyEntity.getAuditUser());
+            purPlanEntity.setApplyAuditUser(purApplyEntity.getAuditUser());
             purPlanEntity.setRemark("申购科室：" + purApplyRequest.getTargetInvCode() +
                     ";申购人：" + purApplyRequest.getCreateByName() + ";申购原因：" + purApplyRequest.getRemark());
             purApplyEntity.setPlanBillNo(purPlanEntity.getBillNo());
@@ -326,4 +327,21 @@ public class PurApplyController {
     }
 
 
+    /**
+     * 新增申购单
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/purchase/apply/delApplyDetailAll")
+    public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) {
+
+        if(purApplyEntity.getId()!=null){
+             purApplyService.deleteById(purApplyEntity.getId());
+             purApplyDetailService.deleteByOrderId(purApplyEntity.getId() + "" );
+        }else {
+            return  ResultVOUtils.error(999,"参数有误！");
+        }
+        return  ResultVOUtils.success();
+    }
+
+
 }

src/main/java/com/glxp/api/controller/purchase/PurPlanController.java

@@ -10,9 +10,12 @@ import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.Constant;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.entity.basic.BasicCorpEntity;
+import com.glxp.api.entity.purchase.PurApplyDetailEntity;
+import com.glxp.api.entity.purchase.PurApplyEntity;
 import com.glxp.api.entity.purchase.PurPlanDetailEntity;
 import com.glxp.api.entity.purchase.PurPlanEntity;
 import com.glxp.api.req.purchase.PostPurPlanRequest;
+import com.glxp.api.req.purchase.PurApplyDetailRequest;
 import com.glxp.api.req.purchase.PurPlanDetailRequest;
 import com.glxp.api.req.purchase.PurPlanRequest;
 import com.glxp.api.res.PageSimpleResponse;
@@ -21,6 +24,8 @@ import com.glxp.api.res.purchase.PurPlanResponse;
 import com.glxp.api.service.auth.CustomerService;
 import com.glxp.api.service.basic.BasicCorpService;
 import com.glxp.api.service.basic.UdiRelevanceService;
+import com.glxp.api.service.purchase.PurApplyDetailService;
+import com.glxp.api.service.purchase.PurApplyService;
 import com.glxp.api.service.purchase.PurPlanDetailService;
 import com.glxp.api.service.purchase.PurPlanService;
 import com.glxp.api.util.GennerOrderUtils;
@@ -33,6 +38,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.validation.constraints.NotEmpty;
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
@@ -46,14 +52,18 @@ import java.util.*;
 @RestController
 public class PurPlanController {
 
-//
+
-//    @Resource
+    @Resource
-//    PurPlanService purPlanService;
+    PurPlanService purPlanService;
-//    @Resource
+    @Resource
-//    PurPlanDetailService purPlanDetailService;
+    PurApplyService purApplyService;
-//
+    @Resource
-//    @Resource
+    PurApplyDetailService purApplyDetailService;
-//    CustomerService customerService;
+    @Resource
+    PurPlanDetailService purPlanDetailService;
+
+    @Resource
+    CustomerService customerService;
 //    @Resource
 //    GennerOrderUtils gennerOrderUtils;
 //    @Resource
@@ -108,25 +118,25 @@ public class PurPlanController {
 //    }
 //
 //
-//    /**
+    /**
-//     * 查询采购计划列表
+     * 查询采购计划列表
-//     */
+     */
-//    @GetMapping("/purchase/plan/list")
+    @GetMapping("/purchase/plan/list")
-//    public BaseResponse list(PurPlanRequest purApplyRequest) {
+    public BaseResponse list(PurPlanRequest purApplyRequest) {
-//
+
-//        if (purApplyRequest.getStatus() == null) {
+        if (purApplyRequest.getStatus() == null) {
-//            purApplyRequest.setStatus(11);  //查询未审核和草稿状态
+            purApplyRequest.setStatus(11);  //查询未审核和草稿状态
-//        }
+        }
-//
+
-//        List<PurPlanResponse> purApplyEntities = purPlanService.queryPageList(purApplyRequest);
+        List<PurPlanResponse> purApplyEntities = purPlanService.queryPageList(purApplyRequest);
-//        PageInfo<PurPlanResponse> pageInfo;
+        PageInfo<PurPlanResponse> pageInfo;
-//        pageInfo = new PageInfo<>(purApplyEntities);
+        pageInfo = new PageInfo<>(purApplyEntities);
-//        PageSimpleResponse<PurPlanResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        PageSimpleResponse<PurPlanResponse> pageSimpleResponse = new PageSimpleResponse<>();
-//        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
-//        pageSimpleResponse.setList(purApplyEntities);
+        pageSimpleResponse.setList(purApplyEntities);
-//        return ResultVOUtils.success(pageSimpleResponse);
+        return ResultVOUtils.success(pageSimpleResponse);
-//
+
-//    }
+    }
 //
 //
 //    /**
@@ -334,4 +344,56 @@ public class PurPlanController {
 //    }
 
 
+    /**
+     * 添加申购单到采购单里面
+     */
+    @PostMapping("/purchase/plan/addPlanDetail")
+    public BaseResponse addPlanDetail(@RequestBody  PurPlanRequest purApplyRequest) {
+
+        if (purApplyRequest.getRId() == null && purApplyRequest.getId() == null) {
+           return ResultVOUtils.error(999,"参数错误！");
+        }
+
+        //查询申购单详情
+        PurApplyDetailRequest purApplyDetailRequest=new PurApplyDetailRequest();
+        purApplyDetailRequest.setOrderIdFk(purApplyRequest.getRId());
+        List<PurApplyDetailEntity> purApplyDetailEntityList=purApplyDetailService.selectPurApplyDetailList(purApplyDetailRequest);
+        //使用stream拷贝list
+        List<PurPlanDetailEntity> purPlanDetailEntityList = purApplyDetailEntityList.stream()
+                .map(e-> {
+                    PurPlanDetailEntity d = new PurPlanDetailEntity();
+                    BeanUtils.copyProperties(e, d);
+                    return d;
+                })
+                .collect(Collectors.toList());
+
+        for (PurPlanDetailEntity obj:purPlanDetailEntityList){
+            obj.setOrderIdFk(purApplyRequest.getId()+"");
+        }
+        boolean falg= purPlanDetailService.insertPurPlanDetailEntity(purPlanDetailEntityList);
+        if(falg){
+            //查询申购单
+            return ResultVOUtils.success("添加成功");
+
+        }else{
+            return ResultVOUtils.success("添加失败");
+        }
+    }
+
+    /**
+     * 新增计划单
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/purchase/plan/add")
+    public BaseResponse add() {
+        Long userId = customerService.getUserId();
+        PurPlanEntity purPlanEntity= new PurPlanEntity();
+        purPlanEntity.setCreateUser(userId + "");
+        purPlanEntity.setCreateTime(new Date());
+        purPlanEntity.setUpdateTime(new Date());
+        purPlanEntity.setUpdateUser(userId + "");
+        purPlanService.insert(purPlanEntity);
+        Long id=purPlanEntity.getId();
+        return ResultVOUtils.success(id);
+    }
 }

src/main/java/com/glxp/api/dao/purchase/PurApplyDao.java

@@ -20,4 +20,6 @@ public interface PurApplyDao {
 
     Boolean deleteByIds(@Param("ids") List<Long> ids);
 
+    Boolean deleteById(@Param("id") long id);
+
 }

src/main/java/com/glxp/api/dao/purchase/PurPlanDetailDao.java

@@ -1,6 +1,7 @@
 package com.glxp.api.dao.purchase;
 
 
+import com.glxp.api.entity.basic.ProductInfoEntity;
 import com.glxp.api.entity.purchase.PurPlanDetailEntity;
 import com.glxp.api.req.purchase.PurPlanDetailRequest;
 import org.apache.ibatis.annotations.Mapper;
@@ -22,4 +23,6 @@ public interface PurPlanDetailDao {
 
     Boolean deleteByOrderId(@Param("orderIdFk") String orderIdFk);
 
+    boolean insertPurPlanDetailEntity(@Param("datas") List<PurPlanDetailEntity> purPlanDetailEntityList);
+
 }

src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java

@@ -100,14 +100,14 @@ public class PurPlanEntity {
     /**
      * 申购人
      */
-    @TableField(value = "applyCreateBy")
+    @TableField(value = "applyCreateUser")
-    private String applyCreateBy;
+    private String applyCreateUser;
 
     /**
      * 申购审核人
      */
-    @TableField(value = "applyAuditBy")
+    @TableField(value = "applyAuditUser")
-    private String applyAuditBy;
+    private String applyAuditUser;
 
     /**
      * 申购说明
@@ -157,9 +157,9 @@ public class PurPlanEntity {
 
     public static final String COL_UPDATEUSER = "updateUser";
 
-    public static final String COL_APPLYCREATEBY = "applyCreateBy";
+    public static final String COL_APPLYCREATEUser = "applyCreateUser";
 
-    public static final String COL_APPLYAUDITBY = "applyAuditBy";
+    public static final String COL_APPLYAUDITUser = "applyAuditUser";
 
     public static final String COL_APPLYREMARK = "applyRemark";
 

src/main/java/com/glxp/api/req/purchase/PurPlanRequest.java

@@ -90,5 +90,7 @@ public class PurPlanRequest extends ListPageRequest {
     private String startDate;
     private String endDate;
 
+    private  String rId;
+
 
 }

src/main/java/com/glxp/api/service/purchase/PurApplyDetailService.java

@@ -25,4 +25,6 @@ public interface PurApplyDetailService {
 
     Boolean deleteByOrderId(String orderIdfK);
 
+    List<PurApplyDetailEntity> selectPurApplyDetailList(PurApplyDetailRequest purApplyRequest);
+
 }

src/main/java/com/glxp/api/service/purchase/PurApplyService.java

@@ -17,4 +17,6 @@ public interface PurApplyService {
     Boolean update(PurApplyEntity purApplyRequest);
 
     Boolean deleteByIds(List<Long> ids);
+
+    Boolean deleteById(long id);
 }

src/main/java/com/glxp/api/service/purchase/PurPlanDetailService.java

@@ -23,4 +23,6 @@ public interface PurPlanDetailService {
     Boolean deleteByIds(List<Long> ids);
 
     Boolean deleteByOrderId(String orderIdfK);
+
+    boolean insertPurPlanDetailEntity(List<PurPlanDetailEntity> purPlanDetailEntityList);
 }

src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java

@@ -76,4 +76,11 @@ public class PurApplyDetailImplService implements PurApplyDetailService {
     public Boolean deleteByOrderId(String orderIdfK) {
         return purApplyDetailDao.deleteByOrderId(orderIdfK);
     }
+
+    @Override
+    public List<PurApplyDetailEntity> selectPurApplyDetailList(PurApplyDetailRequest purApplyRequest) {
+        return purApplyDetailDao.queryPageList(purApplyRequest);
+    }
+
+
 }

src/main/java/com/glxp/api/service/purchase/impl/PurApplyServiceImpl.java

@@ -45,4 +45,9 @@ public class PurApplyServiceImpl implements PurApplyService {
     public Boolean deleteByIds(List<Long> ids) {
         return purApplyDao.deleteByIds(ids);
     }
+
+    @Override
+    public Boolean deleteById(long id) {
+        return purApplyDao.deleteById(id);
+    }
 }

src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailServiceImpl.java

@@ -71,4 +71,9 @@ public class PurPlanDetailServiceImpl implements PurPlanDetailService {
         return purPlanDetailDao.deleteByOrderId(orderIdfK);
 
     }
+
+    @Override
+    public boolean insertPurPlanDetailEntity(List<PurPlanDetailEntity> purPlanDetailEntityList) {
+        return purPlanDetailDao.insertPurPlanDetailEntity(purPlanDetailEntityList);
+    }
 }

src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml

@@ -93,6 +93,11 @@
         </foreach>
     </delete>
 
+    <delete id="deleteById" parameterType="long">
+        DELETE FROM pur_apply
+        WHERE id = #{id}
+    </delete>
+
 
 
 

src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml

@@ -6,13 +6,18 @@
     <select id="queryPageList" parameterType="com.glxp.api.req.purchase.PurPlanRequest"
             resultType="com.glxp.api.res.purchase.PurPlanResponse">
 
-        select pur_plan.* ,
+        SELECT
-        cb.employeeName createByName,ab.employeeName auditByName,
+        pur_plan.*,
-        inv_warehouse.name invName,inv_warehouse_sub.`name` subInvName FROM pur_plan
+        cb.employeeName createByName,
-        left JOIN auth_user cb on pur_plan.createUser = cb.id
+        ab.employeeName auditByName,
-        LEFT JOIN auth_user ab on pur_plan.auditUser = ab.id
+        auth_warehouse.NAME invName,
-        LEFT JOIN inv_warehouse on pur_plan.locStorageCode = inv_warehouse.`code`
+        auth_dept.`name` deptName
-        LEFT JOIN inv_warehouse_sub on inv_warehouse_sub.code = pur_plan.invWarehouseCode
+        FROM
+        pur_plan
+        LEFT JOIN auth_user cb ON pur_plan.createUser = cb.id
+        LEFT JOIN auth_user ab ON pur_plan.auditUser = ab.id
+        LEFT JOIN auth_warehouse ON pur_plan.invCode = auth_warehouse.`code`
+        LEFT JOIN auth_dept ON auth_dept.CODE = pur_plan.deptCode
         <where>
             <if test="billNo != '' and billNo != null">
                 AND billNo = #{billNo}
@@ -54,9 +59,9 @@
         replace
         INTO  pur_plan
         (
-        billNo,billDate,status,billType,remark,locStorageCode,invWarehouseCode,
+        billNo,billDate,status,billType,remark,invCode,
         deptCode,createUser,createTime,auditUser,auditTime,updateTime,auditRemark
-,applyCreateUser,applyAuditUser,applyRemark,applyBillNo,stockOrderNo
+        ,applyCreateUser,applyAuditUser,applyRemark,applyBillNo,stockOrderNo
         )
         values (
         #{billNo},
@@ -64,8 +69,7 @@
         #{status},
         #{billType},
         #{remark},
-        #{locStorageCode},
+        #{invCode},
-        #{invWarehouseCode},
         #{deptCode},
         #{createUser},
         #{createTime},
@@ -100,8 +104,7 @@
             <if test="status != null">status=#{status},</if>
             <if test="billType != null">billType=#{billType},</if>
             <if test="remark != null">remark=#{remark},</if>
-            <if test="locStorageCode != null">locStorageCode=#{locStorageCode},</if>
+            <if test="invCode != null">invCode=#{invCode},</if>
-            <if test="invWarehouseCode != null">invWarehouseCode=#{invWarehouseCode},</if>
             <if test="deptCode != null">deptCode=#{deptCode},</if>
             <if test="auditUser != null">auditUser=#{auditUser},</if>
             <if test="auditTime != null">auditTime=#{auditTime},</if>

src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml

@@ -93,4 +93,21 @@
         WHERE id = #{id}
     </update>
 
+
+    <insert id="insertPurPlanDetailEntity" keyProperty="id"  parameterType="com.glxp.api.entity.purchase.PurPlanDetailEntity">
+        REPLACE INTO pur_plan_detail
+        ( orderIdFk,productId,productName,count,supId,zczbhhzbapzbh) values
+
+        <foreach collection="datas" item="item" index="index" separator=",">
+            (
+            #{item.orderIdFk},
+            #{item.productId},
+            #{item.productName},
+            #{item.count},
+            #{item.supId},
+            #{item.zczbhhzbapzbh}
+            )
+        </foreach>
+    </insert>
+
 </mapper>