楚江ERP：订货单-新增总数量、包装费、合同创建人

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.web.core.bo.BaseBo;
 import com.lframework.starter.web.core.bo.BaseBo;
+
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.List;
 
 
@@ -47,6 +49,12 @@ public class GetPurchaseOrderInfoBo extends BaseBo<PurchaseOrderInfo> {
     private String orderingUnit;
     private String orderingUnit;
 
 
     /**
     /**
+     * 订货单位名称
+     */
+    @ApiModelProperty("订货单位名称")
+    private String orderingUnitName;
+
+    /**
      * 订货日期
      * 订货日期
      */
      */
     @ApiModelProperty("订货日期")
     @ApiModelProperty("订货日期")
@@ -228,6 +236,29 @@ public class GetPurchaseOrderInfoBo extends BaseBo<PurchaseOrderInfo> {
     @ApiModelProperty("订货单类型")
     @ApiModelProperty("订货单类型")
     private String type;
     private String type;
 
 
+    /**
+     * 总数量
+     */
+    @ApiModelProperty("总数量")
+    private BigDecimal totalQuantity;
+
+    /**
+     * 包装费
+     */
+    @ApiModelProperty("包装费")
+    private BigDecimal packagingFee;
+
+    /**
+     * 是否为合同创建人
+     */
+    @ApiModelProperty("是否为合同创建人")
+    private boolean contractCreateBy;
+
+    /**
+     * 是否展示审核按钮(非持久化字段)
+     */
+    @TableField(exist = false)
+    private Boolean showExamine;
 
 
 
 
     public GetPurchaseOrderInfoBo() {
     public GetPurchaseOrderInfoBo() {

@@ -3,6 +3,9 @@ package com.lframework.xingyun.sc.controller.order;
 import cn.hutool.core.io.resource.ClassPathResource;
 import cn.hutool.core.io.resource.ClassPathResource;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.lframework.starter.bpm.dto.FlowTaskDto;
+import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
+import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
@@ -85,6 +88,8 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
     private SysUserDeptService sysUserDeptService;
     private SysUserDeptService sysUserDeptService;
     @Resource
     @Resource
     private SysDeptService sysDeptService;
     private SysDeptService sysDeptService;
+    @Resource
+    private FlowTaskWrapperMapper flowTaskWrapperMapper;
 
 
 
 
     /**
     /**
@@ -101,7 +106,18 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
         List<GetPurchaseOrderInfoBo> results = null;
         List<GetPurchaseOrderInfoBo> results = null;
 
 
         if (!CollectionUtil.isEmpty(datas)) {
         if (!CollectionUtil.isEmpty(datas)) {
-            results = datas.stream().map(GetPurchaseOrderInfoBo::new).collect(Collectors.toList());
+            String currentUserId = SecurityUtil.getCurrentUser().getId();
+
+            results = datas.stream().map(purchaseOrderInfo -> {
+                GetPurchaseOrderInfoBo bo = new GetPurchaseOrderInfoBo(purchaseOrderInfo);
+                // 判断 contractCreateById 是否等于当前用户 ID
+                boolean isCreateBy = false;
+                if (currentUserId.equals(purchaseOrderInfo.getContractCreateById())) {
+                    isCreateBy = true;
+                }
+                bo.setContractCreateBy(isCreateBy);
+                return bo;
+            }).collect(Collectors.toList());
         }
         }
 
 
         return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
         return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
@@ -166,6 +182,12 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
                     }
                     }
                 }
                 }
             }
             }
+            // 获取当前人员的待办任务数据
+            List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
+            if (org.apache.commons.collections.CollectionUtils.isNotEmpty(flowTaskList)) {
+                List<String> businessIds = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
+                result.setShowExamine(businessIds.contains(result.getId()));
+            }
             result.setPurchaseOrderLineList(purchaseOrderLineList);
             result.setPurchaseOrderLineList(purchaseOrderLineList);
         }
         }
 
 
@@ -200,6 +222,20 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
     }
     }
 
 
     /**
     /**
+     * 取消
+     */
+    @ApiOperation("取消")
+    @HasPermission({"purchaseOrderRevoke:purchaseorderrevoke:cancel"})
+    @GetMapping("/cancel")
+    public InvokeResult<Void> cancel(@NotBlank(message = "id不能为空！") String id,
+                                     @NotBlank(message = "status不能为空！") String status) {
+
+        purchaseOrderInfoService.updateStatus(id, status);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
      * 根据ID删除
      * 根据ID删除
      */
      */
     @ApiOperation("根据ID删除")
     @ApiOperation("根据ID删除")

@@ -2,12 +2,12 @@ package com.lframework.xingyun.sc.entity;
 
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.lframework.starter.web.core.dto.BaseDto;
 import com.lframework.starter.web.core.dto.BaseDto;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.lframework.starter.web.core.entity.BaseEntity;
 import com.lframework.starter.web.core.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
 /**
 /**
@@ -185,6 +185,28 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
     private String type;
     private String type;
 
 
     /**
     /**
+     * 总数量
+     */
+    private BigDecimal totalQuantity;
+
+    /**
+     * 包装费
+     */
+    private BigDecimal packagingFee;
+
+    /**
+     * 合同创建人ID
+     */
+    private String contractCreateById;
+
+
+    /**
+     * 是否展示审核按钮(非持久化字段)
+     */
+    @TableField(exist = false)
+    private Boolean showExamine;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)

@@ -257,8 +257,8 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
             //发起人
             //发起人
             String createById = revoke.getCreateById();
             String createById = revoke.getCreateById();
             userIdList.add(createById);
             userIdList.add(createById);
-            //综合内勤
-            List<String> list1 = transactorHandler.listTransactorsByRoleCode("zhnq", createById);
+            //综合内勤=办事处内勤
+            List<String> list1 = transactorHandler.listTransactorsByRoleCode("bscnq", createById);
             if (CollectionUtils.isNotEmpty(list1)) {
             if (CollectionUtils.isNotEmpty(list1)) {
                 userIdList.addAll(list1);
                 userIdList.addAll(list1);
             }
             }

@@ -3,7 +3,11 @@ package com.lframework.xingyun.sc.impl.order;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.PageInfo;
+import com.lframework.starter.bpm.dto.FlowTaskDto;
+import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
 import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
 import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
+import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.PageResult;
@@ -33,6 +37,7 @@ import org.springframework.stereotype.Service;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 @Service
 @Service
 public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrderInfoMapper, PurchaseOrderInfo> implements PurchaseOrderInfoService {
 public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrderInfoMapper, PurchaseOrderInfo> implements PurchaseOrderInfoService {
@@ -44,6 +49,8 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
     private CustomerCreditService customerCreditService;
     private CustomerCreditService customerCreditService;
     @Resource
     @Resource
     private FlowInstanceWrapperService flowInstanceWrapperService;
     private FlowInstanceWrapperService flowInstanceWrapperService;
+    @Resource
+    private FlowTaskWrapperMapper flowTaskWrapperMapper;
 
 
     @Override
     @Override
     public PageResult<PurchaseOrderInfo> query(Integer pageIndex, Integer pageSize, QueryPurchaseOrderInfoVo vo) {
     public PageResult<PurchaseOrderInfo> query(Integer pageIndex, Integer pageSize, QueryPurchaseOrderInfoVo vo) {
@@ -53,6 +60,21 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
 
 
         PageHelperUtil.startPage(pageIndex, pageSize);
         PageHelperUtil.startPage(pageIndex, pageSize);
         List<PurchaseOrderInfo> datas = this.query(vo);
         List<PurchaseOrderInfo> datas = this.query(vo);
+        if (CollectionUtils.isNotEmpty(datas)) {
+            // 获取当前人员的待办任务数据
+            List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
+            if (org.apache.commons.collections4.CollectionUtils.isEmpty(flowTaskList)) {
+                return new PageResult<>();
+            }
+            List<String> ids = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
+            for (PurchaseOrderInfo purchaseOrderInfo : datas) {
+                if (ids.contains(purchaseOrderInfo.getId())) {
+                    purchaseOrderInfo.setShowExamine(true);
+                } else {
+                    purchaseOrderInfo.setShowExamine(false);
+                }
+            }
+        }
 
 
         return PageResultUtil.convert(new PageInfo<>(datas));
         return PageResultUtil.convert(new PageInfo<>(datas));
     }
     }
@@ -172,6 +194,16 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         if (!StringUtil.isBlank(vo.getType())) {
         if (!StringUtil.isBlank(vo.getType())) {
             data.setType(vo.getType());
             data.setType(vo.getType());
         }
         }
+        if (vo.getTotalQuantity() != null) {
+            data.setTotalQuantity(vo.getTotalQuantity());
+        }
+        if (vo.getPackagingFee() != null) {
+            data.setPackagingFee(vo.getPackagingFee());
+        }
+        if (!StringUtil.isBlank(vo.getContractCreateById())) {
+            data.setContractCreateById(vo.getContractCreateById());
+        }
+
 
 
         getBaseMapper().insert(data);
         getBaseMapper().insert(data);
 
 
@@ -226,6 +258,8 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
                 .set(PurchaseOrderInfo::getDeptId, StringUtil.isBlank(vo.getDeptId()) ? null : vo.getDeptId())
                 .set(PurchaseOrderInfo::getDeptId, StringUtil.isBlank(vo.getDeptId()) ? null : vo.getDeptId())
                 .set(PurchaseOrderInfo::getWorkshopId, StringUtil.isBlank(vo.getWorkshopId()) ? null : vo.getWorkshopId())
                 .set(PurchaseOrderInfo::getWorkshopId, StringUtil.isBlank(vo.getWorkshopId()) ? null : vo.getWorkshopId())
                 .set(PurchaseOrderInfo::getCustomerCreditId, StringUtil.isBlank(vo.getCustomerCreditId()) ? null : vo.getCustomerCreditId())
                 .set(PurchaseOrderInfo::getCustomerCreditId, StringUtil.isBlank(vo.getCustomerCreditId()) ? null : vo.getCustomerCreditId())
+                .set(PurchaseOrderInfo::getTotalQuantity, vo.getTotalQuantity() == null ? null : vo.getTotalQuantity())
+                .set(PurchaseOrderInfo::getPackagingFee, vo.getPackagingFee() == null ? null : vo.getPackagingFee())
                 .eq(PurchaseOrderInfo::getId, vo.getId());
                 .eq(PurchaseOrderInfo::getId, vo.getId());
 
 
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);
@@ -274,6 +308,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
                 .set(PurchaseOrderInfo::getPackaging, StringUtil.isBlank(vo.getPackaging()) ? null : vo.getPackaging())
                 .set(PurchaseOrderInfo::getPackaging, StringUtil.isBlank(vo.getPackaging()) ? null : vo.getPackaging())
                 .set(PurchaseOrderInfo::getRemarks, StringUtil.isBlank(vo.getRemarks()) ? null : vo.getRemarks())
                 .set(PurchaseOrderInfo::getRemarks, StringUtil.isBlank(vo.getRemarks()) ? null : vo.getRemarks())
                 .set(PurchaseOrderInfo::getProductionProcess, StringUtil.isBlank(vo.getProductionProcess()) ? null : vo.getProductionProcess())
                 .set(PurchaseOrderInfo::getProductionProcess, StringUtil.isBlank(vo.getProductionProcess()) ? null : vo.getProductionProcess())
+                .set(PurchaseOrderInfo::getPackagingFee, vo.getPackagingFee() == null ? null : vo.getPackagingFee())
                 .eq(PurchaseOrderInfo::getId, vo.getId());
                 .eq(PurchaseOrderInfo::getId, vo.getId());
 
 
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);

@@ -89,6 +89,12 @@ public class QueryCustomerCreditVo extends PageVo implements BaseVo, Serializabl
     private String frozenStatus;
     private String frozenStatus;
 
 
     /**
     /**
+     * 客户分类：AAA、AA、A、BBB、BB、B、C、D
+     */
+    @ApiModelProperty("客户分类：AAA、AA、A、BBB、BB、B、C、D")
+    private String companySuggestedCategory;
+
+    /**
      * 创建时间
      * 创建时间
      */
      */
     @ApiModelProperty(value = "创建时间")
     @ApiModelProperty(value = "创建时间")

 package com.lframework.xingyun.sc.vo.order;
 package com.lframework.xingyun.sc.vo.order;
 
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import com.lframework.starter.web.core.vo.BaseVo;
 import com.lframework.starter.web.core.vo.BaseVo;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
@@ -195,4 +196,22 @@ public class CreatePurchaseOrderInfoVo implements BaseVo, Serializable {
     @ApiModelProperty("订货单类型")
     @ApiModelProperty("订货单类型")
     private String type;
     private String type;
 
 
+    /**
+     * 总数量
+     */
+    @ApiModelProperty("总数量")
+    private BigDecimal totalQuantity;
+
+    /**
+     * 包装费
+     */
+    @ApiModelProperty("包装费")
+    private BigDecimal packagingFee;
+
+    /**
+     * 合同创建人ID
+     */
+    @ApiModelProperty("合同创建人ID")
+    private String contractCreateById;
+
 }
 }

@@ -2,6 +2,7 @@ package com.lframework.xingyun.sc.vo.order;
 
 
 import lombok.Data;
 import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import com.lframework.starter.web.core.vo.BaseVo;
 import com.lframework.starter.web.core.vo.BaseVo;
 import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import com.lframework.starter.web.core.components.validation.TypeMismatch;
@@ -203,4 +204,16 @@ public class UpdatePurchaseOrderInfoVo implements BaseVo, Serializable {
     @ApiModelProperty("订货单类型")
     @ApiModelProperty("订货单类型")
     private String type;
     private String type;
 
 
+    /**
+     * 总数量
+     */
+    @ApiModelProperty("总数量")
+    private BigDecimal totalQuantity;
+
+    /**
+     * 包装费
+     */
+    @ApiModelProperty("包装费")
+    private BigDecimal packagingFee;
+
 }
 }

@@ -189,6 +189,10 @@
             <if test="vo.createTimeStr != null and vo.createTimeStr != ''">
             <if test="vo.createTimeStr != null and vo.createTimeStr != ''">
                 AND tb.create_time &lt; #{vo.createTimeStr}
                 AND tb.create_time &lt; #{vo.createTimeStr}
             </if>
             </if>
+            <if test="vo.companySuggestedCategory != null and vo.companySuggestedCategory != ''">
+                AND tb.company_suggested_category = #{vo.companySuggestedCategory}
+            </if>
+
         </where>
         </where>
     </select>
     </select>
 
 

@@ -33,6 +33,9 @@
         <result column="customer_credit_id" property="customerCreditId"/>
         <result column="customer_credit_id" property="customerCreditId"/>
         <result column="customer_tier" property="customerTier"/>
         <result column="customer_tier" property="customerTier"/>
         <result column="type" property="type"/>
         <result column="type" property="type"/>
+        <result column="total_quantity" property="totalQuantity"/>
+        <result column="packaging_fee" property="packagingFee"/>
+        <result column="contract_create_by_id" property="contractCreateById"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
         <result column="update_by_id" property="updateById"/>
@@ -73,6 +76,9 @@
             tb.customer_credit_id,
             tb.customer_credit_id,
             cc.company_suggested_category AS customer_tier,
             cc.company_suggested_category AS customer_tier,
             tb.type,
             tb.type,
+            tb.total_quantity,
+            tb.packaging_fee,
+            tb.contract_create_by_id,
             tb.create_by_id,
             tb.create_by_id,
             tb.create_by,
             tb.create_by,
             tb.update_by_id,
             tb.update_by_id,
@@ -115,6 +121,9 @@
             <if test="vo.deptId != null and vo.deptId != ''">
             <if test="vo.deptId != null and vo.deptId != ''">
                 AND tb.dept_id = #{vo.deptId}
                 AND tb.dept_id = #{vo.deptId}
             </if>
             </if>
+            <if test="vo.deptName != null and vo.deptName != ''">
+                AND sd.name LIKE CONCAT('%', #{vo.deptName},'%')
+            </if>
             <if test="vo.workshopId != null and vo.workshopId != ''">
             <if test="vo.workshopId != null and vo.workshopId != ''">
                 AND tb.workshop_id = #{vo.workshopId}
                 AND tb.workshop_id = #{vo.workshopId}
             </if>
             </if>