楚江ERP:办事处、区域、备货单位添加

@@ -293,6 +293,8 @@ CREATE TABLE IF NOT EXISTS `purchase_order_info`
     `element`                    varchar(500)   DEFAULT NULL COMMENT '元素',
     `production_process`         text COMMENT '生产工艺',
     `dept_id`                    varchar(50)    DEFAULT NULL COMMENT '办事处',
+    `region`                     varchar(32)    DEFAULT NULL COMMENT '区域',
+    `stock_up_company_id`        varchar(32)    DEFAULT NULL COMMENT '备货单位',
     `workshop_id`                varchar(50)    DEFAULT NULL COMMENT '生产厂',
     `customer_credit_id`         varchar(50)    DEFAULT NULL COMMENT '客户资信主键',
     `examine_status`             varchar(50)    DEFAULT NULL COMMENT '审核状态',
@@ -663,6 +665,7 @@ CREATE TABLE IF NOT EXISTS `shipments_order_info` (
     `workshop_id` varchar(32) NOT NULL COMMENT '厂房ID',
     `shipments_date` date NOT NULL COMMENT '发货日期',
     `dept_id` varchar(500) NOT NULL COMMENT '办事处ID',
+    `region` varchar(500) DEFAULT NULL COMMENT '区域',
     `delivery_type` varchar(500) DEFAULT NULL COMMENT '交货方式',
     `destination` varchar(500) DEFAULT NULL COMMENT '目的地',
     `payment_type` varchar(500) DEFAULT NULL COMMENT '付款方式',
@@ -702,7 +705,7 @@ create table if not exists `tbl_contract_distributor_standard`
     `code`                       varchar(20)  not null comment '编号',
     `supplier`                   varchar(50)  not null comment '供方',
     `buyer`                      varchar(200) not null comment '需方',
-    `stock_up_company`           varchar(32) not null comment '备货单位',
+    `stock_up_company_id`        varchar(32) not null comment '备货单位',
     `dept_id`                    varchar(32)  not null comment '办事处',
     `region`                     varchar(32) comment '区域',
     `order_date`                 date         NOT NULL COMMENT '订货日期',
@@ -881,6 +884,7 @@ create table `tbl_replenishment_order`
     `code`                         varchar(50) NOT NULL COMMENT '编号',
     `workshop_id`                  varchar(32) comment '分厂',
     `dept_id`                      varchar(32) comment '办事处',
+    `region`                       varchar(32) comment '区域',
     `customer_id`                  varchar(32) comment '购货单位',
     `origin_plan_ship_date`        DATE COMMENT '原计划发货日期',
     `purchase_order_id`            varchar(32) COMMENT '订货单',
@@ -947,4 +951,4 @@ create table if not exists customer_visit_record(
     update_by_id varchar(32) not null comment '更新人ID',
     create_time datetime default now() comment '创建时间',
     update_time datetime default now() comment '更新时间'
-);
\ No newline at end of file
+);

@@ -83,6 +83,18 @@ public class GetContractDistributorStandardBo extends BaseBo<ContractDistributor
     private String regionName;
 
     /**
+     * 备货单位ID
+     */
+    @ApiModelProperty("备货单位ID")
+    private String stockUpCompanyId;
+
+    /**
+     * 备货单位名称
+     */
+    @ApiModelProperty("备货单位名称")
+    private String stockUpCompanyName;
+
+    /**
      * 订货日期
      */
     @ApiModelProperty("订货日期")

@@ -67,6 +67,18 @@ public class QueryContractDistributorStandardBo extends BaseBo<ContractDistribut
     private String regionName;
 
     /**
+     * 备货单位ID
+     */
+    @ApiModelProperty("备货单位ID")
+    private String stockUpCompanyId;
+
+    /**
+     * 备货单位名称
+     */
+    @ApiModelProperty("备货单位名称")
+    private String stockUpCompanyName;
+
+    /**
      * 创建人
      */
     @ApiModelProperty("创建人")

@@ -195,6 +195,30 @@ public class GetPurchaseOrderInfoBo extends BaseBo<PurchaseOrderInfo> {
     private String deptName;
 
     /**
+     * 区域
+     */
+    @ApiModelProperty("区域")
+    private String region;
+
+    /**
+     * 区域名称(非持久化字段)
+     */
+    @ApiModelProperty("区域名称")
+    private String regionName;
+
+    /**
+     * 备货单位ID
+     */
+    @ApiModelProperty("备货单位ID")
+    private String stockUpCompanyId;
+
+    /**
+     * 备货单位名称(非持久化字段)
+     */
+    @ApiModelProperty("备货单位名称")
+    private String stockUpCompanyName;
+
+    /**
      * 生产厂
      */
     @ApiModelProperty("生产厂")

@@ -55,6 +55,19 @@ public class GetReplenishmentOrderBo extends BaseBo<ReplenishmentOrder> {
     @ApiModelProperty("办事处名称")
     private String deptName;
 
+
+    /**
+     * 区域
+     */
+    @ApiModelProperty("区域")
+    private String region;
+
+    /**
+     * 区域名称
+     */
+    @ApiModelProperty("区域名称")
+    private String regionName;
+
     /**
      * 购货单位
      */

@@ -56,6 +56,18 @@ public class QueryReplenishmentOrderBo extends BaseBo<ReplenishmentOrder> {
     private String deptName;
 
     /**
+     * 区域
+     */
+    @ApiModelProperty("办事处")
+    private String region;
+
+    /**
+     * 区域名称
+     */
+    @ApiModelProperty("区域名称")
+    private String regionName;
+
+    /**
      * 购货单位
      */
     @ApiModelProperty("购货单位")

@@ -193,7 +193,13 @@ public class ContractDistributorStandardController extends DefaultBaseController
                 .stream()
                 .collect(Collectors.toMap(SysDept::getId, Function.identity()));
         List<String> buyerIdList = boList.stream().map(QueryContractDistributorStandardBo::getBuyer).collect(Collectors.toList());
-        Map<String, Customer> customerMap = CollectionUtils.emptyIfNull(customerService.listByIds(buyerIdList))
+        List<String> stockUpCompanyIdList = boList.stream().map(QueryContractDistributorStandardBo::getStockUpCompanyId).collect(Collectors.toList());
+        buyerIdList.addAll(stockUpCompanyIdList);
+        //去重
+        List<String> distinctList = buyerIdList.stream()
+                .distinct()
+                .collect(Collectors.toList());
+        Map<String, Customer> customerMap = CollectionUtils.emptyIfNull(customerService.listByIds(distinctList))
                 .stream()
                 .collect(Collectors.toMap(Customer::getId, Function.identity()));
         List<SysDataDicItem> sysDataDicItemList = sysDataDicItemService.findByDicCode(AUDIT_STATUS_DIC_CODE);
@@ -245,6 +251,10 @@ public class ContractDistributorStandardController extends DefaultBaseController
             if (StringUtils.isNotBlank(bo.getRegion())) {
                 bo.setRegionName(finalRegionMap.get(bo.getRegion()));
             }
+            if (StringUtils.isNotBlank(bo.getStockUpCompanyId())) {
+                Customer customer = customerMap.get(bo.getStockUpCompanyId());
+                bo.setStockUpCompanyName(customer == null ? "" : customer.getName());
+            }
         });
 
         boPageResult.setDatas(boList);
@@ -350,6 +360,10 @@ public class ContractDistributorStandardController extends DefaultBaseController
             SysDept dept = sysDeptService.findById(result.getRegion());
             result.setRegionName(dept == null ? null : dept.getName());
         }
+        if (StringUtils.isNotBlank(result.getStockUpCompanyId())) {
+            Customer customer1 = customerService.findById(result.getStockUpCompanyId());
+            result.setStockUpCompanyName(customer1 == null ? null : customer1.getName());
+        }
 
         return InvokeResultBuilder.success(result);
     }
@@ -384,24 +398,6 @@ public class ContractDistributorStandardController extends DefaultBaseController
             throw new DefaultClientException("编号重复，请重新输入！");
         }
 
-        //获取当前人员ID
-        String currentUserId = SecurityUtil.getCurrentUser().getId();
-        SysUser sysUser = sysUserService.findById(currentUserId);
-        if (sysUser != null) {
-            GetSysUserBo getSysUserBo = new GetSysUserBo(sysUser);
-            //部门
-            List<String> depts = getSysUserBo.getDepts();
-            if (org.apache.commons.collections.CollectionUtils.isNotEmpty(depts)) {
-                SysDept sysDept = sysDeptService.findById(depts.get(0));
-                vo.setDeptId(sysDept.getId());
-                if (sysDept.getName().endsWith("区域") && StringUtils.isNotBlank(sysDept.getParentId())) { // 如果是**区域，则查询上一层次是否为**办事处，获取办事处code
-                    SysDept parentSysDept = sysDeptService.findById(sysDept.getParentId());
-                    if (parentSysDept != null && parentSysDept.getName().endsWith("办事处")) {
-                        vo.setDeptId(sysDept.getParentId());
-                    }
-                }
-            }
-        }
 
         if ("PROCESS_STD_AGMT".equals(vo.getType())) {
             contractDistributorStandardService.createStdContract(vo);

@@ -409,20 +409,11 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
                             "DEALER".equals(et) ? "经销商" :
                                     "TERMINAL".equals(et) ? "终端" : "");
                     //办事处
-                    String deptCode = transactorHandler.returnDeptCode(data.getContractCreateById());
-                    dataMap.put("officeName", returnDeptName(deptCode));
-                    //区域=创建人部门名称
-                    List<SysUserDept> sysUserDeptList = sysUserDeptService.getByUserId(data.getContractCreateById());
-                    String deptName = "";
-                    if (CollectionUtils.isNotEmpty(sysUserDeptList)) {
-                        deptName = sysUserDeptList.stream()
-                                .map(sysUserDept -> sysDeptService.findById(sysUserDept.getDeptId()))
-                                .filter(Objects::nonNull) // 防止 findById 返回 null
-                                .map(SysDept::getName)
-                                .collect(Collectors.joining(","));
-                    }
-                    dataMap.put("deptName", deptName);
-
+                    dataMap.put("deptName", data.getDeptName() == null ? "" : data.getDeptName());
+                    //区域
+                    dataMap.put("regionName", data.getRegionName() == null ? "" : data.getRegionName());
+                    //备货单位名称
+                    dataMap.put("stockUpCompanyName", data.getStockUpCompanyName() == null ? "" : data.getStockUpCompanyName());
 
                     processTemplate(workbook, dataMap);
 

@@ -110,6 +110,9 @@ public class ReplenishmentOrderController extends DefaultBaseController {
 
         List<QueryReplenishmentOrderBo> boList = boPageResult.getDatas();
         List<String> deptIdList = boList.stream().map(QueryReplenishmentOrderBo::getDeptId).collect(Collectors.toList());
+        List<String> regionList = boList.stream().map(QueryReplenishmentOrderBo::getRegion).collect(Collectors.toList());
+        deptIdList.addAll(regionList);
+        deptIdList = deptIdList.stream().distinct().collect(Collectors.toList());
         Map<String, SysDept> sysDeptMap = CollectionUtils.emptyIfNull(sysDeptService.listByIds(deptIdList))
                 .stream()
                 .collect(Collectors.toMap(SysDept::getId, Function.identity()));
@@ -135,6 +138,11 @@ public class ReplenishmentOrderController extends DefaultBaseController {
                 queryReplenishmentOrderBo.setDeptName(sysDept == null ? "" : sysDept.getName());
             }
 
+            if (StringUtils.isNotBlank(queryReplenishmentOrderBo.getRegion())) {
+                SysDept sysDept = sysDeptMap.get(queryReplenishmentOrderBo.getRegion());
+                queryReplenishmentOrderBo.setRegionName(sysDept == null ? "" : sysDept.getName());
+            }
+
             if (StringUtils.isNotBlank(queryReplenishmentOrderBo.getCustomerId())) {
                 Customer customer = customerMap.get(queryReplenishmentOrderBo.getCustomerId());
                 queryReplenishmentOrderBo.setCustomerName(customer == null ? "" : customer.getName());
@@ -171,6 +179,8 @@ public class ReplenishmentOrderController extends DefaultBaseController {
         GetReplenishmentOrderBo result = new GetReplenishmentOrderBo(data);
         SysDept sysDept = sysDeptService.findById(data.getDeptId());
         result.setDeptName(sysDept == null ? "" : sysDept.getName());
+        SysDept sysDept1 = sysDeptService.findById(data.getRegion());
+        result.setRegionName(sysDept1 == null ? "" : sysDept1.getName());
         Workshop workshop = workshopService.findById(data.getWorkshopId());
         result.setWorkshopName(workshop == null ? "" : workshop.getName());
         Customer customer = customerService.findById(data.getCustomerId());

@@ -2,7 +2,9 @@ package com.lframework.xingyun.sc.controller.shipments;
 
 import cn.hutool.core.io.resource.ClassPathResource;
 import com.lframework.starter.web.core.utils.JsonUtil;
+import com.lframework.starter.web.inner.entity.SysDept;
 import com.lframework.starter.web.inner.entity.SysUser;
+import com.lframework.starter.web.inner.service.system.SysDeptService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.sc.bo.shipments.order.GetShipmentsOrderInfoBo;
 import com.lframework.xingyun.sc.bo.shipments.order.QueryShipmentsOrderInfoBo;
@@ -52,10 +54,7 @@ import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
@@ -81,6 +80,8 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
     private SysUserService sysUserService;
     @Resource
     private RedisTemplate redisTemplate;
+    @Resource
+    private SysDeptService sysDeptService;
 
 
     /**
@@ -401,6 +402,38 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
             // 流水号
             String serialNumber = createSerialNumber(null, "SHIPMENT_ORDER_SERIAL_NUMBER");
             dataMap.put("serialNumber", serialNumber);
+            // 办事处
+            String deptId = orderInfo.getDeptId();
+            if (StringUtils.isNotBlank(deptId)) {
+                String[] split = deptId.split(",");
+                List<SysDept> deptList = sysDeptService.listByIds(Arrays.asList(split));
+                StringBuilder builder = new StringBuilder();
+                for (SysDept dept : deptList) {
+                    builder.append(dept.getName()).append(",");
+                }
+                if (builder.length() > 0) {
+                    builder.deleteCharAt(builder.length() - 1);
+                }
+                dataMap.put("deptName", builder.toString());
+            } else {
+                dataMap.put("deptName", "");
+            }
+            //区域
+            String region = orderInfo.getRegion();
+            if (StringUtils.isNotBlank(region)) {
+                String[] split = region.split(",");
+                List<SysDept> deptList = sysDeptService.listByIds(Arrays.asList(split));
+                StringBuilder builder = new StringBuilder();
+                for (SysDept dept : deptList) {
+                    builder.append(dept.getName()).append(",");
+                }
+                if (builder.length() > 0) {
+                    builder.deleteCharAt(builder.length() - 1);
+                }
+                dataMap.put("regionName", builder.toString());
+            } else {
+                dataMap.put("regionName", "");
+            }
             // 处理模板中的占位符
             ExcelUtil.processTemplate(workbook, dataMap);
             // 生成文件名

@@ -58,6 +58,11 @@ public class ContractDistributorStandard extends BaseEntity implements BaseDto {
     private String region;
 
     /**
+     * 备货单位ID
+     */
+    private String stockUpCompanyId;
+
+    /**
      * 订货日期
      */
     private LocalDate orderDate;

@@ -182,6 +182,28 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
     private String deptName;
 
     /**
+     * 区域
+     */
+    private String region;
+
+    /**
+     * 区域名称(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String regionName;
+
+    /**
+     * 备货单位ID
+     */
+    private String stockUpCompanyId;
+
+    /**
+     * 备货单位名称(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String stockUpCompanyName;
+
+    /**
      * 生产厂
      */
     private String workshopId;

@@ -45,6 +45,11 @@ public class ReplenishmentOrder extends BaseEntity implements BaseDto {
     private String deptId;
 
     /**
+     * 区域
+     */
+    private String region;
+
+    /**
      * 购货单位
      */
     private String customerId;
@@ -137,4 +142,4 @@ public class ReplenishmentOrder extends BaseEntity implements BaseDto {
      */
     @TableField(exist = false)
     private Boolean isOwner;
-}
\ No newline at end of file
+}

@@ -74,6 +74,17 @@ public class ShipmentsOrderInfo extends BaseEntity implements BaseDto {
     private String deptName;
 
     /**
+     * 区域
+     */
+    private String region;
+
+    /**
+     * 区域名称
+     */
+    @TableField(exist = false)
+    private String regionName;
+
+    /**
      * 交货/运输方式
      */
     private String deliveryType;

@@ -266,6 +266,7 @@ public class ContractDistributorStandardServiceImpl extends
         data.setBuyer(vo.getBuyer());
         data.setDeptId(vo.getDeptId());
         data.setRegion(vo.getRegion());
+        data.setStockUpCompanyId(vo.getStockUpCompanyId());
         data.setOrderDate(vo.getOrderDate());
         data.setUnit(vo.getUnit());
         data.setWorkshopId(vo.getWorkshopId());
@@ -340,7 +341,9 @@ public class ContractDistributorStandardServiceImpl extends
                 .set(ContractDistributorStandard::getCode, vo.getCode())
                 .set(ContractDistributorStandard::getSupplier, vo.getSupplier())
                 .set(ContractDistributorStandard::getBuyer, vo.getBuyer())
+                .set(vo.getDeptId() != null, ContractDistributorStandard::getDeptId, vo.getDeptId())
                 .set(vo.getRegion() != null, ContractDistributorStandard::getRegion, vo.getRegion())
+                .set(vo.getStockUpCompanyId() != null, ContractDistributorStandard::getStockUpCompanyId, vo.getStockUpCompanyId())
                 .set(ContractDistributorStandard::getOrderDate, vo.getOrderDate())
                 .set(ContractDistributorStandard::getUnit, vo.getUnit())
                 .set(ContractDistributorStandard::getWorkshopId, vo.getWorkshopId())
@@ -633,6 +636,8 @@ public class ContractDistributorStandardServiceImpl extends
         createPurchaseOrderInfoVo.setTotalQuantity(contractDistributorStandard.getTotalQuantity());
         createPurchaseOrderInfoVo.setContractCreateById(contractDistributorStandard.getCreateById());
         createPurchaseOrderInfoVo.setDeptId(contractDistributorStandard.getDeptId());
+        createPurchaseOrderInfoVo.setRegion(contractDistributorStandard.getRegion());
+        createPurchaseOrderInfoVo.setStockUpCompanyId(contractDistributorStandard.getStockUpCompanyId());
         createPurchaseOrderInfoVo.setWorkshopId(contractDistributorStandard.getWorkshopId());
         createPurchaseOrderInfoVo.setExecutionStandard(contractDistributorStandard.getExecutionStandard());
         createPurchaseOrderInfoVo.setExecutionStandardRemarks(contractDistributorStandard.getExecutionStandardRemarks());

@@ -218,6 +218,12 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         if (!StringUtil.isBlank(vo.getDeptId())) {
             data.setDeptId(vo.getDeptId());
         }
+        if (!StringUtil.isBlank(vo.getRegion())) {
+            data.setRegion(vo.getRegion());
+        }
+        if (!StringUtil.isBlank(vo.getStockUpCompanyId())) {
+            data.setStockUpCompanyId(vo.getStockUpCompanyId());
+        }
         if (!StringUtil.isBlank(vo.getWorkshopId())) {
             data.setWorkshopId(vo.getWorkshopId());
         }
@@ -293,7 +299,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
                 .set(PurchaseOrderInfo::getStatus, StringUtil.isBlank(vo.getStatus()) ? null : vo.getStatus())
                 .set(PurchaseOrderInfo::getExamineStatus, "AUDIT")//审核中
                 .set(vo.getProductionProcess() != null, PurchaseOrderInfo::getProductionProcess, StringUtil.isBlank(vo.getProductionProcess()) ? null : vo.getProductionProcess())
-                .set(PurchaseOrderInfo::getDeptId, StringUtil.isBlank(vo.getDeptId()) ? null : vo.getDeptId())
+                .set(vo.getDeptId() != null, PurchaseOrderInfo::getDeptId, StringUtil.isBlank(vo.getDeptId()) ? null : vo.getDeptId())
                 .set(PurchaseOrderInfo::getWorkshopId, StringUtil.isBlank(vo.getWorkshopId()) ? null : vo.getWorkshopId())
                 .set(PurchaseOrderInfo::getCustomerCreditId, StringUtil.isBlank(vo.getCustomerCreditId()) ? null : vo.getCustomerCreditId())
                 .set(PurchaseOrderInfo::getTotalQuantity, vo.getTotalQuantity() == null ? null : vo.getTotalQuantity())

@@ -109,6 +109,7 @@ public class ReplenishmentOrderServiceImpl extends BaseMpServiceImpl<Replenishme
         data.setCode(vo.getCode());
         data.setWorkshopId(vo.getWorkshopId());
         data.setDeptId(vo.getDeptId());
+        data.setRegion(vo.getRegion());
         data.setCustomerId(vo.getCustomerId());
         data.setOriginPlanShipDate(vo.getOriginPlanShipDate());
         data.setPurchaseOrderId(vo.getPurchaseOrderId());
@@ -297,6 +298,8 @@ public class ReplenishmentOrderServiceImpl extends BaseMpServiceImpl<Replenishme
         vo.setDeliveryMethod(purchaseOrderInfo.getDeliveryMethod());
         vo.setContractCreateById(purchaseOrderInfo.getContractCreateById());
         vo.setDeptId(purchaseOrderInfo.getDeptId());
+        vo.setRegion(purchaseOrderInfo.getRegion());
+        vo.setStockUpCompanyId(purchaseOrderInfo.getStockUpCompanyId());
         vo.setWorkshopId(purchaseOrderInfo.getWorkshopId());
         vo.setExecutionStandard(purchaseOrderInfo.getExecutionStandard());
         vo.setExecutionStandardRemarks(purchaseOrderInfo.getExecutionStandardRemarks());

@@ -121,36 +121,65 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         List<String> deptIds = new ArrayList<>();
         for (ShipmentsOrderInfo orderInfo : shipmentsOrderList) {
             String deptId = orderInfo.getDeptId();
-            if (StringUtils.isBlank(deptId)) {
-                continue;
+            String region = orderInfo.getRegion();
+            if (!StringUtils.isBlank(deptId)) {
+                String[] split = deptId.split(",");
+                Collections.addAll(deptIds, split);
+            }
+            if (!StringUtils.isBlank(region)) {
+                String[] split = region.split(",");
+                Collections.addAll(deptIds, split);
             }
-            String[] split = deptId.split(",");
-            Collections.addAll(deptIds, split);
         }
         Map<String, SysDept> deptMap = new HashMap<>();
         if (CollectionUtils.isNotEmpty(deptIds)) {
+            deptIds = deptIds.stream().distinct().collect(Collectors.toList());
             List<SysDept> deptList = sysDeptService.listByIds(deptIds);
             deptMap = deptList.stream().collect(Collectors.toMap(SysDept::getId, Function.identity()));
         }
         for (ShipmentsOrderInfo orderInfo : shipmentsOrderList) {
             String deptId = orderInfo.getDeptId();
-            if (StringUtils.isBlank(deptId)) {
-                continue;
-            }
-            String[] split = deptId.split(",");
-            if (split.length > 1) {
-                StringBuilder builder = new StringBuilder();
-                for (int i = 0; i < split.length; i++) {
-                    builder.append(split[i]);
-                    builder.append(",");
+            String region = orderInfo.getRegion();
+            if (!StringUtils.isBlank(deptId)) {
+                String[] split = deptId.split(",");
+                if (split.length > 1) {
+                    StringBuilder builder = new StringBuilder();
+                    for (int i = 0; i < split.length; i++) {
+                        SysDept sysDept = deptMap.get(split[i]);
+                        if (sysDept != null) {
+                            builder.append(sysDept.getName());
+                            builder.append(",");
+                        }
+                    }
+                    builder.deleteCharAt(builder.length() - 1);
+
+                    orderInfo.setDeptName(builder.toString());
+                } else {
+                    SysDept sysDept = deptMap.get(split[0]);
+                    if (sysDept != null) {
+                        orderInfo.setDeptName(sysDept.getName());
+                    }
                 }
-                builder.deleteCharAt(builder.length() - 1);
+            }
+            if (!StringUtils.isBlank(region)) {
+                String[] split = region.split(",");
+                if (split.length > 1) {
+                    StringBuilder builder = new StringBuilder();
+                    for (int i = 0; i < split.length; i++) {
+                        SysDept sysDept = deptMap.get(split[i]);
+                        if (sysDept != null) {
+                            builder.append(sysDept.getName());
+                            builder.append(",");
+                        }
+                    }
+                    builder.deleteCharAt(builder.length() - 1);
 
-                orderInfo.setDeptName(builder.toString());
-            } else {
-                SysDept sysDept = deptMap.get(split[0]);
-                if (sysDept != null) {
-                    orderInfo.setDeptName(sysDept.getName());
+                    orderInfo.setRegionName(builder.toString());
+                } else {
+                    SysDept sysDept = deptMap.get(split[0]);
+                    if (sysDept != null) {
+                        orderInfo.setRegionName(sysDept.getName());
+                    }
                 }
             }
         }
@@ -189,6 +218,20 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             }
             orderInfo.setDeptName(builder.toString());
         }
+        //区域
+        String region = orderInfo.getRegion();
+        if (StringUtils.isNotBlank(region)) {
+            String[] split = region.split(",");
+            List<SysDept> deptList = sysDeptService.listByIds(Arrays.asList(split));
+            StringBuilder builder = new StringBuilder();
+            for (SysDept dept : deptList) {
+                builder.append(dept.getName()).append(",");
+            }
+            if (builder.length() > 0) {
+                builder.deleteCharAt(builder.length() - 1);
+            }
+            orderInfo.setRegionName(builder.toString());
+        }
         // 获取发货单明细数据
         List<ShipmentsPlanDetail> detailList = shipmentsPlanDetailService.listByShipmentOrderId(id);
         orderInfo.setDetailList(detailList);
@@ -207,6 +250,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         data.setWorkshopId(vo.getWorkshopId());
         data.setShipmentsDate(vo.getShipmentsDate());
         data.setDeptId(vo.getDeptId());
+        data.setRegion(vo.getRegion());
         data.setDeliveryType(vo.getDeliveryType());
         data.setDestination(vo.getDestination());
 
@@ -466,6 +510,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         Map<String, BigDecimal> quantityMap = new HashMap<>();
         Map<String, String> shipmentsOrderIdMap = new HashMap<>();
         Map<String, List<String>> deptIdMap = new HashMap<>();
+        Map<String, List<String>> regionMap = new HashMap<>();
         List<String> detailIds = new ArrayList<>();
         List<ShipmentsOrderInfo> shipmentsOrderInfoList = new ArrayList<>();
         for (List<ShipmentsPlanDetail> details : batchList) {
@@ -493,6 +538,11 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
                 if (!list.contains(orderInfo.getDeptId())) {
                     list.add(orderInfo.getDeptId());
                 }
+                //区域
+                List<String> regionList = regionMap.computeIfAbsent(id, k -> new ArrayList<>());
+                if (!regionList.contains(orderInfo.getRegion())) {
+                    regionList.add(orderInfo.getRegion());
+                }
                 // 交货方式
                 String deliveryMethod = orderInfo.getDeliveryMethod();
                 if (StringUtils.isNotBlank(deliveryMethod) && !deliveryTypeSet.contains(deliveryMethod)) {
@@ -556,13 +606,18 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             shipmentsPlanDetailService.setShipmentsOrderId(detailIds, id);
         }
         // 获取所有部门数据
-        for ( ShipmentsOrderInfo orderInfo : shipmentsOrderInfoList) {
+        for (ShipmentsOrderInfo orderInfo : shipmentsOrderInfoList) {
             String id = orderInfo.getId();
             List<String> deptIds = deptIdMap.get(id);
             if (CollectionUtils.isNotEmpty(deptIds)) {
                 String deptIdStr = String.join(",", deptIds);
                 orderInfo.setDeptId(deptIdStr);
             }
+            List<String> regionList = regionMap.get(id);
+            if (CollectionUtils.isNotEmpty(regionList)) {
+                String regionStr = String.join(",", regionList);
+                orderInfo.setRegion(regionStr);
+            }
         }
         // 批量新增发货单
         batchAdd(shipmentsOrderInfoList);

@@ -47,14 +47,15 @@ public class CreateContractDistributorStandardVo implements BaseVo, Serializable
     private String buyer;
 
     /**
-     * 备货单位
+     * 备货单位ID
      */
-    @ApiModelProperty(value = "备货单位")
-    private String stockUpCompany;
+    @ApiModelProperty(value = "备货单位", required = true)
+    private String stockUpCompanyId;
 
     /**
      * 办事处
      */
+    @ApiModelProperty(value = "办事处", required = true)
     private String deptId;
 
     /**

@@ -49,10 +49,16 @@ public class UpdateContractDistributorStandardVo implements BaseVo, Serializable
     private String buyer;
 
     /**
-     * 备货单位
+     * 备货单位ID
      */
-    @ApiModelProperty(value = "备货单位")
-    private String stockUpCompany;
+    @ApiModelProperty("备货单位")
+    private String stockUpCompanyId;
+
+    /**
+     * 办事处ID
+     */
+    @ApiModelProperty("办事处")
+    private String deptId;
 
     /**
      * 区域

@@ -184,6 +184,18 @@ public class CreatePurchaseOrderInfoVo implements BaseVo, Serializable {
     private String deptId;
 
     /**
+     * 区域
+     */
+    @ApiModelProperty("区域")
+    private String region;
+
+    /**
+     * 备货单位ID
+     */
+    @ApiModelProperty("备货单位ID")
+    private String stockUpCompanyId;
+
+    /**
      * 生产厂
      */
     @ApiModelProperty("生产厂")

@@ -40,6 +40,13 @@ public class CreateReplenishmentOrderVo implements BaseVo, Serializable {
     private String deptId;
 
     /**
+     * 区域
+     */
+    @ApiModelProperty(value = "区域")
+    @Length(message = "区域最多允许32个字符！")
+    private String region;
+
+    /**
      * 购货单位
      */
     @ApiModelProperty(value = "购货单位")

@@ -56,6 +56,14 @@ public class CreateShipmentsOrderInfoVo implements BaseVo, Serializable {
     private String deptId;
 
     /**
+     * 区域ID
+     */
+    @ApiModelProperty(value = "区域ID", required = true)
+    @NotBlank(message = "请输入区域ID！")
+    @Length(message = "区域ID最多允许500个字符！")
+    private String region;
+
+    /**
      * 交货方式
      */
     @ApiModelProperty(value = "交货方式", required = true)

@@ -8,6 +8,8 @@
         <result column="supplier" property="supplier"/>
         <result column="buyer" property="buyer"/>
         <result column="dept_id" property="deptId"/>
+        <result column="region" property="region"/>
+        <result column="stock_up_company_id" property="stockUpCompanyId"/>
         <result column="order_date" property="orderDate"/>
         <result column="unit" property="unit"/>
         <result column="workshop_id" property="workshopId"/>
@@ -70,6 +72,7 @@
                tb.buyer,
                tb.dept_id,
                tb.region,
+               tb.stock_up_company_id,
                tb.order_date,
                tb.unit,
                tb.workshop_id,

@@ -32,6 +32,10 @@
         <result column="production_process" property="productionProcess"/>
         <result column="dept_id" property="deptId"/>
         <result column="dept_name" property="deptName"/>
+        <result column="region" property="region"/>
+        <result column="region_name" property="regionName"/>
+        <result column="stock_up_company_id" property="stockUpCompanyId"/>
+        <result column="stock_up_company_name" property="stockUpCompanyName"/>
         <result column="workshop_id" property="workshopId"/>
         <result column="workshop_name" property="workshopName"/>
         <result column="customer_credit_id" property="customerCreditId"/>
@@ -81,6 +85,10 @@
             tb.production_process,
             tb.dept_id,
             sd.name AS dept_name,
+            tb.region,
+            sd1.name AS region_name,
+            tb.stock_up_company_id,
+            cu1.name AS stock_up_company_name,
             tb.workshop_id,
             ws.name AS workshop_name,
             tb.customer_credit_id,
@@ -103,6 +111,8 @@
         left join base_data_workshop as ws on ws.id = tb.workshop_id
         left join customer_credit as cc on cc.id = tb.customer_credit_id
         left join sys_user as su on su.id = tb.contract_create_by_id
+        left join sys_dept as sd1 on sd1.id = tb.region
+        left join base_data_customer as cu1 on cu1.id = tb.stock_up_company_id
     </sql>
 
     <select id="query" resultMap="PurchaseOrderInfo">