楚江erp：办事处、区域、备货单添加

@@ -702,7 +702,9 @@ create table if not exists `tbl_contract_distributor_standard`
     `code`                       varchar(20)  not null comment '编号',
     `code`                       varchar(20)  not null comment '编号',
     `supplier`                   varchar(50)  not null comment '供方',
     `supplier`                   varchar(50)  not null comment '供方',
     `buyer`                      varchar(200) not null comment '需方',
     `buyer`                      varchar(200) not null comment '需方',
+    `stock_up_company`           varchar(32) not null comment '备货单位',
     `dept_id`                    varchar(32)  not null comment '办事处',
     `dept_id`                    varchar(32)  not null comment '办事处',
+    `region`                     varchar(32) comment '区域',
     `order_date`                 date         NOT NULL COMMENT '订货日期',
     `order_date`                 date         NOT NULL COMMENT '订货日期',
     `unit`                       VARCHAR(50) COMMENT '单位',
     `unit`                       VARCHAR(50) COMMENT '单位',
     `workshop_id`                varchar(32) comment '生产厂',
     `workshop_id`                varchar(32) comment '生产厂',

@@ -71,6 +71,18 @@ public class GetContractDistributorStandardBo extends BaseBo<ContractDistributor
     private String deptName;
     private String deptName;
 
 
     /**
     /**
+     * 区域
+     */
+    @ApiModelProperty("区域")
+    private String region;
+
+    /**
+     * 区域名称
+     */
+    @ApiModelProperty("区域名称")
+    private String regionName;
+
+    /**
      * 订货日期
      * 订货日期
      */
      */
     @ApiModelProperty("订货日期")
     @ApiModelProperty("订货日期")

@@ -55,6 +55,18 @@ public class QueryContractDistributorStandardBo extends BaseBo<ContractDistribut
     private String deptName;
     private String deptName;
 
 
     /**
     /**
+     * 区域
+     */
+    @ApiModelProperty("区域")
+    private String region;
+
+    /**
+     * 区域名称
+     */
+    @ApiModelProperty("区域名称")
+    private String regionName;
+
+    /**
      * 创建人
      * 创建人
      */
      */
     @ApiModelProperty("创建人")
     @ApiModelProperty("创建人")

@@ -200,6 +200,14 @@ public class ContractDistributorStandardController extends DefaultBaseController
         Map<String, String> auditCodeAndNameMap = CollectionUtils.emptyIfNull(sysDataDicItemList)
         Map<String, String> auditCodeAndNameMap = CollectionUtils.emptyIfNull(sysDataDicItemList)
                 .stream()
                 .stream()
                 .collect(Collectors.toMap(SysDataDicItem::getCode, SysDataDicItem::getName));
                 .collect(Collectors.toMap(SysDataDicItem::getCode, SysDataDicItem::getName));
+        // 区域
+        Map<String, String> regionMap = new HashMap<>();
+        List<String> regionIds = boList.stream().map(QueryContractDistributorStandardBo::getRegion).collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(regionIds)) {
+            List<SysDept> regionList = sysDeptService.listByIds(regionIds);
+            regionMap = regionList.stream().collect(Collectors.toMap(SysDept::getId, SysDept::getName));
+        }
+        Map<String, String> finalRegionMap = regionMap;
         boList.forEach(bo -> {
         boList.forEach(bo -> {
             if (bo == null) {
             if (bo == null) {
                 return;
                 return;
@@ -234,6 +242,9 @@ public class ContractDistributorStandardController extends DefaultBaseController
             if (StringUtils.isNotBlank(bo.getStandardApproved())) {
             if (StringUtils.isNotBlank(bo.getStandardApproved())) {
                 bo.setStandardApprovedName(auditCodeAndNameMap.get(bo.getStandardApproved()));
                 bo.setStandardApprovedName(auditCodeAndNameMap.get(bo.getStandardApproved()));
             }
             }
+            if (StringUtils.isNotBlank(bo.getRegion())) {
+                bo.setRegionName(finalRegionMap.get(bo.getRegion()));
+            }
         });
         });
 
 
         boPageResult.setDatas(boList);
         boPageResult.setDatas(boList);
@@ -331,6 +342,14 @@ public class ContractDistributorStandardController extends DefaultBaseController
 
 
             result.setContractStdProcessingLineList(lineBoList);
             result.setContractStdProcessingLineList(lineBoList);
         }
         }
+        if (StringUtils.isNotBlank(result.getDeptId())) {
+            SysDept dept = sysDeptService.findById(result.getDeptId());
+            result.setDeptName(dept == null ? null : dept.getName());
+        }
+        if (StringUtils.isNotBlank(result.getRegion())) {
+            SysDept dept = sysDeptService.findById(result.getRegion());
+            result.setRegionName(dept == null ? null : dept.getName());
+        }
 
 
         return InvokeResultBuilder.success(result);
         return InvokeResultBuilder.success(result);
     }
     }

@@ -53,6 +53,11 @@ public class ContractDistributorStandard extends BaseEntity implements BaseDto {
     private String deptId;
     private String deptId;
 
 
     /**
     /**
+     * 区域
+     */
+    private String region;
+
+    /**
      * 订货日期
      * 订货日期
      */
      */
     private LocalDate orderDate;
     private LocalDate orderDate;

@@ -265,6 +265,7 @@ public class ContractDistributorStandardServiceImpl extends
         data.setSupplier(vo.getSupplier());
         data.setSupplier(vo.getSupplier());
         data.setBuyer(vo.getBuyer());
         data.setBuyer(vo.getBuyer());
         data.setDeptId(vo.getDeptId());
         data.setDeptId(vo.getDeptId());
+        data.setRegion(vo.getRegion());
         data.setOrderDate(vo.getOrderDate());
         data.setOrderDate(vo.getOrderDate());
         data.setUnit(vo.getUnit());
         data.setUnit(vo.getUnit());
         data.setWorkshopId(vo.getWorkshopId());
         data.setWorkshopId(vo.getWorkshopId());
@@ -339,6 +340,7 @@ public class ContractDistributorStandardServiceImpl extends
                 .set(ContractDistributorStandard::getCode, vo.getCode())
                 .set(ContractDistributorStandard::getCode, vo.getCode())
                 .set(ContractDistributorStandard::getSupplier, vo.getSupplier())
                 .set(ContractDistributorStandard::getSupplier, vo.getSupplier())
                 .set(ContractDistributorStandard::getBuyer, vo.getBuyer())
                 .set(ContractDistributorStandard::getBuyer, vo.getBuyer())
+                .set(vo.getRegion() != null, ContractDistributorStandard::getRegion, vo.getRegion())
                 .set(ContractDistributorStandard::getOrderDate, vo.getOrderDate())
                 .set(ContractDistributorStandard::getOrderDate, vo.getOrderDate())
                 .set(ContractDistributorStandard::getUnit, vo.getUnit())
                 .set(ContractDistributorStandard::getUnit, vo.getUnit())
                 .set(ContractDistributorStandard::getWorkshopId, vo.getWorkshopId())
                 .set(ContractDistributorStandard::getWorkshopId, vo.getWorkshopId())

@@ -47,11 +47,23 @@ public class CreateContractDistributorStandardVo implements BaseVo, Serializable
     private String buyer;
     private String buyer;
 
 
     /**
     /**
+     * 备货单位
+     */
+    @ApiModelProperty(value = "备货单位")
+    private String stockUpCompany;
+
+    /**
      * 办事处
      * 办事处
      */
      */
     private String deptId;
     private String deptId;
 
 
     /**
     /**
+     * 区域
+     */
+    @ApiModelProperty(value = "区域", required = true)
+    private String region;
+
+    /**
      * 订货日期
      * 订货日期
      */
      */
     @ApiModelProperty(value = "订货日期", required = true)
     @ApiModelProperty(value = "订货日期", required = true)

@@ -7,9 +7,6 @@ import javax.validation.constraints.NotBlank;
 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 javax.validation.constraints.NotNull;
-
 import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.Length;
@@ -52,6 +49,18 @@ public class UpdateContractDistributorStandardVo implements BaseVo, Serializable
     private String buyer;
     private String buyer;
 
 
     /**
     /**
+     * 备货单位
+     */
+    @ApiModelProperty(value = "备货单位")
+    private String stockUpCompany;
+
+    /**
+     * 区域
+     */
+    @ApiModelProperty(value = "区域")
+    private String region;
+
+    /**
      * 订货日期
      * 订货日期
      */
      */
     @ApiModelProperty(value = "订货日期")
     @ApiModelProperty(value = "订货日期")

@@ -69,6 +69,7 @@
                tb.supplier,
                tb.supplier,
                tb.buyer,
                tb.buyer,
                tb.dept_id,
                tb.dept_id,
+               tb.region,
                tb.order_date,
                tb.order_date,
                tb.unit,
                tb.unit,
                tb.workshop_id,
                tb.workshop_id,