Merge remote-tracking branch 'origin/develop' into develop

huhai
2 parents 068795cc e4b78a2b
Showing 262 changed files with 8193 additions and 2336 deletions
.idea/workspace.xml
src/main/java/com/huaheng/api/general/controller/ReceiptController.java
src/main/java/com/huaheng/api/general/domain/Receipt.java
src/main/java/com/huaheng/api/general/service/ReceiptService.java
src/main/java/com/huaheng/api/wcs/controller/EmptyOutHandle.java
src/main/java/com/huaheng/api/wcs/controller/OverrideHandle.java
src/main/java/com/huaheng/api/wcs/controller/TaskFinish.java
src/main/java/com/huaheng/api/wcs/controller/WarecellAllocation.java
src/main/java/com/huaheng/api/wcs/domain/TaskDetails.java
src/main/java/com/huaheng/api/wcs/domain/TaskFinishDomain.java
src/main/java/com/huaheng/api/wcs/domain/WcsTask.java
src/main/java/com/huaheng/api/wcs/service/emptyOutHandle/EmptyOutHandleService.java
src/main/java/com/huaheng/api/wcs/service/emptyOutHandle/EmptyOutHandleServiceImpl.java
src/main/java/com/huaheng/api/wcs/service/overrideHandle/OverrideHandleService.java
src/main/java/com/huaheng/api/wcs/service/overrideHandle/OverrideHandleServiceImpl.java
src/main/java/com/huaheng/api/wcs/service/stationInfo/StationInfoService.java
src/main/java/com/huaheng/api/wcs/service/stationInfo/StationInfoServiceImpl.java
src/main/java/com/huaheng/api/wcs/service/taskAssignService/TaskAssignService.java
src/main/java/com/huaheng/api/wcs/service/taskAssignService/TaskAssignServiceImpl.java
src/main/java/com/huaheng/api/wcs/service/taskCancel/TaskCancelService.java
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="baeae966-16bb-4f97-a411-22fe5a65cefd" name="Default Changelist" comment="修改入库首选项页面，规则">
+    <list default="true" id="baeae966-16bb-4f97-a411-22fe5a65cefd" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/FilterConfigHeader/controller/FilterConfigHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/FilterConfigHeader/controller/FilterConfigHeaderController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/mapper/ContainerMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/mapper/ContainerMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiving/controller/ReceivingController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiving/controller/ReceivingController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/config/ContainerMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/ContainerMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkingRegister/controller/CheckingRegisterController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkingRegister/controller/CheckingRegisterController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkingRegister/service/CheckingRegisterService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkingRegister/service/CheckingRegisterService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/statusFlow/controller/StatusFlowHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/statusFlow/controller/StatusFlowHeaderController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/templates/config/filterConfigHeader/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/config/filterConfigHeader/add.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/config/filterConfigHeader/filterConfigHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/config/filterConfigHeader/filterConfigHeader.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/edit.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/config/receiptType/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/config/receiptType/add.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/config/statusFlowHeader/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/config/statusFlowHeader/add.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/config/statusFlowHeader/statusFlowHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/config/statusFlowHeader/statusFlowHeader.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiving/receiving.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiving/receiving.html" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -167,7 +158,17 @@
       <serviceView>
         <option name="contentProportion" value="0.1612554" />
         <treeState>
-          <expand />
+          <expand>
+            <path>
+              <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
+              <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@c531c3e8" type="7427dc5b:ServiceModel$ServiceGroupNode" />
+            </path>
+            <path>
+              <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
+              <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@c531c3e8" type="7427dc5b:ServiceModel$ServiceGroupNode" />
+              <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@ef9dc71e" type="7427dc5b:ServiceModel$ServiceGroupNode" />
+            </path>
+          </expand>
           <select />
         </treeState>
       </serviceView>
@@ -270,7 +271,7 @@
       <workItem from="1569745589865" duration="2739000" />
       <workItem from="1569748443357" duration="438000" />
       <workItem from="1569803438585" duration="13789000" />
-      <workItem from="1570581146682" duration="827000" />
+      <workItem from="1570581146682" duration="9295000" />
     </task>
     <task id="LOCAL-00001" summary="修改添加物料时使用物料类别生成物料编码">
       <created>1567664306836</created>
@@ -503,7 +504,14 @@
       <option name="project" value="LOCAL" />
       <updated>1569743042718</updated>
     </task>
-    <option name="localTasksCounter" value="34" />
+    <task id="LOCAL-00034" summary="添加根据容器编码查找容器的方法&#10;配置规则添加自动添加模块类型&#10;添加是否自动生成临时容器">
+      <created>1570582333467</created>
+      <option name="number" value="00034" />
+      <option name="presentableId" value="LOCAL-00034" />
+      <option name="project" value="LOCAL" />
+      <updated>1570582333467</updated>
+    </task>
+    <option name="localTasksCounter" value="35" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -524,7 +532,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="修改入库类型自动判断" />
     <MESSAGE value="修改入库单页面" />
     <MESSAGE value="修改入库单页面，入库单审核，质检页面后台跳转接口" />
     <MESSAGE value="修改 入库收货，生成上架任务自动执行定位" />
@@ -549,7 +556,8 @@
     <MESSAGE value="修改容器新增时容器enable状态" />
     <MESSAGE value="修改入库组盘页面中任务类型的显示问题&#10;修改任务完成不修改入库组盘状态的问题" />
     <MESSAGE value="添加根据code查询物料" />
-    <option name="LAST_COMMIT_MESSAGE" value="添加根据code查询物料" />
+    <MESSAGE value="添加根据容器编码查找容器的方法&#10;配置规则添加自动添加模块类型&#10;添加是否自动生成临时容器" />
+    <option name="LAST_COMMIT_MESSAGE" value="添加根据容器编码查找容器的方法&#10;配置规则添加自动添加模块类型&#10;添加是否自动生成临时容器" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -566,12 +574,12 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkingRegister/controller/CheckingRegisterController.java</url>
-          <line>172</line>
+          <line>174</line>
           <option name="timeStamp" value="28" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java</url>
-          <line>618</line>
+          <line>631</line>
           <option name="timeStamp" value="48" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
@@ -584,6 +592,16 @@
           <line>84</line>
           <option name="timeStamp" value="51" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/statusFlow/controller/StatusFlowHeaderController.java</url>
+          <line>86</line>
+          <option name="timeStamp" value="57" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkingRegister/controller/CheckingRegisterController.java</url>
+          <line>145</line>
+          <option name="timeStamp" value="62" />
+        </line-breakpoint>
         <line-breakpoint enabled="true" type="javascript">
           <url>file://$PROJECT_DIR$/src/main/resources/templates/check/checkingRegister/checkingRegister.html</url>
           <line>308</line>
+package com.huaheng.api.general.controller;
+
+import com.huaheng.api.general.domain.Receipt;
+import com.huaheng.api.general.service.ReceiptService;
+import com.huaheng.framework.aspectj.lang.annotation.Log;
+import com.huaheng.framework.aspectj.lang.constant.BusinessType;
+import com.huaheng.framework.web.domain.AjaxResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * Created by Enzo Cotter on 2019/11/4.
+ * @author mahuandong
+ */
+@RestController
+@RequestMapping("/api/receipt")
+@Api(tags = {"basicData"}, description = "入库接口")
+public class ReceiptController {
+
+    @Resource
+    private ReceiptService receiptService;
+
+    /**
+     * 入库单下发
+     */
+    @Log(title = "入库单下发", action = BusinessType.INSERT)
+    @PostMapping("/insertReceipt")
+    @ApiOperation("入库单下发接口")
+    @ResponseBody
+    public AjaxResult MaterialApi(@RequestBody Receipt receipt) {
+        System.out.println("————————开始接收入库单——————————");
+        System.out.println(receipt);
+        AjaxResult ajaxResult = receiptService.insertReceipt(receipt);
+        return ajaxResult;
+    }
+
+}
+package com.huaheng.api.general.domain;
+
+import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
+import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by Enzo Cotter on 2019/11/4.
+ * @author mahuandong
+ */
+@Data
+public class Receipt {
+
+    private ReceiptHeader receiptHeader;
+
+    private List<ReceiptDetail> receiptDetails;
+}
+package com.huaheng.api.general.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huaheng.api.general.domain.Receipt;
+import com.huaheng.common.exception.service.ServiceException;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.config.FilterConfigDetail.domain.FilterConfigDetail;
+import com.huaheng.pc.config.FilterConfigDetail.service.FilterConfigDetailService;
+import com.huaheng.pc.config.company.domain.Company;
+import com.huaheng.pc.config.company.service.CompanyService;
+import com.huaheng.pc.config.material.domain.Material;
+import com.huaheng.pc.config.material.service.MaterialService;
+import com.huaheng.pc.config.receiptType.domain.ReceiptType;
+import com.huaheng.pc.config.receiptType.service.ReceiptTypeService;
+import com.huaheng.pc.config.statusFlow.domain.StatusFlowHeader;
+import com.huaheng.pc.config.statusFlow.service.StatusFlowHeaderService;
+import com.huaheng.pc.config.supplier.domain.Supplier;
+import com.huaheng.pc.config.supplier.service.SupplierService;
+import com.huaheng.pc.config.warehouse.domain.Warehouse;
+import com.huaheng.pc.config.warehouse.service.WarehouseService;
+import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
+import com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailService;
+import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
+import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * Created by Enzo Cotter on 2019/11/4.
+ * @author mahuandong
+ */
+@Component
+@Transactional(rollbackFor = Exception.class)
+public class ReceiptService {
+
+    @Resource
+    private ReceiptHeaderService receiptHeaderService;
+    @Resource
+    private ReceiptDetailService receiptDetailService;
+    @Resource
+    private ReceiptTypeService receiptTypeService;
+    @Resource
+    private WarehouseService warehouseService;
+    @Resource
+    private CompanyService companyService;
+    @Resource
+    private MaterialService materialService;
+    @Resource
+    private SupplierService supplierService;
+    @Resource
+    private FilterConfigDetailService filterConfigDetailService;
+    @Resource
+    private StatusFlowHeaderService statusFlowHeaderService;
+    /**
+     * 入库单下发
+     * @param receipt 入库单
+     * @return 是否下发成功
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult insertReceipt(Receipt receipt){
+
+        /* 0.step 获取入库头表，获取入库明细*/
+        ReceiptHeader receiptHeader = receipt.getReceiptHeader();
+        List<ReceiptDetail> receiptDetails = receipt.getReceiptDetails();
+        /* 1.step 校验入库单是否为空*/
+        if (receiptHeader == null || receiptDetails.isEmpty()){
+            throw new ServiceException("入库主单或入库子单为空");
+        }
+        /* 2.step 检查入库头表合法性*/
+        AjaxResult checkReceiptHeaderResult = checkReceiptHeader(receiptHeader);
+        if (checkReceiptHeaderResult.hasErr() ){
+            return AjaxResult.error(checkReceiptHeaderResult.getMsg());
+        }
+
+        /* 3.step 检查入库明细合法性*/
+        AjaxResult checkReceiptDetailResult = checkReceiptDetail(receiptDetails);
+        if (checkReceiptDetailResult.hasErr() ){
+            return AjaxResult.error(checkReceiptDetailResult.getMsg());
+        }
+
+        /* 4.step 计算入库明细总行数、总数量*/
+        BigDecimal totalQty = new BigDecimal(0);
+        for (ReceiptDetail receiptDetail: receiptDetails) {
+           totalQty.add(receiptDetail.getTotalQty());
+        }
+        receiptHeader.setTotalLines(receiptDetails.size());
+        receiptHeader.setTotalQty(totalQty);
+
+        /* 5.step 保存的入库头表*/
+        if (!receiptHeaderService.save(receiptHeader)){
+            throw new ServiceException("保存入库头表失败");
+        }
+
+        /* 6.step 保存入库明细*/
+        LambdaQueryWrapper<ReceiptHeader> lambda = Wrappers.lambdaQuery();
+        lambda.eq(ReceiptHeader::getWarehouseCode, receiptHeader.getWarehouseCode())
+                .eq(ReceiptHeader::getCode, receiptHeader.getCode());
+        receiptHeader = receiptHeaderService.getOne(lambda);
+        for (ReceiptDetail receiptDetail : receiptDetails) {
+            receiptDetail.setReceiptId(receiptHeader.getId());
+            receiptDetail.setReceiptCode(receiptHeader.getCode());
+            receiptDetail.setWarehouseCode(receiptHeader.getWarehouseCode());
+            receiptDetail.setCompanyCode(receiptHeader.getWarehouseCode());
+            Material material = materialService.findAllByCode(receiptDetail.getMaterialCode());
+            receiptDetail.setMaterialName(material.getName());
+            receiptDetail.setMaterialSpec(material.getSpec());
+            receiptDetail.setMaterialUnit(material.getUnit());
+            if (!receiptDetailService.save(receiptDetail)){
+                throw new ServiceException("保存入库明细失败");
+            }
+        }
+
+        return AjaxResult.success("成功");
+    }
+
+    /**
+     * 检查入库头表合法性
+     * @param receiptHeader 入库头表
+     * @return 检查结果
+     */
+    private AjaxResult checkReceiptHeader(ReceiptHeader receiptHeader){
+        /* 0.step 必填项是否为空*/
+        if (StringUtils.isEmpty(receiptHeader.getCode()) || StringUtils.isEmpty(receiptHeader.getCompanyCode()) ||
+                StringUtils.isEmpty(receiptHeader.getWarehouseCode()) || StringUtils.isEmpty(receiptHeader.getReceiptType())){
+            return AjaxResult.error("入库主单字段有误");
+        }
+
+        /* 1.step 查询该单据编码是否已存在*/
+        LambdaQueryWrapper<ReceiptHeader> receiptHeaderLambda = Wrappers.lambdaQuery(receiptHeader);
+        if (receiptHeaderService.getOne(receiptHeaderLambda) != null){
+            return AjaxResult.error("该单据已存在："+receiptHeader.getCode());
+        }
+
+        /* 2.step 判断入库类型是否匹配*/
+        LambdaQueryWrapper<ReceiptType> receiptTypeLambda = Wrappers.lambdaQuery();
+        receiptTypeLambda.eq(ReceiptType::getCode, receiptHeader.getReceiptType());
+        if (receiptTypeService.getOne(receiptTypeLambda) == null){
+            return AjaxResult.error("没有对应的入库单类型");
+        }
+
+        /* 3.step 判断仓库是否存在*/
+        LambdaQueryWrapper<Warehouse> warehouseLambda = Wrappers.lambdaQuery();
+        warehouseLambda.eq(Warehouse::getCode, receiptHeader.getWarehouseCode());
+        if (warehouseService.getOne(warehouseLambda) == null){
+            return AjaxResult.error("该仓库不存在");
+        }
+
+        /* 4.step 判断货主是否存在*/
+        LambdaQueryWrapper<Company> companyLambda = Wrappers.lambdaQuery();
+        companyLambda.eq(Company::getCode, receiptHeader.getCompanyCode());
+        if (companyService.getOne(companyLambda) == null){
+            return AjaxResult.error("该货主不存在");
+        }
+
+        return AjaxResult.success("");
+    }
+
+    /**
+     * 检查入库明细合法性
+     * @param receiptDetails 入库明细
+     * @return 检查结果
+     */
+    private AjaxResult checkReceiptDetail(List<ReceiptDetail> receiptDetails){
+
+        for (ReceiptDetail receiptDetail: receiptDetails) {
+            /* 0.step 判断必填字段是否为空且总数量不能为0*/
+            if (receiptDetail.getMaterialCode() == null ||
+                    new BigDecimal(0).compareTo(receiptDetail.getTotalQty() != null ?
+                            receiptDetail.getTotalQty() : new BigDecimal(0)) == 0 ){
+                return AjaxResult.error("入库明细字段有误");
+            }
+
+            /* 1.step 判断供应商是否存在*/
+            if (receiptDetail.getSupplierCode() != null){
+                LambdaQueryWrapper<Supplier> supplierLambda = Wrappers.lambdaQuery();
+                supplierLambda.eq(Supplier::getCode, receiptDetail.getSupplierCode());
+                if (supplierService.getOne(supplierLambda) == null) {
+                    return AjaxResult.error("供应商不存在");
+                }
+            }
+
+            /* 2.step 判断定位规则是否存在*/
+            if (receiptDetail.getLocatingRule() != null){
+                LambdaQueryWrapper<FilterConfigDetail> filterConfigDetailLambda = Wrappers.lambdaQuery();
+                filterConfigDetailLambda.eq(FilterConfigDetail::getCode, receiptDetail.getLocatingRule())
+                        .eq(FilterConfigDetail::getModuleType, "receipt")
+                        .eq(FilterConfigDetail::getRecordType, "locationRule");
+                FilterConfigDetail filterConfigDetail = filterConfigDetailService.getOne(filterConfigDetailLambda);
+                if (filterConfigDetail == null){
+                    return AjaxResult.error(receiptDetail.getLocatingRule()+"定位规则不存在");
+                }
+            }
+
+            /* 3.step 判断流程编码是否存在*/
+            if (receiptDetail.getStatusFlowCode() != null){
+                LambdaQueryWrapper<StatusFlowHeader> statusFlowHeaderLambda = Wrappers.lambdaQuery();
+                statusFlowHeaderLambda.eq(StatusFlowHeader::getCode, receiptDetail.getStatusFlowCode())
+                        .eq(StatusFlowHeader::getModuleType, "receipt")
+                        .eq(StatusFlowHeader::getRecordType, "receivingFlow");
+                StatusFlowHeader statusFlowHeader = statusFlowHeaderService.getOne(statusFlowHeaderLambda);
+                if (statusFlowHeader == null){
+                    return AjaxResult.error(receiptDetail.getLocatingRule()+"该流程不存在");
+                }
+            }
+        }
+
+        return AjaxResult.success("");
+    }
+
+}
+package com.huaheng.api.wcs.controller;
+
+import com.huaheng.api.wcs.domain.WcsTask;
+import com.huaheng.api.wcs.service.emptyOutHandle.EmptyOutHandleService;
+import com.huaheng.api.wcs.service.overrideHandle.OverrideHandleService;
+import com.huaheng.framework.aspectj.lang.annotation.Log;
+import com.huaheng.framework.aspectj.lang.constant.BusinessType;
+import com.huaheng.framework.web.controller.BaseController;
+import com.huaheng.framework.web.domain.AjaxResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**空出处理接口
+ * wcs向wms传递数据
+ * @author ricard
+ * @date   2019/10/11
+ *
+ */
+
+@RestController
+@RequestMapping("/api/WCS/v2")
+public class EmptyOutHandle extends BaseController {
+
+    @Resource
+    private EmptyOutHandleService emptyOutHandleService;
+
+    @Log(title = "wcs空出处理", action = BusinessType.INSERT)
+    @PostMapping("/EmptyOutHandle")
+    @ApiOperation("wcs空出处理")
+    @ResponseBody
+    public AjaxResult EmptyOutHandle(@RequestBody WcsTask wcsTask)
+    {
+        AjaxResult ajaxResult =emptyOutHandleService.EmptyOutHandle(wcsTask) ;
+        return ajaxResult;
+    }
+
+
+}
+package com.huaheng.api.wcs.controller;
+
+import com.huaheng.api.wcs.domain.TaskFinishDomain;
+import com.huaheng.api.wcs.service.overrideHandle.OverrideHandleService;
+import com.huaheng.framework.aspectj.lang.annotation.Log;
+import com.huaheng.framework.aspectj.lang.constant.BusinessType;
+import com.huaheng.framework.web.controller.BaseController;
+import com.huaheng.framework.web.domain.AjaxResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**重入处理接口
+ * wcs向wms传递数据
+ * @author ricard
+ * @date   2019/10/11
+ *
+ */
+
+@RestController
+@RequestMapping("/api/WCS/v2")
+public class OverrideHandle extends BaseController {
+
+    @Resource
+    private OverrideHandleService overrideHandleService;
+
+    @Log(title = "wcs重入处理", action = BusinessType.INSERT)
+    @PostMapping("/OverrideHandle")
+    @ApiOperation("wcs重入处理")
+    @ResponseBody
+    public AjaxResult OverrideHandle(@RequestBody TaskFinishDomain taskFinishDomain)
+    {
+        AjaxResult ajaxResult =overrideHandleService.OverrideHandle(taskFinishDomain) ;
+        return ajaxResult;
+    }
+
+
+}
+package com.huaheng.api.wcs.controller;
+
+import com.huaheng.api.wcs.domain.TaskFinishDomain;
+import com.huaheng.api.wcs.domain.WcsTask;
+import com.huaheng.api.wcs.service.taskFinish.TaskFinishService;
+import com.huaheng.framework.aspectj.lang.annotation.Log;
+import com.huaheng.framework.aspectj.lang.constant.BusinessType;
+import com.huaheng.framework.web.controller.BaseController;
+import com.huaheng.framework.web.domain.AjaxResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**任务完成
+ * wcs向wms传递数据
+ * @author ricard
+ * @date   2019/10/11
+ *
+ */
+
+@RestController
+@RequestMapping("/api/WCS/v2")
+public class TaskFinish extends BaseController {
+
+    @Resource
+    private TaskFinishService taskFinishService;
+
+    @Log(title = "wcs任务完成", action = BusinessType.INSERT)
+    @PostMapping("/TaskFinish")
+    @ApiOperation("wcs任务完成")
+    @ResponseBody
+    public AjaxResult TaskFinish(@RequestBody TaskFinishDomain taskFinishDomain)
+    {
+        AjaxResult ajaxResult =taskFinishService.completeTaskByWCS(taskFinishDomain) ;
+        return ajaxResult;
+    }
+
+
+}
+package com.huaheng.api.wcs.controller;
+
+import com.huaheng.api.wcs.domain.WcsTask;
+import com.huaheng.api.wcs.service.emptyOutHandle.EmptyOutHandleService;
+import com.huaheng.api.wcs.service.warecellAllocation.WarecellAllocationService;
+import com.huaheng.framework.aspectj.lang.annotation.Log;
+import com.huaheng.framework.aspectj.lang.constant.BusinessType;
+import com.huaheng.framework.web.controller.BaseController;
+import com.huaheng.framework.web.domain.AjaxResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**仓位分配 接口
+ * wcs向wms传递数据
+ * @author ricard
+ * @date   2019/10/11
+ *
+ */
+
+@RestController
+@RequestMapping("/api/WCS/v2")
+public class WarecellAllocation extends BaseController {
+
+    @Resource
+    private WarecellAllocationService warecellAllocationService;
+
+    @Log(title = "wcs仓位分配", action = BusinessType.INSERT)
+    @PostMapping("/WarecellAllocation")
+    @ApiOperation(value="wcs仓位分配", notes="wcs仓位分配", httpMethod = "POST")
+    @ResponseBody
+    public AjaxResult WarecellAllocation(@RequestBody WcsTask wcsTask)
+    {
+        AjaxResult ajaxResult =warecellAllocationService.WarecellAllocation(wcsTask) ;
+        return ajaxResult;
+    }
+
+
+}
+package com.huaheng.api.wcs.domain;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Created by Enzo Cotter on 2019/10/15.
+ */
+@Data
+public class TaskDetails {
+
+    //关联行号，string (50)，默认0 ",必填
+    private String referLineNo;
+
+    //物料编码，string (50)，默认0 ",必填
+    private String materialCode;
+
+    //物料名称
+    private String materialName;
+
+    //数量，float，默认“0” ,必填"
+    private BigDecimal qty;
+
+    //单位，string（20），默认“PCS” ,必填"
+    private String unit;
+}
+package com.huaheng.api.wcs.domain;
+
+import lombok.Data;
+
+/**
+ * 任务完成和重入实体类
+ * Created by Enzo Cotter on 2019/10/15.
+ */
+@Data
+public class TaskFinishDomain {
+
+    //任务号
+    private String taskNo;
+
+    //重入，int，1：重入  0：正常，必填
+    private Integer isDoubleIn;
+
+    //空出，int，1：空出  0：正常，必填
+    private Integer isEmptyOut;
+
+    //重入的库位编码，string (50)，默认0，必填
+    private String redirectionLocationCode;
+
+    //目的位置编码，string (50)，默认0 ",必填
+    private String toLocationCode;
+}
+package com.huaheng.api.wcs.domain;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * wcs任务接口实体层
+ * @author ricard
+ * @date   2019/10/11
+ */
+
+@Data
+public class WcsTask implements Serializable {
+    private static final long serialVersionUID = -8855840499538794854L;
+
+    //任务号
+    private String taskNo;
+
+    //前置任务
+    private String preTaskNo;
+
+    //任务类型
+    private String taskType;
+
+    //出库站台编码.默认‘0’
+    private String station;
+
+    //平台
+    private String platform;
+
+    //容器编码
+    private String containerCode;
+
+    //来源口”,一般用于指定入库口，string (50)，默认0，必填
+    private String fromPort;
+
+    //目的口”,出库性质的任务必须填写，string (50)，默认0，必填
+    private String toPort;
+
+    //源位置库位编码
+    private String fromLocationCode;
+
+    //目的位置库位编码
+    private String toLocationCode;
+
+    //重入后再次分配的位置编码
+    private String locationCode;
+
+    //优先级，int，默认100 ，数字越小优先级越高",必填
+    private Integer priority;
+
+    //巷道
+    private String roadWay;
+
+    //长
+    private String length;
+
+    //宽
+    private String width;
+
+    //高
+    private String height;
+
+    //重
+    private String weight;
+
+    //备注
+    private String remark;
+
+    private List<TaskDetails> taskDetails;
+}
+package com.huaheng.api.wcs.service.emptyOutHandle;
+
+import com.huaheng.api.wcs.domain.WcsTask;
+import com.huaheng.framework.web.domain.AjaxResult;
+
+public interface EmptyOutHandleService {
+    //空出处理
+    AjaxResult EmptyOutHandle(WcsTask wcsTask);
+}
+package com.huaheng.api.wcs.service.emptyOutHandle;
+
+import com.huaheng.api.wcs.domain.WcsTask;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
+import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+public class EmptyOutHandleServiceImpl implements EmptyOutHandleService {
+
+
+    @Autowired
+    private TaskHeaderService taskHeaderService;
+
+    /**
+     * 空出处理
+     * 1、判断非空字段
+     * 2、根据任务号查找任务
+     * 3、修改该任务为空出，过后处理
+     * @param wcsTask
+     * @return
+     */
+    @Override
+    @Transactional
+    public AjaxResult EmptyOutHandle(WcsTask wcsTask) {
+
+        //1、判断非空字段
+        if(StringUtils.isEmpty(wcsTask.getTaskNo())){
+            return AjaxResult.error("任务号为空");
+        }
+
+        //2、根据任务号查找任务
+        TaskHeader taskHeader = taskHeaderService.getById(Integer.valueOf(wcsTask.getTaskNo()));
+        if(taskHeader == null){
+            return AjaxResult.error("任务号错误，没有找到该任务");
+        }
+        if(taskHeader.getStatus() == 100){
+            return AjaxResult.error("任务已完成");
+        }
+
+        //3、修改该任务为空出，过后处理
+        taskHeader.setExceptionCode("空托出库");
+        Boolean flag = taskHeaderService.updateById(taskHeader);
+        if(flag == false){
+            return AjaxResult.error("修改任务失败，空出处理失败");
+        }
+        return AjaxResult.success("空出处理成功");
+    }
+}
+package com.huaheng.api.wcs.service.overrideHandle;
+
+import com.huaheng.api.wcs.domain.TaskFinishDomain;
+import com.huaheng.api.wcs.domain.WcsTask;
+import com.huaheng.framework.web.domain.AjaxResult;
+
+public interface OverrideHandleService {
+
+    //重入处理
+    AjaxResult OverrideHandle(TaskFinishDomain taskFinishDomain);
+}
+package com.huaheng.api.wcs.service.overrideHandle;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huaheng.api.wcs.domain.TaskFinishDomain;
+import com.huaheng.api.wcs.domain.WcsTask;
+import com.huaheng.api.wcs.service.warecellAllocation.WarecellAllocationService;
+import com.huaheng.common.exception.service.ServiceException;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.config.FilterConfigDetail.domain.FilterConfigDetail;
+import com.huaheng.pc.config.FilterConfigDetail.service.FilterConfigDetailService;
+import com.huaheng.pc.config.location.domain.Location;
+import com.huaheng.pc.config.location.service.LocationService;
+import com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail;
+import com.huaheng.pc.receipt.receiptContainerDetail.service.ReceiptContainerDetailService;
+import com.huaheng.pc.receipt.receiptContainerHeader.domain.ReceiptContainerHeader;
+import com.huaheng.pc.receipt.receiptContainerHeader.service.ReceiptContainerHeaderService;
+import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
+import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
+import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
+import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class OverrideHandleServiceImpl implements OverrideHandleService {
+
+
+    @Autowired
+    private TaskHeaderService taskHeaderService;
+    @Autowired
+    private TaskDetailService taskDetailService;
+    @Autowired
+    private LocationService locationService;
+    @Autowired
+    private ReceiptContainerHeaderService receiptContainerHeaderService;
+    @Autowired
+    private ReceiptContainerDetailService receiptContainerDetailService;
+    @Resource
+    private WarecellAllocationService warecellAllocationService;
+    @Resource
+    private FilterConfigDetailService filterConfigDetailService;
+
+    /**
+     * 重入处理
+     * 1、判断非空字段
+     * 2、根据任务号查找任务
+     * 3、修改任务目的库位，修改入库组盘的库位，修改库位状态
+     */
+
+    @Override
+    @Transactional
+    public AjaxResult OverrideHandle(TaskFinishDomain taskFinishDomain) {
+        Boolean flag = true;
+
+        //1、判断非空字段
+        if(StringUtils.isEmpty(taskFinishDomain.getTaskNo())){
+            return AjaxResult.error("任务号为空");
+        }
+        if(StringUtils.isEmpty(taskFinishDomain.getToLocationCode())){
+            return AjaxResult.error("目的库位为空");
+        }
+        if(StringUtils.isEmpty(taskFinishDomain.getRedirectionLocationCode())){
+            return AjaxResult.error("重入的库位编码为空");
+        }
+
+
+
+        //2、根据任务号查找任务
+        TaskHeader taskHeader = taskHeaderService.getById(Integer.valueOf(taskFinishDomain.getTaskNo()));
+        if(taskHeader == null){
+            return AjaxResult.error("任务号错误，没有找到该任务");
+        }
+        if(taskHeader.getStatus() == 100){
+            return AjaxResult.error("任务已完成");
+        }
+
+        //3、修改任务目的库位，修改入库组盘的库位，修改库位状态
+        //修改原来目的库位的状态
+        LambdaQueryWrapper<Location> locationLam = Wrappers.lambdaQuery();
+        locationLam.eq(Location::getCode,taskHeader.getToLocation())
+                .eq(Location::getWarehouseCode, ShiroUtils.getWarehouseCode());
+        Location location = locationService.getOne(locationLam);
+        if(location == null){
+            return AjaxResult.error("此任务的原目的库位在系统中不存在");
+        }
+        location.setStatus("empty");
+        location.setContainerCode("");
+        flag = locationService.updateById(location);
+        if(flag == false){
+            return AjaxResult.error("修改此任务的原目的库位错误");
+        }
+
+
+        /**
+         *  查看新库位有两种情况
+         *  1、重入的库位由wcs提供
+         *  2、重入的库位由wms提供
+         */
+
+        Location newlocation =new Location();
+        String code=ShiroUtils.getWarehouseCode();
+        //重入的库位由wcs提供
+        if(!taskFinishDomain.getRedirectionLocationCode().equals("0")) {
+            LambdaQueryWrapper<Location> locationLa = Wrappers.lambdaQuery();
+            locationLa.eq(Location::getCode, taskFinishDomain.getRedirectionLocationCode())
+                    .eq(Location::getStatus,"empty")
+                    .eq(Location::getWarehouseCode, ShiroUtils.getWarehouseCode());
+            newlocation = locationService.getOne(locationLa);
+            if (newlocation == null) {
+                throw new ServiceException("新目的库位在系统中不存在或非空闲");
+            }
+            if(StringUtils.isNotEmpty(newlocation.getContainerCode())){
+                throw new ServiceException("新目的库位在系统中已经有容器");
+            }
+        }else {
+            //重入的库位由wms提供
+            //查询任务明细
+            LambdaQueryWrapper<TaskDetail> taskDetailLambda = Wrappers.lambdaQuery();
+            taskDetailLambda.eq(TaskDetail::getTaskId, taskFinishDomain.getTaskNo());
+            List<TaskDetail> taskDetailList = taskDetailService.list(taskDetailLambda);
+            //查询入库组盘明细
+            List<ReceiptContainerDetail> receiptContainerDetailList = new ArrayList<>();
+            for (TaskDetail taskDetail : taskDetailList) {
+                receiptContainerDetailList.add(receiptContainerDetailService.getById(taskDetail.getAllocationId()));
+            }
+            ReceiptContainerHeader receiptContainerHeader = receiptContainerHeaderService.getById(receiptContainerDetailList.get(0).getReceiptContainerId());
+            String locatingRule = warecellAllocationService.taskPositioning(receiptContainerDetailList.get(0));
+
+            LambdaQueryWrapper<FilterConfigDetail> filterConfigDetailLambda = Wrappers.lambdaQuery();
+            filterConfigDetailLambda.eq(FilterConfigDetail::getCode, locatingRule);
+            FilterConfigDetail filterConfigDetail = filterConfigDetailService.getOne(filterConfigDetailLambda);
+
+            //根据定位规则查询库位编码
+            LambdaQueryWrapper<Location> locationLambda = Wrappers.lambdaQuery();
+            locationLambda.last(filterConfigDetail.getStatement());
+            newlocation = locationService.getOne(locationLambda);
+        }
+
+        //修改任务
+        taskHeader.setToLocation(newlocation.getCode());
+        taskHeader.setExceptionCode("重入处理");
+        flag = taskHeaderService.updateById(taskHeader);
+        if(flag == false){
+            throw new ServiceException("修改此任务错误");
+        }
+
+        //修改子任务
+        LambdaQueryWrapper<TaskDetail> taskDetailLam = Wrappers.lambdaQuery();
+        taskDetailLam.eq(TaskDetail::getWarehouseCode,ShiroUtils.getWarehouseCode())
+                .eq(TaskDetail::getTaskId,taskHeader.getId());
+        List<TaskDetail> taskDetails = taskDetailService.list(taskDetailLam);
+        List<TaskDetail> taskDetailList = new ArrayList<>();
+        if(taskDetails != null && taskDetails.size()> 0){
+            for(TaskDetail taskDetail : taskDetails){
+                taskDetail.setToLocation(newlocation.getCode());
+                taskDetailList.add(taskDetail);
+            }
+            flag = taskDetailService.updateBatchById(taskDetailList);
+            if(flag == false){
+                throw new ServiceException("修改此任务的明细错误");
+            }
+        }
+
+        //修改入库组盘
+        if(taskHeader.getAllocationHeadId() == null){
+            throw new ServiceException("找不到此任务的组盘头id");
+        }
+        ReceiptContainerHeader receiptContainerHeader = receiptContainerHeaderService.getById(taskHeader.getAllocationHeadId());
+        if(receiptContainerHeader == null){
+            throw new ServiceException("找不到此任务的组盘头");
+        }
+        receiptContainerHeader.setToLocation(newlocation.getCode());
+        flag = receiptContainerHeaderService.updateById(receiptContainerHeader);
+        if(flag == false){
+            throw new ServiceException("修改此任务对应的组盘头错误");
+        }
+
+        //修改入库组盘明细
+        LambdaQueryWrapper<ReceiptContainerDetail> lam = Wrappers.lambdaQuery();
+        lam.eq(ReceiptContainerDetail::getReceiptContainerId,receiptContainerHeader.getId())
+                .eq(ReceiptContainerDetail::getWarehouseCode,ShiroUtils.getWarehouseCode());
+        List<ReceiptContainerDetail> receiptContainerDetails = receiptContainerDetailService.list(lam);
+
+        List<ReceiptContainerDetail> receiptContainerDetailList = new ArrayList<>();
+        if(receiptContainerDetails != null && receiptContainerDetails.size()> 0){
+            for(ReceiptContainerDetail receiptContainerDetail : receiptContainerDetails){
+                receiptContainerDetail.setLocationCode(newlocation.getCode());
+                receiptContainerDetailList.add(receiptContainerDetail);
+            }
+            flag = receiptContainerDetailService.updateBatchById(receiptContainerDetailList);
+            if(flag == false){
+                throw new ServiceException("修改此任务的组盘明细错误");
+            }
+        }
+        return AjaxResult.success("重入处理成功");
+    }
+}
+package com.huaheng.api.wcs.service.stationInfo;
+
+import com.huaheng.framework.web.domain.AjaxResult;
+
+public interface StationInfoService {
+
+    //站台信息查询
+    AjaxResult StationInfo(String station);
+
+}
+package com.huaheng.api.wcs.service.stationInfo;
+
+
+import com.alibaba.fastjson.JSON;
+import com.huaheng.api.wcs.domain.WcsTask;
+import com.huaheng.common.exception.service.ServiceException;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.common.utils.http.HttpUtils;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.config.address.service.AddressService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class StationInfoServiceImpl implements StationInfoService {
+
+    @Autowired
+    private AddressService addressService;
+
+    /**
+     * 站台信息查询
+     * 1、判断非空字段
+     * 2、实体转换
+     * 3、发送数据
+     * @param station
+     * @return
+     */
+    @Override
+    public AjaxResult StationInfo(String station) {
+
+        //1、判断非空字段
+        if(StringUtils.isEmpty(station)){
+            return AjaxResult.error("站台为空");
+        }
+
+        //2、实体转换
+        WcsTask wcsTask =new WcsTask();
+        wcsTask.setStation(station);
+
+        //3、发送数据
+        String param="wcs";
+        String url=addressService.selectAddress(param)+"StationInfo";
+        String JsonParam = JSON.toJSONString(wcsTask);
+        String result = HttpUtils.bodypost(url, JsonParam);
+        if(StringUtils.isEmpty(result)){
+            throw new ServiceException("接口地址错误");
+        }
+        AjaxResult ajaxResult = JSON.parseObject(result, AjaxResult.class);
+        return ajaxResult;
+
+    }
+}
+package com.huaheng.api.wcs.service.taskAssignService;
+
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
+
+/**
+ * 任务下发接口Service层
+ * @author ricard
+ * @date    2019/10/11
+ *
+ */
+public interface TaskAssignService {
+
+    //wms下发任务给wcs
+    AjaxResult wcsTaskAssign(TaskHeader taskHeader);
+}
+package com.huaheng.api.wcs.service.taskAssignService;
+
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huaheng.api.wcs.domain.TaskDetails;
+import com.huaheng.api.wcs.domain.WcsTask;
+import com.huaheng.common.exception.service.ServiceException;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.common.utils.http.HttpUtils;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.config.address.service.AddressService;
+import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
+import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
+import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 任务下发接口ServiceImpl层
+ * @author ricard
+ * @date    2019/10/11
+ *
+ */
+
+@Service
+public class TaskAssignServiceImpl implements TaskAssignService {
+
+    @Autowired
+    private AddressService addressService;
+    @Autowired
+    private TaskDetailService taskDetailService;
+
+
+    public static String platform = "wms";
+
+    //wms下发任务给wcs
+    /**
+     * 1、判断taskHeader是否为空
+     * 2、判断必填字段是否满足
+     * 3、转换实体
+     * 4、发送数据
+     *
+     * @param taskHeader
+     * @return
+     */
+    @Override
+    @Transactional
+    public AjaxResult wcsTaskAssign(TaskHeader taskHeader) {
+        //1、判断taskHeader是否为空
+        if(taskHeader == null){
+            throw new ServiceException("wms任务为空");
+        }
+
+        //2、判断必填字段是否满足
+        if(taskHeader.getId() == null){
+            throw new ServiceException("wms任务号Id为空");
+        }
+        if(taskHeader.getTaskType() == null){
+            throw new ServiceException("wms任务类型为空");
+        }
+        if(StringUtils.isEmpty(taskHeader.getContainerCode())){
+            throw new ServiceException("wms任务中容器为空");
+        }
+
+
+        //入库性质的任务源库位不能为空
+        if(taskHeader.getTaskType()==100 || taskHeader.getTaskType()==200
+                || taskHeader.getTaskType()==500 || taskHeader.getTaskType()==800) {
+            if (taskHeader.getFromLocation() == null) {
+                throw new ServiceException("源库位为空");
+            }
+        }
+
+       // 出库性质的任务目的库位不能为空
+        if(taskHeader.getTaskType()==300 || taskHeader.getTaskType()==400
+                || taskHeader.getTaskType()==600 || taskHeader.getTaskType()==700
+                || taskHeader.getTaskType()==800 || taskHeader.getTaskType()==900)
+        {
+            if (taskHeader.getToLocation() == null) {
+                throw new ServiceException("目的库位为空");
+            }
+        }
+
+        //3、转换实体，初始化wcs任务实体
+        WcsTask wcsTask = new WcsTask();
+        wcsTask.setTaskNo(taskHeader.getId().toString());
+        wcsTask.setPreTaskNo("0");
+        wcsTask.setTaskType(taskHeader.getTaskType().toString());
+        wcsTask.setFromPort("1000");
+        wcsTask.setToPort("0");
+        wcsTask.setContainerCode(taskHeader.getContainerCode());
+        if(StringUtils.isEmpty(taskHeader.getFromLocation())){
+            wcsTask.setFromLocationCode("0");
+        }else {
+            wcsTask.setFromLocationCode(taskHeader.getFromLocation());
+        }
+        if(StringUtils.isEmpty(taskHeader.getToLocation())){
+            wcsTask.setToLocationCode("0");
+        }else {
+            wcsTask.setToLocationCode(taskHeader.getToLocation());
+        }
+        wcsTask.setPriority(100);
+        wcsTask.setRemark("0");
+        wcsTask.setPlatform(platform);
+
+        //找到任务明细
+        LambdaQueryWrapper<TaskDetail> taskDetailLam = Wrappers.lambdaQuery();
+        taskDetailLam.eq(TaskDetail::getTaskId,taskHeader.getId());
+        List<TaskDetail> taskDetailList = taskDetailService.list(taskDetailLam);
+        if(taskDetailList == null){
+            throw new ServiceException("没有子任务");
+        }
+        List<TaskDetails> taskDetails =new ArrayList<>();
+        for(TaskDetail item : taskDetailList){
+            TaskDetails details = new TaskDetails();
+            details.setMaterialCode(item.getMaterialCode());
+            details.setMaterialName(item.getMaterialName());
+            if(StringUtils.isEmpty(item.getMaterialUnit())){
+                details.setUnit("PCS");
+            }else {
+                details.setUnit(item.getMaterialUnit());
+            }
+            details.setQty(item.getQty());
+            details.setReferLineNo(item.getId().toString());
+            taskDetails.add(details);
+        }
+
+        wcsTask.setTaskDetails(taskDetails);
+
+        //4、发送数据
+        String param="wcs";
+        String url=addressService.selectAddress(param)+"TaskAssign";
+        String JsonParam = JSON.toJSONString(wcsTask);
+        System.out.println(JsonParam);
+        String result = HttpUtils.bodypost(url, JsonParam);
+        if(StringUtils.isEmpty(result)){
+            throw new ServiceException("接口地址错误");
+        }
+        AjaxResult ajaxResult = JSON.parseObject(result, AjaxResult.class);
+        if(ajaxResult.getCode()!=200){
+            throw new ServiceException(ajaxResult.getMsg());
+        }
+        return ajaxResult;
+    }
+}
+package com.huaheng.api.wcs.service.taskCancel;
+
+import com.huaheng.api.wcs.domain.WcsTask;
+import com.huaheng.framework.web.domain.AjaxResult;
+
+public interface TaskCancelService {
+
+    //取消任务
+    AjaxResult TaskCance(Integer id);
+}
+package com.huaheng.api.wcs.service.taskCancel;
+
+import com.alibaba.fastjson.JSON;
+import com.huaheng.api.wcs.domain.WcsTask;
+import com.huaheng.common.exception.service.ServiceException;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.common.utils.http.HttpUtils;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.config.address.service.AddressService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TaskCancelServiceImpl implements TaskCancelService {
+
+
+    @Autowired
+    private AddressService addressService;
+
+    /**取消任务
+     * 1、判断参数是否为空
+     * 2、转换实体
+     * 3、发送数据
+     * @param id
+     * @return
+     */
+    @Override
+    public AjaxResult TaskCance(Integer id) {
+
+        //1、判断参数是否为空
+        if(id == null){
+            throw new ServiceException("任务号为空");
+        }
+
+
+        //2、转换实体
+        WcsTask wcsTask = new WcsTask();
+        wcsTask.setTaskNo(id.toString());
+
+        //3、发送数据
+        String param="wcs";
+        String url=addressService.selectAddress(param)+"TaskCancel";
+        String JsonParam = JSON.toJSONString(wcsTask);
+        String result = HttpUtils.bodypost(url, JsonParam);
+        if(StringUtils.isEmpty(result)){
+            throw new ServiceException("接口地址错误");
+        }
+        AjaxResult ajaxResult = JSON.parseObject(result, AjaxResult.class);
+        return ajaxResult;
+    }
+}
+package com.huaheng.api.wcs.service.taskFinish;
+
+import com.huaheng.api.wcs.domain.TaskFinishDomain;
+import com.huaheng.framework.web.domain.AjaxResult;
+
+public interface TaskFinishService {
+
+    //任务完成
+    AjaxResult completeTaskByWCS(TaskFinishDomain taskFinishDomain);
+}
+package com.huaheng.api.wcs.service.taskFinish;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huaheng.api.wcs.domain.TaskFinishDomain;
+import com.huaheng.common.support.Convert;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
+import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TaskFinishServiceImpl implements TaskFinishService {
+
+    @Autowired
+    private TaskHeaderService taskHeaderService;
+
+    //任务完成
+    @Override
+    public AjaxResult completeTaskByWCS(TaskFinishDomain taskFinishDomain) {
+        AjaxResult ajaxResult=new AjaxResult();
+        if(StringUtils.isEmpty(taskFinishDomain.getTaskNo())){
+            return AjaxResult.error("任务号为空");
+        }
+        if(taskFinishDomain.getIsEmptyOut() == 1){
+            LambdaQueryWrapper<TaskHeader> lam = Wrappers.lambdaQuery();
+            lam.eq(TaskHeader::getId,Integer.valueOf(taskFinishDomain.getTaskNo()));
+            TaskHeader taskHeader = taskHeaderService.getOne(lam);
+            if(taskHeader == null){
+                return AjaxResult.error("wms系统没有此任务号");
+            }
+            if(StringUtils.isEmpty(taskHeader.getExceptionCode())) {
+                taskHeader.setExceptionCode("空托出库");
+                Boolean flag = taskHeaderService.updateById(taskHeader);
+                if (flag == false) {
+                    return AjaxResult.error("修改任务失败，空出处理失败");
+                }
+            }
+            return AjaxResult.success("成功");
+        }
+        try{
+            ajaxResult=taskHeaderService.completeTaskByWMS(Convert.toIntArray(taskFinishDomain.getTaskNo()));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return ajaxResult;
+    }
+}
+package com.huaheng.api.wcs.service.taskInfo;
+
+import com.huaheng.framework.web.domain.AjaxResult;
+
+public interface TaskInfoService {
+
+    //任务信息查询
+    AjaxResult TaskInfo(Integer id);
+}
+package com.huaheng.api.wcs.service.taskInfo;
+
+import com.alibaba.fastjson.JSON;
+import com.huaheng.api.wcs.domain.WcsTask;
+import com.huaheng.common.exception.service.ServiceException;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.common.utils.http.HttpUtils;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.config.address.service.AddressService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TaskInfoServiceImpl implements TaskInfoService {
+
+
+    @Autowired
+    private AddressService addressService;
+    /**
+     * 任务信息查询
+     * 1、判断非空字段
+     * 2、实体转换
+     * 3、发送数据
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public AjaxResult TaskInfo(Integer id) {
+
+        //1、判断非空字段
+        if(id == null){
+            return AjaxResult.error("任务号为空");
+        }
+
+
+        //2、实体转换
+        WcsTask wcsTask =new WcsTask();
+        wcsTask.setTaskNo(id.toString());
+
+        //3、发送数据
+        String param="wcs";
+        String url=addressService.selectAddress(param)+"TaskInfo";
+        String JsonParam = JSON.toJSONString(wcsTask);
+        String result = HttpUtils.bodypost(url, JsonParam);
+        if(StringUtils.isEmpty(result)){
+            throw new ServiceException("接口地址错误");
+        }
+        AjaxResult ajaxResult = JSON.parseObject(result, AjaxResult.class);
+        return ajaxResult;
+    }
+}
+package com.huaheng.api.wcs.service.warecellAllocation;
+
+import com.huaheng.api.wcs.domain.WcsTask;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail;
+
+public interface WarecellAllocationService {
+
+    //仓位分配
+    AjaxResult WarecellAllocation(WcsTask wcsTask);
+
+    String taskPositioning(ReceiptContainerDetail receiptContainerDetail);
+}
+package com.huaheng.api.wcs.service.warecellAllocation;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huaheng.api.wcs.domain.WcsTask;
+import com.huaheng.common.exception.service.ServiceException;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.config.FilterConfigDetail.domain.FilterConfigDetail;
+import com.huaheng.pc.config.FilterConfigDetail.service.FilterConfigDetailService;
+import com.huaheng.pc.config.configValue.domain.ConfigValue;
+import com.huaheng.pc.config.configValue.service.ConfigValueService;
+import com.huaheng.pc.config.location.domain.Location;
+import com.huaheng.pc.config.location.service.LocationService;
+import com.huaheng.pc.config.locationType.domain.LocationType;
+import com.huaheng.pc.config.locationType.service.LocationTypeService;
+import com.huaheng.pc.config.material.domain.Material;
+import com.huaheng.pc.config.material.service.MaterialService;
+import com.huaheng.pc.config.materialType.domain.MaterialType;
+import com.huaheng.pc.config.materialType.service.MaterialTypeService;
+import com.huaheng.pc.config.receiptPreference.domain.ReceiptPreference;
+import com.huaheng.pc.config.receiptPreference.service.ReceiptPreferenceService;
+import com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail;
+import com.huaheng.pc.receipt.receiptContainerDetail.service.ReceiptContainerDetailService;
+import com.huaheng.pc.receipt.receiptContainerHeader.domain.ReceiptContainerHeader;
+import com.huaheng.pc.receipt.receiptContainerHeader.service.ReceiptContainerHeaderService;
+import com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailService;
+import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
+import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
+import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
+import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class WarecellAllocationServiceImpl implements WarecellAllocationService {
+
+    @Resource
+    private LocationTypeService locationTypeService;
+    @Resource
+    private LocationService locationService;
+    @Resource
+    private ConfigValueService configValueService;
+    @Resource
+    private ReceiptPreferenceService receiptPreferenceService;
+    @Resource
+    private FilterConfigDetailService filterConfigDetailService;
+    @Resource
+    private TaskDetailService taskDetailService;
+    @Resource
+    private TaskHeaderService taskHeaderService;
+    @Resource
+    private ReceiptContainerDetailService receiptContainerDetailService;
+    @Resource
+    private ReceiptContainerHeaderService receiptContainerHeaderService;
+    @Resource
+    private ReceiptDetailService receiptDetailService;
+    @Resource
+    private MaterialService materialService;
+    @Resource
+    private MaterialTypeService materialTypeService;
+
+    /**
+     * 仓位分配
+     * 1、判断非空字段
+     * 2、实体转换
+     * 3、查询满足条件的库位类型
+     * @param wcsTask
+     * @return
+     */
+    @Override
+    public AjaxResult WarecellAllocation(WcsTask wcsTask) {
+
+        //1、判断非空字段
+        if(StringUtils.isEmpty(wcsTask.getTaskNo())){
+            return AjaxResult.error("任务号为空");
+        }
+        if(StringUtils.isEmpty(wcsTask.getRoadWay())){
+            return AjaxResult.error("巷道为空");
+        }
+        if(StringUtils.isNull(wcsTask.getLength())){
+            return AjaxResult.error("长为空");
+        }
+        if(StringUtils.isNull(wcsTask.getWidth())){
+            return AjaxResult.error("宽为空");
+        }
+        if(StringUtils.isNull(wcsTask.getHeight())){
+            return AjaxResult.error("高为空");
+        }
+        if(StringUtils.isNull(wcsTask.getWeight())){
+            return AjaxResult.error("重为空");
+        }
+
+        //查询满足条件的库位类型
+        LambdaQueryWrapper<LocationType> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.gt(LocationType::getLength,wcsTask.getLength())
+                .gt(LocationType::getWidth, wcsTask.getWidth())
+                .gt(LocationType::getHeight, wcsTask.getHeight())
+                .gt(LocationType::getMaxWeight, wcsTask.getWidth());
+        List<LocationType> locationTypeList = locationTypeService.list(lambdaQueryWrapper);
+        List<String> codeList = new ArrayList<>();
+        for (LocationType locationType: locationTypeList) {
+            codeList.add(locationType.getCode());
+        }
+
+        String locationCode = null;
+        //查询任务明细
+        LambdaQueryWrapper<TaskDetail> taskDetailLambda = Wrappers.lambdaQuery();
+        taskDetailLambda.eq(TaskDetail::getTaskId, wcsTask.getTaskNo());
+        List<TaskDetail> taskDetailList = taskDetailService.list(taskDetailLambda);
+
+        List<ReceiptContainerDetail> receiptContainerDetailList = new ArrayList<>();
+        for (TaskDetail taskDetail : taskDetailList) {
+            receiptContainerDetailList.add(receiptContainerDetailService.getById(taskDetail.getAllocationId()));
+        }
+        //去重
+        receiptContainerDetailList = receiptContainerDetailList.stream().distinct().collect(Collectors.toList());
+
+        for (ReceiptContainerDetail receiptContainerDetail : receiptContainerDetailList) {
+            ReceiptContainerHeader receiptContainerHeader = receiptContainerHeaderService.getById(receiptContainerDetail.getReceiptContainerId());
+
+            String locatingRule = this.taskPositioning(receiptContainerDetail);
+
+            LambdaQueryWrapper<FilterConfigDetail> filterConfigDetailLambda = Wrappers.lambdaQuery();
+            filterConfigDetailLambda.eq(FilterConfigDetail::getCode, locatingRule);
+            FilterConfigDetail filterConfigDetail = filterConfigDetailService.getOne(filterConfigDetailLambda);
+            String[] locatingRules = filterConfigDetail.getStatement().split("limit");
+
+            //根据定位规则查询库位编码
+            LambdaQueryWrapper<Location> locationLambda = Wrappers.lambdaQuery();
+            locationLambda.last(locatingRules[0]);
+            List<Location> locationList = locationService.list(locationLambda);
+//            locationList.stream().filter(location -> location.getLocationType().equals(locationTypeList.get(0)));
+            locationCode = filter(locationList, locationTypeList, wcsTask.getRoadWay());
+            if (StringUtils.isEmpty(locationCode)){
+                throw new ServiceException("没有库位可分配");
+            }
+
+            if (StringUtils.isNotEmpty(locationCode)){
+                locationService.updateStatus(locationCode, "lock");
+            } else {
+                throw new ServiceException("定位失败,请检查定位规则是否正确");
+            }
+
+            //更新库位编码到组盘头表
+            receiptContainerHeader.setToLocation(locationCode);
+            if (!receiptContainerHeaderService.updateById(receiptContainerHeader)){
+                throw new ServiceException("更新库位失败");
+            }
+
+            //把库位编码赋到该入库组盘头表下的所有明细
+            LambdaQueryWrapper<ReceiptContainerDetail> lambda = Wrappers.lambdaQuery();
+            lambda.eq(ReceiptContainerDetail::getReceiptContainerId, receiptContainerHeader.getId());
+            List<ReceiptContainerDetail> receiptContainerDetails = receiptContainerDetailService.list(lambda);
+            for (ReceiptContainerDetail receiptContainerDetail2: receiptContainerDetails) {
+                receiptContainerDetail2.setLocationCode(locationCode);
+                if (!receiptContainerDetailService.updateById(receiptContainerDetail2)){throw new ServiceException("更新库位编码到入库组盘明细");}
+            }
+
+        }
+
+        if (StringUtils.isNotEmpty(locationCode)){
+            //修改任务明细目标库位
+            for (TaskDetail taskDetail : taskDetailList) {
+                taskDetail.setToLocation(locationCode);
+                if (!taskDetailService.updateById(taskDetail)){ throw new ServiceException("更新任务明细目标库位失败");}
+            }
+
+            TaskHeader taskHeader = taskHeaderService.getById(wcsTask.getTaskNo());
+
+            taskHeader.setToLocation(locationCode);
+            if (!taskHeaderService.updateById(taskHeader)){throw new ServiceException("更新任务头表目标库位失败");}
+            WcsTask wcsTaskResult = new WcsTask();
+            wcsTaskResult.setToLocationCode(locationCode);
+            return AjaxResult.success(wcsTaskResult);
+        }
+
+        return AjaxResult.error("错误");
+    }
+
+    /**
+     * 库位筛选
+     * @param locationList 库位列表
+     * @param locationTypeList 库位类型列表
+     * @param roadway 巷道
+     * @return
+     */
+    public String filter(List<Location> locationList, List<LocationType> locationTypeList, String roadway){
+        List<String> codeList = locationTypeList.stream().map(t-> t.getCode()).collect(Collectors.toList());
+        List<Location> newLocation = locationList.stream().filter(t-> codeList.contains(t.getLocationType()) && t.getRoadway().equals(roadway)).collect(Collectors.toList());
+        if (newLocation.isEmpty()){
+            return null;
+        } else{
+            return newLocation.get(0).getCode();
+        }
+    }
+
+    /**
+     * 定位
+     * @param receiptContainerDetail
+     * @return
+     */
+    @Override
+    public String taskPositioning(ReceiptContainerDetail receiptContainerDetail){
+        ReceiptContainerHeader receiptContainerHeader = receiptContainerHeaderService.getById(receiptContainerDetail.getReceiptContainerId());
+        String locatingRule = receiptContainerHeader.getLocatingRule(); //定位规则
+        if (StringUtils.isEmpty(locatingRule)){
+            locatingRule = receiptDetailService.getById(receiptContainerDetail.getReceiptDetailId()).getLocatingRule();
+            //入库单明细定位规则不为空时执行
+            if (StringUtils.isEmpty(locatingRule)){
+                //入库单明细为空时，查询物料表中是否含有定位规则
+                LambdaQueryWrapper<Material> materialLambda = Wrappers.lambdaQuery();
+                materialLambda.eq(Material::getCode, receiptContainerDetail.getMaterialCode());
+                Material material = materialService.getOne(materialLambda);
+                locatingRule = material.getLocatingRule();
+
+                if (StringUtils.isEmpty(locatingRule)){
+                    //物料表中定位规则为空时，查询物料类别
+                    LambdaQueryWrapper<MaterialType> materialTypeLambda = Wrappers.lambdaQuery();
+                    materialTypeLambda.eq(MaterialType::getCode, material.getType());
+                    MaterialType materialType = materialTypeService.getOne(materialTypeLambda);
+                    locatingRule = materialType.getLocatingRule();
+                    if (StringUtils.isEmpty(locatingRule)){
+                        //物料类别中定位规则为空时，查询入库首选项
+                        LambdaQueryWrapper<ConfigValue> configValueLambda = Wrappers.lambdaQuery();
+                        configValueLambda.eq(ConfigValue::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                                .eq(ConfigValue::getModuleType, "receipt")
+                                .eq(ConfigValue::getRecordType, "入库首选项");
+                        ConfigValue configValue = configValueService.getOne(configValueLambda);
+                        LambdaQueryWrapper<ReceiptPreference> receiptPreferenceLambda = Wrappers.lambdaQuery();
+                        receiptPreferenceLambda.eq(ReceiptPreference::getCode, configValue.getValue());
+                        ReceiptPreference receiptPreference = receiptPreferenceService.getOne(receiptPreferenceLambda);
+                        locatingRule = receiptPreferenceService.getOne(receiptPreferenceLambda).getLocationRule();
+                    }
+                }
+            }
+        }
+        //通过定位规则查找自定义sql
+        if (StringUtils.isEmpty(locatingRule)){
+            throw new ServiceException("未绑定定位规则");
+        }
+
+        return locatingRule;
+    }
+}
+package com.huaheng.common.constant;
+
+/**
+ * 数字自定义常量
+ *
+ * @author  ricard
+ */
+public class QuantityConstant {
+    /**
+     * 1、入库单状态
+     * 2、出库单状态
+     * 3、单据上传状态
+     * 4、入库组盘状态
+     * 5、出库组盘状态
+     * 6、任务类型
+     * 7、任务状态
+     * 8、波次状态
+     * 9、质检状态
+     * 10、盘点状态
+     * 11、库存交易类型
+     * 12、调整单状态
+     * 13、任务内部类型
+     * 14、质检单类型
+     */
+
+    //1、入库单状态
+
+    //新建
+    public static final Integer RECEIPT_HEADER_BUILD = 0;
+
+    //等待审核
+    public static final Integer RECEIPT_HEADER_MODERATED = 5;
+
+    //驳回
+    public static final Integer RECEIPT_HEADER_TURNDOWN = 10;
+
+    //作废
+    public static final Integer RECEIPT_HEADER_OBSOLETE = 20;
+
+    //订单池
+    public static final Integer RECEIPT_HEADER_POOL = 100;
+
+    //入库预约
+    public static final Integer RECEIPT_HEADER_RESERVATION = 120;
+
+    //入库到货
+    public static final Integer RECEIPT_HEADER_ARRIVAL = 150;
+
+    //入库质检
+    public static final Integer RECEIPT_HEADER_CHECK = 180;
+
+    //收货
+    public static final Integer RECEIPT_HEADER_RECEIVING = 200;
+
+    //定位
+    public static final Integer RECEIPT_HEADER_POSITION = 240;
+
+    //等待上架
+    public static final Integer RECEIPT_HEADER_WAIT = 280;
+
+    //上架
+    public static final Integer RECEIPT_HEADER_SHELF = 300;
+
+    //过账
+    public static final Integer RECEIPT_HEADER_POSTING = 800;
+
+    //回传
+    public static final Integer RECEIPT_HEADER_RETURN = 900;
+
+
+
+
+
+    //2、出库单状态
+
+    //新建
+    public static final Integer SHIPMENT_HEADER_BUILD = 0;
+
+    //订单池
+    public static final Integer SHIPMENT_HEADER_POOL = 100;
+
+    //出库预约
+    public static final Integer SHIPMENT_HEADER_RESERVATION = 120;
+
+    //订单分析
+    public static final Integer SHIPMENT_HEADER_ANALYSIS = 150;
+
+    //波次
+    public static final Integer SHIPMENT_HEADER_WAVE = 200;
+
+    //出库组盘
+    public static final Integer SHIPMENT_HEADER_GROUPDISK = 300;
+
+    //拣货完成
+    public static final Integer SHIPMENT_HEADER_COMPLETED = 500;
+
+    //发运
+    public static final Integer SHIPMENT_HEADER_SHIPPING = 800;
+
+    //回传
+    public static final Integer SHIPMENT_HEADER_RETURN = 900;
+
+
+
+
+    //3、单据上传状态
+
+    //未上传
+    public static final Integer UPLOAD_NOT = 0;
+
+    //上传失败
+    public static final Integer UPLOAD_FAILED = 10;
+
+    //上架完成
+    public static final Integer UPLOAD_SUCCESS = 20;
+
+
+
+
+    //4、入库组盘状态
+
+    //新建
+    public static final Integer RECEIPT_CONTAINER_BUILD = 0;
+
+    //生成任务
+    public static final Integer RECEIPT_CONTAINER_TASK= 10;
+
+    //上架完成
+    public static final Integer RECEIPT_CONTAINER_FINISHED = 20;
+
+    //复核完成
+    public static final Integer RECEIPT_CONTAINER_REVIEWSUCCESS = 30;
+
+
+
+    //5、出库组盘状态
+
+    //新建
+    public static final Integer SHIPMENT_CONTAINER_BUILD = 0;
+
+    //生成任务
+    public static final Integer SHIPMENT_CONTAINER_TASK= 10;
+
+    //拣货完成
+    public static final Integer SHIPMENT_CONTAINER_FINISHED = 20;
+
+    //复核完成
+    public static final Integer SHIPMENT_CONTAINER_REVIEWSUCCESS = 30;
+
+
+
+    //6、任务类型
+
+    //整盘入库
+    public static final Integer TASK_TYPE_WHOLERECEIPT = 100;
+
+    //补充入库
+    public static final Integer TASK_TYPE_SUPPLEMENTRECEIPT = 200;
+
+    //整盘出库
+    public static final Integer TASK_TYPE_WHOLESHIPMENT = 300;
+
+    //分拣出库
+    public static final Integer TASK_TYPE_SORTINGSHIPMENT = 400;
+
+    //空容器入库
+    public static final Integer TASK_TYPE_EMPTYRECEIPT = 500;
+
+    //空容器出库
+    public static final Integer TASK_TYPE_EMPTYSHIPMENT = 600;
+
+    //盘点
+    public static final Integer TASK_TYPE_CYCLECOUNT = 700;
+
+    //移库
+    public static final Integer TASK_TYPE_TRANSFER = 800;
+
+    //出库查看
+    public static final Integer TASK_TYPE_VIEW = 900;
+
+
+
+    //7、任务状态
+
+    //生成任务
+    public static final Integer TASK_STATUS_BUILD = 1;
+
+    //下达任务
+    public static final Integer TASK_STATUS_RELEASE = 10;
+
+    //开始执行
+    public static final Integer TASK_STATUS_RUNNING = 20;
+
+    //任务完成
+    public static final Integer TASK_STATUS_COMPLETED = 100;
+
+
+    //8、波次状态
+
+    //新建波次
+    public static final Integer WAVE_STATUS_BUILD = 0;
+
+    //开始波次
+    public static final Integer WAVE_STATUS_START = 100;
+
+    //剔除不符合条件订单
+    public static final Integer WAVE_STATUS_EXCLUDE = 150;
+
+    //指定分配规则
+    public static final Integer WAVE_STATUS_ASSIGN = 200;
+
+    //分配库存
+    public static final Integer WAVE_STATUS_ALLOCATION = 300;
+
+    //订单分组
+    public static final Integer WAVE_STATUS_GROUPING = 400;
+
+    //创建货箱
+    public static final Integer WAVE_STATUS_CREATECONTAINER = 500;
+
+    //生成任务
+    public static final Integer WAVE_STATUS_BUILDTASK = 600;
+
+    //结束波次
+    public static final Integer WAVE_STATUS_END = 900;
+
+    //失败
+    public static final Integer WAVE_STATUS_FAILED = 999;
+
+
+
+    //9、质检状态
+
+    //新建
+    public static final Integer CHECK_STATUS_BUILD = 0;
+
+    //质检中
+    public static final Integer CHECK_STATUS_IN = 10;
+
+    //质检完成
+    public static final Integer CHECK_STATUS_COMPLETED = 20;
+
+
+
+    //10、盘点状态
+
+    //新建
+    public static final Integer CYCLECOUNT_STATUS_BUILD = 1;
+
+    //盘点任务生成
+    public static final Integer CYCLECOUNT_STATUS_BUILDTASK = 5;
+
+    //执行中
+    public static final Integer CYCLECOUNT_STATUS_EXECUTING = 10;
+
+    //已登记
+    public static final Integer CYCLECOUNT_STATUS_REGISTERED= 15;
+
+    //审核
+    public static final Integer CYCLECOUNT_STATUS_REVIEW = 30;
+
+    //关闭
+    public static final Integer CYCLECOUNT_STATUS_CLOSE = 99;
+
+    //盘点完成
+    public static final Integer CYCLECOUNT_STATUS_COMPLETED = 100;
+
+    //已生成调整单
+    public static final Integer CYCLECOUNT_STATUS_GENERATEADJUST = 101;
+
+
+
+    //11、库存交易类型
+
+    //入库
+    public static final Integer INVENTORY_TRANSACTION_RECEIPT = 10;
+
+    //出库
+    public static final Integer INVENTORY_TRANSACTION_SHIPMENT = 20;
+
+    //调整入
+    public static final Integer INVENTORY_TRANSACTION_ADJUSTINTO = 30;
+
+    //调整出
+    public static final Integer INVENTORY_TRANSACTION_ADJUSTOUT = 40;
+
+    //调整属性
+    public static final Integer INVENTORY_TRANSACTION_ADJUSTPROPERTIES = 50;
+
+    //盘点
+    public static final Integer INVENTORY_TRANSACTION_CYCLECOUNT = 60;
+
+    //移库入
+    public static final Integer INVENTORY_TRANSACTION_TRANSFERINTO = 70;
+
+    //移库出
+    public static final Integer INVENTORY_TRANSACTION_TRANSFEROUT = 80;
+
+
+    //12、调整单状态
+
+    //未批准
+    public static final Integer ADJUST_STATUS_NOAPPROVED = 0;
+
+    //已批准
+    public static final Integer ADJUST_STATUS_APPROVED = 1;
+
+    //待调整
+    public static final Integer ADJUST_STATUS_WAIT = 2;
+
+    //已调整
+    public static final Integer ADJUST_STATUS_STOP = 3;
+
+
+    //13、任务内部类型
+
+    //上架任务
+    public static final Integer TASK_INTENERTYPE_SHELF = 100;
+
+    //拣货任务
+    public static final Integer TASK_INTENERTYPE_PICKING = 200;
+
+    //补货任务
+    public static final Integer TASK_INTENERTYPE_SUPPLEMENT = 300;
+
+    //工作任务
+    public static final Integer TASK_INTENERTYPE_WORK = 400;
+
+    //质检任务
+    public static final Integer TASK_INTENERTYPE_CHECK = 500;
+
+    //移库任务
+    public static final Integer TASK_INTENERTYPE_TRANSFER = 600;
+
+    //盘点任务
+    public static final Integer TASK_INTENERTYPE_CYCLECOUNT = 700;
+
+
+
+    //13、质检单类型
+
+    //入库质检
+    public static final Integer CHECK_TYPE_RECEIPT = 100;
+
+    //在库全检
+    public static final Integer CHECK_TYPE_FULL = 200;
+
+    //在库抽检
+    public static final Integer CHECK_TYPE_SELECT = 300;
+
+
+}
@@ -2,6 +2,7 @@ package com.huaheng.pc.check.checkDetail.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huaheng.common.constant.QuantityConstant;
 import com.huaheng.common.exception.service.ServiceException;
 import com.huaheng.common.support.Convert;
 import com.huaheng.common.utils.security.ShiroUtils;
@@ -58,7 +59,7 @@ public class CheckDetailService extends ServiceImpl&lt;CheckDetailMapper, CheckDeta
         checkDetail.setCheckBy(ShiroUtils.getLoginName());
         checkDetail.setCheckAt(new Date());
-        checkDetail.setStatus("20");
+        checkDetail.setStatus((QuantityConstant.CHECK_STATUS_COMPLETED).toString());
         checkDetail.setLastUpdated(new Date());
         checkDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
         if (!this.updateById(checkDetail)){
@@ -71,7 +72,7 @@ public class CheckDetailService extends ServiceImpl&lt;CheckDetailMapper, CheckDeta
         //判断头表下所有明细是否全部完成
         boolean result = false;
         for (CheckDetail checkDetail1 : checkDetails){
-            if ("20".equals(checkDetail1.getStatus())){
+            if ((QuantityConstant.CHECK_STATUS_COMPLETED).toString().equals(checkDetail1.getStatus())){
                 result = true;
             } else {
                 result = false;
@@ -80,7 +81,7 @@ public class CheckDetailService extends ServiceImpl&lt;CheckDetailMapper, CheckDeta
         if (result){
             CheckHeader checkHeader = new CheckHeader();
             checkHeader.setId(checkDetail.getCheckHeaderId());
-            checkHeader.setStatus("30");
+            checkHeader.setStatus((QuantityConstant.CHECK_STATUS_COMPLETED).toString());
             if ( !checkHeaderService.updateById(checkHeader)){
                 throw new ServiceException("质检头表更新失败");
             }
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.databind.ser.Serializers;
+import com.huaheng.common.constant.QuantityConstant;
 import com.huaheng.common.support.Convert;
 import com.huaheng.common.utils.StringUtils;
 import com.huaheng.common.utils.security.ShiroUtils;
@@ -84,7 +85,9 @@ public class CheckingRegisterController extends BaseController {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageNumber;
         Integer pageSize = pageDomain.getPageSize();
-        boolean isDetailNull;
+        boolean isDetailNull;   //质检明细是否存在标识
+
+        //判断质检单明细标号是否存在，不存在显示所有质检报告
         if (StringUtils.isNotNull(checkingRegister.getCheckDetailId())){
             isDetailNull = true;
             if (checkingRegister.getCheckDetailId() == 0){
@@ -128,10 +131,12 @@ public class CheckingRegisterController extends BaseController {
             IPage<CheckingRegister> iPage = checkingRegisterService.page(page, lambdaQueryWrapper);
             if (isDetailNull){
                 if (iPage.getTotal() == 0){
+                    //空list
                     List emptyList = checkingRegisterService.emptyList(checkingRegister.getCheckDetailId());
                     return getMpDataTable(emptyList, Long.valueOf(emptyList.size()));
                 }
-                if (!"20".equals(checkDetail.getStatus())){
+                if (!(QuantityConstant.CHECK_STATUS_COMPLETED).toString().equals(checkDetail.getStatus())){
+                    //未完成质检list
                     List notCompleteList = checkingRegisterService.notCompleteList(checkingRegister.getCheckDetailId());
                     return getMpDataTable(notCompleteList, Long.valueOf(notCompleteList.size()));
                 }
@@ -141,10 +146,12 @@ public class CheckingRegisterController extends BaseController {
             List<CheckingRegister> list = checkingRegisterService.list(lambdaQueryWrapper);
             if (isDetailNull){
                 if (list.size() == 0){
+                    //空list
                     List emptyList = checkingRegisterService.emptyList(checkingRegister.getCheckDetailId());
                     return getMpDataTable(emptyList, Long.valueOf(emptyList.size()));
                 }
-                if (!"20".equals(checkDetail.getStatus())){
+                if (!(QuantityConstant.CHECK_STATUS_COMPLETED).toString().equals(checkDetail.getStatus())){
+                    //未完成质检list
                     List notCompleteList = checkingRegisterService.notCompleteList(checkingRegister.getCheckDetailId());
                     return getMpDataTable(notCompleteList, Long.valueOf(notCompleteList.size()));
                 }
@@ -64,7 +64,7 @@ public class CheckingRegisterService extends ServiceImpl&lt;CheckingRegisterMapper,
      */
     public List<CheckingRegister> emptyList(Integer checkDetailId){
         List<CheckingRegister> list = new ArrayList<>();
-        List<DictData> dictDataList = dictDataService.selectDictDataByType("inventoryStatus");
+        List<DictData> dictDataList = dictDataService.selectDictDataByType("inventorySts");
         CheckDetail checkDetail = checkDetailService.getById(checkDetailId);
         for (DictData dictData: dictDataList){
             CheckingRegister checkingRegister1 = new CheckingRegister();
@@ -123,6 +123,7 @@ public class FilterConfigDetailController extends BaseController {
         }
         filterConfigDetail.setModuleType(configHeader.getModuleType());
         filterConfigDetail.setRecordType(configHeader.getRecordType());
+        filterConfigDetail.setFilterCode(configHeader.getFilterCode());
         filterConfigDetail.setWarehouseCode(ShiroUtils.getWarehouseCode());
         filterConfigDetail.setCreatedBy(ShiroUtils.getLoginName());
         filterConfigDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
@@ -78,9 +78,9 @@ public class FilterConfigDetail implements Serializable {
     @ApiModelProperty(value="全SQL")
     private String statement;
-    @TableField(value = "sqll")
+    @TableField(value = "statements")
     @ApiModelProperty(value="后续分组排序")
-    private String sqll;
+    private String statements;
     /**
      * 是否系统创建
@@ -2,6 +2,14 @@ package com.huaheng.pc.config.FilterConfigDetail.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huaheng.pc.config.FilterConfigDetail.domain.FilterConfigDetail;
+import org.apache.ibatis.annotations.Param;
 public interface FilterConfigDetailMapper extends BaseMapper<FilterConfigDetail> {
+
+    //复制规则配置明细
+    int filterConfigDetailCopy(@Param("code") String code, @Param("newCode") String newCode);
+
+    //修改规则配置明细headerId
+    int updateHeaderId(@Param("code") String code);
+
 }
 \ No newline at end of file
@@ -2,6 +2,10 @@ package com.huaheng.pc.config.FilterConfigHeader.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huaheng.pc.config.FilterConfigHeader.domain.FilterConfigHeader;
+import org.apache.ibatis.annotations.Param;
 public interface FilterConfigHeaderMapper extends BaseMapper<FilterConfigHeader> {
+
+    //复制规则配置主表
+    int filterConfigHeaderCopy(@Param("code") String code, @Param("newCode") String newCode);
 }
 \ No newline at end of file
@@ -3,16 +3,25 @@ package com.huaheng.pc.config.FilterConfigHeader.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.common.exception.service.ServiceException;
 import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.pc.config.FilterConfigDetail.mapper.FilterConfigDetailMapper;
 import com.huaheng.pc.config.FilterConfigHeader.domain.FilterConfigHeader;
 import com.huaheng.pc.config.FilterConfigHeader.mapper.FilterConfigHeaderMapper;
 import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
 import java.util.List;
 @Service("filterConfigHeaderService")
 public class FilterConfigHeaderService extends ServiceImpl<FilterConfigHeaderMapper, FilterConfigHeader> {
+    @Resource
+    private FilterConfigHeaderMapper filterConfigHeaderMapper;
+
+    @Resource
+    private FilterConfigDetailMapper filterConfigDetailMapper;
+
     //根据模块和类型查找具体规则
     public List<FilterConfigHeader> getFilterConfigHeaderService(String moduleType,String recordType){
@@ -22,4 +31,28 @@ public class FilterConfigHeaderService extends ServiceImpl&lt;FilterConfigHeaderMap
                 .eq(FilterConfigHeader::getWarehouseCode, ShiroUtils.getWarehouseCode());
         return this.list(lam);
     }
+
+
+    //复制规则配置
+    public Boolean filterConfigCopy(String code,String newCode){
+        int i = 0;
+        //复制规则配置主表
+        i = filterConfigHeaderMapper.filterConfigHeaderCopy(code,newCode);
+        if(i < 1){
+            throw new ServiceException("复制菜单数据失败");
+        }
+
+        //复制规则配置明细
+        i = filterConfigDetailMapper.filterConfigDetailCopy(code,newCode);
+        if(i < 1){
+            throw new ServiceException("复制菜单数据失败");
+        }
+
+        //修改规则配置明细headerId
+        i = filterConfigDetailMapper.updateHeaderId(newCode);
+        if(i < 1){
+            throw new ServiceException("复制菜单数据失败");
+        }
+        return true;
+    }
 }
+package com.huaheng.pc.config.address.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaheng.common.support.Convert;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.framework.aspectj.lang.annotation.Log;
+import com.huaheng.framework.aspectj.lang.constant.BusinessType;
+import com.huaheng.framework.web.controller.BaseController;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.framework.web.page.PageDomain;
+import com.huaheng.framework.web.page.TableDataInfo;
+import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.config.address.domain.Address;
+import com.huaheng.pc.config.address.service.AddressService;
+import com.huaheng.pc.config.carrier.domain.Carrier;
+import com.huaheng.pc.config.carrier.service.CarrierService;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 接口地址
+ */
+@Controller
+@RequestMapping("/config/address")
+public class AddressController extends BaseController {
+
+    private String prefix = "config/address";
+
+    @Resource
+    private AddressService addressService;
+
+    @RequiresPermissions("config:address:view")
+    @GetMapping()
+    public String address() {
+        return prefix + "/address";
+    }
+
+    /**
+     * 查询接口地址
+     */
+    @RequiresPermissions("config:address:list")
+    @Log(title = "配置-接口地址", operating = "查看接口地址", action = BusinessType.GRANT)
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(Address address) {
+        LambdaQueryWrapper<Address> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        lambdaQueryWrapper
+                .eq(StringUtils.isNotEmpty(address.getParam()), Address::getParam, address.getParam())
+                .eq(Address::getWarehouseCode, ShiroUtils.getWarehouseCode());
+
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+            /*使用分页查询*/
+            Page<Address> page = new Page<>(pageNum, pageSize);
+            IPage<Address> iPage = addressService.page(page, lambdaQueryWrapper);
+            return getMpDataTable(iPage.getRecords(), iPage.getTotal());
+        } else {
+            List<Address> list = addressService.list(lambdaQueryWrapper);
+            return getDataTable(list);
+        }
+    }
+
+    /**
+     * 新增接口地址
+     */
+    @GetMapping("/add")
+    public String add() {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存接口地址
+     */
+    @RequiresPermissions("config:address:add")
+    @Log(title = "通用-接口地址", operating = "新增接口地址", action = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(Address address)  {
+        address.setWarehouseCode(ShiroUtils.getWarehouseCode());
+        return toAjax(addressService.save(address));
+    }
+
+    /**
+     * 修改接口地址
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
+        mmap.put("address", addressService.getById(id));
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存接口地址
+     */
+    @RequiresPermissions("config:address:edit")
+    @Log(title = "配置-接口地址", operating = "修改接口地址", action = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(Address address) {
+        return toAjax(addressService.updateById(address));
+    }
+
+    /**
+     * 删除接口地址
+     */
+    @RequiresPermissions("config:address:remove")
+    @Log(title = "配置-接口地址", operating = "删除接口地址", action = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids) {
+        if (StringUtils.isEmpty(ids)){
+            return AjaxResult.error("id不能为空");
+        }
+        List<Integer> list = new ArrayList<>();
+        for (Integer id : Convert.toIntArray(ids)) {
+            list.add(id);
+        }
+        return toAjax(addressService.removeByIds(list));
+    }
+}
+package com.huaheng.pc.config.address.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 接口地址
+ */
+@ApiModel(value="com.huaheng.pc.config.address.domain.Address")
+@Data
+@TableName(value = "address")
+public class Address implements Serializable {
+    /**
+     * 内部号
+     */
+     @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value="内部号")
+    private Integer id;
+
+
+    /**
+     * 仓库代码
+     */
+    @TableField(value = "warehouseCode")
+    @ApiModelProperty(value="仓库代码")
+    private String warehouseCode;
+
+    /**
+     * 参数
+     */
+    @TableField(value = "param")
+    @ApiModelProperty(value="参数")
+    private String param;
+
+    /**
+     * 接口地址
+     */
+    @TableField(value = "url")
+    @ApiModelProperty(value="接口地址")
+    private String url;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getWarehouseCode() {
+        return warehouseCode;
+    }
+
+    public void setWarehouseCode(String warehouseCode) {
+        this.warehouseCode = warehouseCode;
+    }
+
+    public String getParam() {
+        return param;
+    }
+
+    public void setParam(String param) {
+        this.param = param;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+}
 \ No newline at end of file
+package com.huaheng.pc.config.address.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huaheng.pc.config.address.domain.Address;
+
+public interface AddressMapper extends BaseMapper<Address> {
+}
 \ No newline at end of file
+package com.huaheng.pc.config.address.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huaheng.pc.config.address.domain.Address;
+
+public interface AddressService extends IService<Address>{
+
+
+    String selectAddress(String param);
+
+    /**
+     * 复制地址表
+     * @param warehouseCode 原仓库编码
+     * @param newWarehouseCode 新仓库编码
+     * @return 是否复制成功
+     */
+    Boolean addressCopy(String warehouseCode, String newWarehouseCode);
+}
+package com.huaheng.pc.config.address.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.common.exception.service.ServiceException;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.pc.config.address.domain.Address;
+import com.huaheng.pc.config.address.mapper.AddressMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class AddressServiceImpl extends ServiceImpl<AddressMapper, Address> implements AddressService {
+
+    @Override
+    public String selectAddress(String param) {
+        if(StringUtils.isEmpty(param)){
+            throw new ServiceException("参数为空");
+        }
+
+        LambdaQueryWrapper<Address> addressLam = Wrappers.lambdaQuery();
+        addressLam.eq(Address::getParam,param)
+                .eq(Address::getWarehouseCode, ShiroUtils.getWarehouseCode());
+        Address address=this.getOne(addressLam);
+        if(address == null){
+            throw new ServiceException("参数错误，系统没有此参数对应的地址");
+        }
+        if(StringUtils.isEmpty(address.getUrl())){
+            throw new ServiceException("地址为空");
+        }
+        return address.getUrl();
+    }
+
+    /**
+     * 复制地址表
+     * @param warehouseCode 原仓库编码
+     * @param newWarehouseCode 新仓库编码
+     * @return 是否复制成功
+     */
+    @Override
+    public Boolean addressCopy(String warehouseCode, String newWarehouseCode) {
+        log.trace("开始复制地址表");
+        LambdaQueryWrapper<Address> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(Address::getWarehouseCode, newWarehouseCode);
+        if (!this.list(lambdaQueryWrapper).isEmpty()){
+            log.error("该仓库已存在");
+            return false;
+        }
+        lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(Address::getWarehouseCode, warehouseCode);
+        List<Address> addressList = this.list(lambdaQueryWrapper);
+
+        for ( Address address : addressList) {
+            address.setId(null);
+            address.setWarehouseCode(newWarehouseCode);
+        }
+
+        if ( this.saveBatch(addressList) ){
+            log.trace("复制地址表成功，新仓库编码是："+newWarehouseCode);
+            return true;
+        } else {
+            return false;
+        }
+    }
+}
@@ -12,5 +12,6 @@ public interface CompanyMapper extends BaseMapper&lt;Company&gt; {
     List<Company> selectByWarehouseCode(Company company);
+    List<Company> selectListEntityByEqual(Company condition);
 }
 \ No newline at end of file
@@ -18,4 +18,7 @@ public interface CompanyService extends IService&lt;Company&gt;{
     public AjaxResult updateCompany(Company company);
     public List<Map<String, Object>> getCode();
+
+    List<Company> selectListEntityByEqual(Company condition);
+
 }
@@ -100,10 +100,16 @@ public class CompanyServiceImpl extends ServiceImpl&lt;CompanyMapper, Company&gt; impl
         return AjaxResult.success("更新成功！");
     }
+    @Override
     public List<Map<String, Object>> getCode(){
         LambdaQueryWrapper<Company> lambda = Wrappers.lambdaQuery();
         lambda.select(Company::getCode, Company::getId, Company::getName)
                 .eq(Company::getWarehouseCode, ShiroUtils.getWarehouseCode());
         return this.listMaps(lambda);
     }
+
+    @Override
+    public List<Company> selectListEntityByEqual(Company condition) {
+        return companyMapper.selectListEntityByEqual(condition);
+    }
 }
@@ -16,6 +16,8 @@ import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
 import com.huaheng.pc.config.configValue.domain.ConfigValue;
 import com.huaheng.pc.config.configValue.service.ConfigValueService;
+import com.huaheng.pc.config.cycleCountPreference.domain.CycleCountPreference;
+import com.huaheng.pc.config.cycleCountPreference.service.CycleCountPreferenceService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -35,6 +37,8 @@ public class ConfigValueController extends BaseController {
     @Resource
     private ConfigValueService configValueService;
+    @Resource
+    private CycleCountPreferenceService cycleCountPreferenceService;
     private String prefix = "config/configValue";
@@ -96,6 +100,20 @@ public class ConfigValueController extends BaseController {
     @PostMapping("/add")
     @ResponseBody
     public AjaxResult addSave(ConfigValue configValue)  {
+        //检测盘点首选项是否停用
+        if(configValue.getRecordType().equals("cycleCountPreference")){
+            CycleCountPreference cycleCountPreferenceTemp = new CycleCountPreference();
+            cycleCountPreferenceTemp.setCode(configValue.getIdentifier());
+            cycleCountPreferenceTemp.setWarehouseCode(configValue.getWarehouseCode());
+            LambdaQueryWrapper<CycleCountPreference> preferenceLambdaQueryWrapper = Wrappers.lambdaQuery(cycleCountPreferenceTemp);
+            CycleCountPreference cycleCountPreference = cycleCountPreferenceService.getOne(preferenceLambdaQueryWrapper);
+            if(cycleCountPreference == null){
+                return AjaxResult.error("盘点首选项编码错误，没有该条首选项!");
+            }
+            if(cycleCountPreference.getEnable() == false){
+                return AjaxResult.error("不能添加已停用的盘点首选项!");
+            }
+        }
         configValue.setWarehouseCode(ShiroUtils.getWarehouseCode());
         configValue.setCreatedBy(ShiroUtils.getLoginName());
         configValue.setLastUpdatedBy(ShiroUtils.getLoginName());
 package com.huaheng.pc.config.configValue.service;
-import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.pc.config.configValue.domain.ConfigValue;
 import com.huaheng.pc.config.configValue.mapper.ConfigValueMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 @Service
 public class ConfigValueService extends ServiceImpl<ConfigValueMapper, ConfigValue> {
+    /**
+     * 复制系统参数配置表
+     * @param warehouseCode 原仓库编码
+     * @param newWarehouseCode 新仓库编码
+     * @return 是否复制成功
+     */
+    public boolean configValueCopy(String warehouseCode, String newWarehouseCode){
+        log.trace("开始复制系统参数配置表");
+        LambdaQueryWrapper<ConfigValue> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(ConfigValue::getWarehouseCode, newWarehouseCode);
+        if (!this.list(lambdaQueryWrapper).isEmpty()){
+            log.error(newWarehouseCode+"仓库已存在");
+            return false;
+        }
+
+        lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(ConfigValue::getWarehouseCode, warehouseCode);
+        List<ConfigValue> configValueList = this.list(lambdaQueryWrapper);
+
+        for ( ConfigValue configValue : configValueList) {
+            configValue.setId(null);
+            configValue.setWarehouseCode(newWarehouseCode);
+        }
+
+        if ( this.saveBatch(configValueList) ){
+            log.trace("复制系统参数配置表成功，新仓库编码是："+newWarehouseCode);
+            return true;
+        } else {
+            return false;
+        }
+    }
 }
+package com.huaheng.pc.config.configWarning.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaheng.common.support.Convert;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.framework.aspectj.lang.annotation.Log;
+import com.huaheng.framework.aspectj.lang.constant.BusinessType;
+import com.huaheng.framework.web.controller.BaseController;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.framework.web.page.PageDomain;
+import com.huaheng.framework.web.page.TableDataInfo;
+import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.config.company.service.CompanyService;
+import com.huaheng.pc.config.configWarning.domain.ConfigWarning;
+import com.huaheng.pc.config.configWarning.service.ConfigWarningService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Created by Enzo Cotter on 2019/11/11.
+ * @author mahuandong
+ */
+
+@Api(tags = "预警配置")
+@Controller
+@RequestMapping("/config/configWarning")
+public class ConfigWarningController extends BaseController {
+
+    @Resource
+    private ConfigWarningService configWarningService;
+    @Resource
+    private CompanyService companyService;
+
+    private String prefix = "/config/configWarning";
+
+    @RequiresPermissions("config:configWarning:view")
+    @GetMapping()
+    public String configWarning() {
+        return prefix + "/configWarning";
+    }
+
+    /**
+     * 查询预警配置
+     */
+    @ApiOperation(value="查看预警配置列表",
+            notes="根据编码、物料编码、仓库编码、 货主编码、创建时间获取库位的详细信息",
+            httpMethod = "POST")
+    @RequiresPermissions("config:configWarning:list")
+    @Log(title = "配置-预警配置", operating = "查看预警配置列表", action = BusinessType.GRANT)
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(
+            @ApiParam(name="location",value="编码、物料编码、仓库编码、 货主编码、 类型") ConfigWarning configWarning,
+            @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
+            @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd) {
+        LambdaQueryWrapper<ConfigWarning> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin), ConfigWarning::getCreated, createdBegin)
+                .lt(StringUtils.isNotEmpty(createdEnd), ConfigWarning::getCreated, createdEnd)
+                .eq(StringUtils.isNotEmpty(configWarning.getCode()), ConfigWarning::getCode, configWarning.getCode())
+                .eq(ConfigWarning::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                .eq(StringUtils.isNotEmpty(configWarning.getCompanyCode()), ConfigWarning::getCompanyCode, configWarning.getCompanyCode())
+                .eq(StringUtils.isNotEmpty(configWarning.getMaterialCode()), ConfigWarning::getMaterialCode, configWarning.getMaterialCode())
+                .eq(StringUtils.isNotEmpty(configWarning.getMaterialName()), ConfigWarning::getMaterialName, configWarning.getMaterialName())
+                .like(StringUtils.isNotEmpty(configWarning.getEmail()), ConfigWarning::getEmail, configWarning.getEmail())
+                .eq(StringUtils.isNotEmpty(configWarning.getType()), ConfigWarning::getType, configWarning.getType());
+
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+            /*使用分页查询*/
+            Page<ConfigWarning> page = new Page<>(pageNum, pageSize);
+            IPage<ConfigWarning> iPage = configWarningService.page(page, lambdaQueryWrapper);
+            return getMpDataTable(iPage.getRecords(), iPage.getTotal());
+        } else {
+            List<ConfigWarning> list = configWarningService.list(lambdaQueryWrapper);
+            return getDataTable(list);
+        }
+    }
+
+    /**
+     * 新增预警配置
+     */
+    @GetMapping("/add")
+    public String add(ModelMap modelMap) {
+        modelMap.put("list",companyService.list());
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存预警配置
+     */
+    @ApiOperation(value="新增预警配置", notes="新增预警配置", httpMethod = "POST")
+    @RequiresPermissions("config:configWarning:add")
+    @Log(title = "配置-预警配置", operating = "新增预警配置", action = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(ConfigWarning configWarning)  {
+       return configWarningService.saveConfigWarning(configWarning);
+    }
+
+    /**
+     * 修改预警配置
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
+        ConfigWarning configWarning = configWarningService.getById(id);
+        mmap.put("configWarning", configWarning);
+        mmap.put("list",companyService.list());
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存预警配置
+     */
+    @ApiOperation(value="修改预警配置", notes="修改预警配置", httpMethod = "POST")
+    @RequiresPermissions("config:configWarning:edit")
+    @Log(title = "配置-预警配置", operating = "修改预警配置", action = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(
+            @ApiParam(name = "Container", value = "预警配置实体", required = true) ConfigWarning configWarning) {
+        return configWarningService.updateConfigWarning(configWarning);
+    }
+
+    /**
+     * 删除预警配置
+     */
+    @ApiOperation(value="删除预警配置", notes="根据id批量删除预警配置，参数示例1,2,3", httpMethod = "POST")
+    @RequiresPermissions("config:configWarning:remove")
+    @Log(title = "配置-预警配置", operating = "删除预警配置", action = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids) {
+        if (StringUtils.isEmpty(ids)){
+            return AjaxResult.error("id不能为空");
+        }
+        List<Integer> list = new ArrayList<>(Arrays.asList(Convert.toIntArray(ids)));
+
+        return toAjax(configWarningService.removeByIds(list));
+    }
+}
+package com.huaheng.pc.config.configWarning.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * Created by Enzo Cotter on 2019/11/11.
+ */
+
+@ApiModel(value = "com-huaheng-pc-config-configWarning-domain-ConfigWarning")
+@Data
+@TableName(value = "config_warning")
+public class ConfigWarning implements Serializable {
+    @TableId(value = "id", type = IdType.INPUT)
+    @ApiModelProperty(value = "null")
+    private Integer id;
+
+    /**
+     * 编码
+     */
+    @TableId(value = "code", type = IdType.INPUT)
+    @ApiModelProperty(value = "编码")
+    private String code;
+
+    /**
+     * 类型
+     */
+    @TableField(value = "type")
+    @ApiModelProperty(value = "类型")
+    private String type;
+
+    /**
+     * 仓库编码
+     */
+    @TableField(value = "warehouseCode")
+    @ApiModelProperty(value = "仓库编码")
+    private String warehouseCode;
+
+    /**
+     * 货主编码
+     */
+    @TableField(value = "companyCode")
+    @ApiModelProperty(value = "货主编码")
+    private String companyCode;
+
+    /**
+     * 物料编码
+     */
+    @TableField(value = "materialCode")
+    @ApiModelProperty(value = "物料编码")
+    private String materialCode;
+
+    /**
+     * 物料名称
+     */
+    @TableField(value = "materialName")
+    @ApiModelProperty(value = "物料名称")
+    private String materialName;
+
+    /**
+     * 物料规格
+     */
+    @TableField(value = "materialSpec")
+    @ApiModelProperty(value = "物料规格")
+    private String materialSpec;
+
+    /**
+     * 物料单位
+     */
+    @TableField(value = "materialUnit")
+    @ApiModelProperty(value = "物料单位")
+    private String materialUnit;
+
+    /**
+     * 最大
+     */
+    @TableField(value = "max")
+    @ApiModelProperty(value = "最大")
+    private BigDecimal max;
+
+    /**
+     * 最小
+     */
+    @TableField(value = "min")
+    @ApiModelProperty(value = "最小")
+    private BigDecimal min;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "created")
+    @ApiModelProperty(value = "创建时间")
+    private Date created;
+
+    /**
+     * 创建人
+     */
+    @TableField(value = "createdBy")
+    @ApiModelProperty(value = "创建人")
+    private String createdBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "lastUpdated")
+    @ApiModelProperty(value = "更新时间")
+    private Date lastUpdated;
+
+    /**
+     * 更新人
+     */
+    @TableField(value = "lastUpdatedBy")
+    @ApiModelProperty(value = "更新人")
+    private String lastUpdatedBy;
+
+    @TableField(value = "email")
+    @ApiModelProperty(value = "null")
+    private String email;
+
+    private static final long serialVersionUID = 1L;
+}
 \ No newline at end of file
+package com.huaheng.pc.config.configWarning.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huaheng.pc.config.configWarning.domain.ConfigWarning;
+
+/**
+ * Created by Enzo Cotter on 2019/11/11.
+ */
+
+public interface ConfigWarningMapper extends BaseMapper<ConfigWarning> {
+}
 \ No newline at end of file
+package com.huaheng.pc.config.configWarning.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.config.location.domain.Location;
+import com.huaheng.pc.config.location.service.LocationService;
+import com.huaheng.pc.config.material.domain.Material;
+import com.huaheng.pc.config.material.service.MaterialService;
+import com.huaheng.pc.config.sendMail.domain.SendMail;
+import com.huaheng.pc.config.sendMail.service.MailService;
+import com.huaheng.pc.config.sendMail.service.SendMailService;
+import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
+import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
+import com.huaheng.pc.system.user.domain.User;
+import com.huaheng.pc.system.user.service.IUserService;
+import com.huaheng.pc.system.user.service.UserServiceImpl;
+import org.aspectj.weaver.loadtime.Aj;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.pc.config.configWarning.domain.ConfigWarning;
+import com.huaheng.pc.config.configWarning.mapper.ConfigWarningMapper;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Created by Enzo Cotter on 2019/11/11.
+ */
+
+@Service
+public class ConfigWarningService extends ServiceImpl<ConfigWarningMapper, ConfigWarning> {
+
+    @Resource
+    private MaterialService materialService;
+    @Resource
+    private SendMailService sendMailService;
+    @Resource
+    private InventoryDetailService inventoryDetailService;
+    @Resource
+    private MailService mailService;
+    @Resource
+    private LocationService locationService;
+
+    /**
+     * 保存预警配置
+     * @param configWarning
+     * @return
+     */
+    @Transactional(rollbackFor = SecurityException.class)
+    public AjaxResult saveConfigWarning(ConfigWarning configWarning){
+        /* 设置仓库编码*/
+        configWarning.setWarehouseCode(ShiroUtils.getWarehouseCode());
+
+        /* 设置物料信息*/
+        if (configWarning.getMaterialCode() != null){
+            Material material = materialService.findAllByCode(configWarning.getMaterialCode());
+            configWarning.setMaterialName(material.getName());
+            configWarning.setMaterialSpec(material.getSpec());
+            configWarning.setMaterialUnit(material.getUnit());
+        }
+
+        /* 设置创建人、更新人*/
+        configWarning.setCreatedBy(ShiroUtils.getLoginName());
+        configWarning.setLastUpdatedBy(ShiroUtils.getLoginName());
+
+        /* 保存*/
+        if (!save(configWarning)){
+            throw new SecurityException("保存配置信息失败");
+        }
+        return AjaxResult.success("");
+    }
+
+    /**
+     * 保存预警配置
+     * @param configWarning
+     * @return
+     */
+    @Transactional(rollbackFor = SecurityException.class)
+    public AjaxResult updateConfigWarning(ConfigWarning configWarning){
+
+        /* 设置物料信息*/
+        if (configWarning.getMaterialCode() != null){
+            Material material = materialService.findAllByCode(configWarning.getMaterialCode());
+            configWarning.setMaterialName(material.getName());
+            configWarning.setMaterialSpec(material.getSpec());
+            configWarning.setMaterialUnit(material.getUnit());
+        }
+
+        /* 设置更新人*/
+        configWarning.setLastUpdatedBy(ShiroUtils.getLoginName());
+
+        if (!updateById(configWarning)){
+            throw new SecurityException("修改配置信息失败");
+        }
+        return AjaxResult.success("");
+    }
+
+    /**
+     * 物料预警
+     * @param map 任务明细
+     */
+    public void materialWarning(String materialCode, String materialName){
+        /* 查询预警配置*/
+        LambdaQueryWrapper<ConfigWarning> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(ConfigWarning::getMaterialCode, materialCode)
+                .eq(ConfigWarning::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                .eq(ConfigWarning::getType, 0);
+        ConfigWarning configWarning = this.getOne(lambdaQueryWrapper);
+
+        /* 当预警配置存在时*/
+        if (configWarning != null) {
+            String[] emailArray = configWarning.getEmail().split(";");
+            /* 收件人*/
+            String[] to = {emailArray[0]};
+            /* 抄送人*/
+            List<String> ccList = new ArrayList<>();
+            for (int i = 1; i < emailArray.length; i++) {
+                ccList.add(emailArray[i]);
+            }
+            String[] cc = ccList.toArray(new String[0]);
+
+            InventoryDetail inventoryDetail = new InventoryDetail();
+            inventoryDetail.setWarehouseCode(ShiroUtils.getWarehouseCode());
+            inventoryDetail.setMaterialCode(materialCode);
+            inventoryDetail.setInventorySts("good");
+            inventoryDetail.setCompanyCode(configWarning.getCompanyCode());
+            BigDecimal sum = inventoryDetailService.getSumQty(inventoryDetail);
+            SendMail sendMail = new SendMail();
+            sendMail.setWarehouseCode(ShiroUtils.getWarehouseCode());
+            sendMail.setCompanyCode(configWarning.getCompanyCode());
+            sendMail.setType(0);
+            sendMail.setEmail(configWarning.getEmail());
+            sendMail.setAlarmTime(new Date());
+            if (sum.compareTo(configWarning.getMax()) == 1) {
+                sendMail.setTitle(materialName + "超过最大库存");
+                sendMail.setBody(materialName + "超过最大库存,当前数量为" + sum);
+                if (!sendMailService.save(sendMail)) {
+                    throw new SecurityException("保存失败");
+                }
+                boolean resultMail = mailService.sendSimpleMail(to, sendMail.getTitle(), sendMail.getBody(), cc);
+                sendMail.setEnable(resultMail);
+                if (!sendMailService.updateById(sendMail)) {
+                    throw new SecurityException("更新失败");
+                }
+            } else if (sum.compareTo(configWarning.getMin()) == -1) {
+                sendMail.setTitle(materialName + "低于最低库存");
+                sendMail.setBody(materialName + "低于最低库存,当前数量为" + sum);
+                if (!sendMailService.save(sendMail)) {
+                    throw new SecurityException("保存失败");
+                }
+                boolean resultMail = mailService.sendSimpleMail(to, sendMail.getTitle(), sendMail.getBody(), cc);
+                sendMail.setEnable(resultMail);
+                if (!sendMailService.updateById(sendMail)) {
+                    throw new SecurityException("更新失败");
+                }
+            }
+        }
+    }
+
+    /**
+     * 空库位剩余数量预警
+     */
+    public void emptyLocationWarning(){
+        /* 查询预警配置*/
+        LambdaQueryWrapper<ConfigWarning> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(ConfigWarning::getWarehouseCode, ShiroUtils.getWarehouseCode())
+            .eq(ConfigWarning::getType, 1);
+        ConfigWarning configWarning = this.getOne(lambdaQueryWrapper);
+        /* 当预警配置存在时*/
+        if (configWarning != null) {
+            String[] emailArray = configWarning.getEmail().split(";");
+            /* 收件人*/
+            String[] to = {emailArray[0]};
+            /* 抄送人*/
+            List<String> ccList = new ArrayList<>();
+            for (int i = 1; i < emailArray.length; i++) {
+                ccList.add(emailArray[i]);
+            }
+            String[] cc = ccList.toArray(new String[0]);
+
+            LambdaQueryWrapper<Location> locationLambda = Wrappers.lambdaQuery();
+            locationLambda.eq(Location::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                    .eq(Location::getStatus, "empty");
+            BigDecimal sum = new BigDecimal(locationService.list(locationLambda).size());
+            SendMail sendMail = new SendMail();
+            sendMail.setWarehouseCode(ShiroUtils.getWarehouseCode());
+            sendMail.setType(1);
+            sendMail.setEmail(configWarning.getEmail());
+            sendMail.setAlarmTime(new Date());
+            if (sum.compareTo(configWarning.getMin()) == -1) {
+                sendMail.setTitle("空库位剩余"+sum+"个");
+                sendMail.setBody("空库位剩余"+sum+"个");
+                if (!sendMailService.save(sendMail)) {
+                    throw new SecurityException("保存失败");
+                }
+                boolean resultMail = mailService.sendSimpleMail(to, sendMail.getTitle(), sendMail.getBody(), cc);
+                sendMail.setEnable(resultMail);
+                if (!sendMailService.updateById(sendMail)) {
+                    throw new SecurityException("更新失败");
+                }
+            }
+        }
+    }
+}
+
@@ -11,7 +11,15 @@ import java.util.Map;
 @Service("containerType")
 public interface ContainerTypeService extends IService<ContainerType>{
-    public Boolean checkConfig(String code);
+    Boolean checkConfig(String code);
-    public List<Map<String, Object>> getCode();
+    List<Map<String, Object>> getCode();
+
+    /**
+     * 复制容器类型表
+     * @param warehouseCode 原仓库编码
+     * @param newWarehouseCode 新仓库编码
+     * @return 是否复制成功
+     */
+    boolean containerTypeCopy(String warehouseCode, String newWarehouseCode);
 }
@@ -4,14 +4,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.huaheng.common.utils.security.ShiroUtils;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
+
 import java.util.List;
 import java.util.Map;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.pc.config.containerType.domain.ContainerType;
 import com.huaheng.pc.config.containerType.mapper.ContainerTypeMapper;
-import com.huaheng.pc.config.containerType.service.ContainerTypeService;
+
 @Service("containerType")
 public class ContainerTypeServiceImpl extends ServiceImpl<ContainerTypeMapper, ContainerType> implements ContainerTypeService{
@@ -33,4 +33,37 @@ public class ContainerTypeServiceImpl extends ServiceImpl&lt;ContainerTypeMapper, C
         return result;
     }
+    /**
+     * 复制容器类型表
+     *
+     * @param warehouseCode    原仓库编码
+     * @param newWarehouseCode 新仓库编码
+     * @return 是否复制成功
+     */
+    @Override
+    public boolean containerTypeCopy(String warehouseCode, String newWarehouseCode) {
+        log.trace("开始复制容器类型表");
+        LambdaQueryWrapper<ContainerType> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(ContainerType::getWarehouseCode, newWarehouseCode);
+        if (!this.list(lambdaQueryWrapper).isEmpty()){
+            log.error(newWarehouseCode+"仓库已存在");
+            return false;
+        }
+        lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(ContainerType::getWarehouseCode, warehouseCode);
+        List<ContainerType> containerTypeList = this.list(lambdaQueryWrapper);
+
+        for ( ContainerType configValue : containerTypeList) {
+            configValue.setId(null);
+            configValue.setWarehouseCode(newWarehouseCode);
+        }
+
+        if ( this.saveBatch(containerTypeList) ){
+            log.trace("复制容器类型成功，新仓库编码是："+newWarehouseCode);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
 }
@@ -14,12 +14,10 @@ import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.framework.web.page.PageDomain;
 import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.config.configValue.domain.ConfigValue;
+import com.huaheng.pc.config.configValue.service.ConfigValueService;
 import com.huaheng.pc.config.cycleCountPreference.domain.CycleCountPreference;
 import com.huaheng.pc.config.cycleCountPreference.service.CycleCountPreferenceService;
-import com.huaheng.pc.config.receiptPreference.domain.ReceiptPreference;
-import com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -36,10 +34,14 @@ public class cycleCountPreferenceController extends BaseController {
     @Resource
     private CycleCountPreferenceService cycleCountPreferenceService;
+    @Resource
+    private ConfigValueService configValueService;
     private String prefix = "config/cycleCountPreference";
+
+    @RequiresPermissions("config:cycleCountPreference:view")
     @GetMapping()
     public String cyclecountHeader()
     {
@@ -49,7 +51,7 @@ public class cycleCountPreferenceController extends BaseController {
     /**
      * 查询盘点单主列表
      */
-    //@RequiresPermissions("inventory:cycleCount:list")
+    @RequiresPermissions("config:cycleCountPreference:list")
     @PostMapping("/list")
     @Log(title = "配置-库存配置",operating = "盘点首选项", action = BusinessType.GRANT)
     @ResponseBody
@@ -65,9 +67,11 @@ public class cycleCountPreferenceController extends BaseController {
                 .le(StringUtils.isNotEmpty(createdEnd), CycleCountPreference::getCreated, createdEnd)//创建时间范围
                 .eq(CycleCountPreference::getWarehouseCode, ShiroUtils.getWarehouseCode()) //仓库
                 .eq(StringUtils.isNotEmpty(cycleCountPreference.getCode()), CycleCountPreference::getCode, cycleCountPreference.getCode())//首选项编码
-                .eq(StringUtils.isNotEmpty(cycleCountPreference.getPromptLocation()),CycleCountPreference::getPromptLocation,cycleCountPreference.getPromptLocation())//提示货位
+
+                /*.eq(StringUtils.isNotEmpty(cycleCountPreference.getPromptLocation()),CycleCountPreference::getPromptLocation,cycleCountPreference.getPromptLocation())//提示货位
                 .eq(StringUtils.isNotEmpty(cycleCountPreference.getPromptLpn()),CycleCountPreference::getPromptLpn,cycleCountPreference.getPromptLpn())//提示PLN
                 .eq(StringUtils.isNotEmpty(cycleCountPreference.getPromptItem()),CycleCountPreference::getPromptItem,cycleCountPreference.getPromptItem())//提示物料
+                */
                 .eq(StringUtils.isNotEmpty(cycleCountPreference.getLastUpdatedBy()),CycleCountPreference::getLastUpdatedBy,cycleCountPreference.getLastUpdatedBy())//更新人
                 .eq(StringUtils.isNotEmpty(cycleCountPreference.getCreatedBy()),CycleCountPreference::getCreatedBy,cycleCountPreference.getCreatedBy())//创建人
@@ -96,17 +100,15 @@ public class cycleCountPreferenceController extends BaseController {
     /**
      * 新增保存盘点首选项
      */
-    //@RequiresPermissions("config:receiptPreference:add")
+    @RequiresPermissions("config:cycleCountPreference:add")
     @Log(title = "配置-盘点首选项", operating = "新增盘点首选项", action = BusinessType.INSERT)
     @PostMapping("/addSave")
     @ResponseBody
     public AjaxResult addSave(CycleCountPreference cycleCountPreference)  {
-        cycleCountPreference.setWarehouseCode(ShiroUtils.getWarehouseCode());
-        cycleCountPreference.setCreatedBy(ShiroUtils.getLoginName());
-        cycleCountPreference.setCreated(new Date());
-        cycleCountPreference.setLastUpdatedBy(ShiroUtils.getLoginName());
-
-        return toAjax(cycleCountPreferenceService.save(cycleCountPreference));
+        if(cycleCountPreference == null){
+            return AjaxResult.error("新增数据不能为空！");
+        }
+        return cycleCountPreferenceService.addSave(cycleCountPreference);
     }
     /**
@@ -121,11 +123,24 @@ public class cycleCountPreferenceController extends BaseController {
     /**
      * 修改保存盘点首选项
      */
-    //@RequiresPermissions("config:receiptPreference:edit")
+    @RequiresPermissions("config:cycleCountPreference:edit")
     @Log(title = "通用-盘点首选项", operating = "修改盘点首选项", action = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
     public AjaxResult editSave(CycleCountPreference cycleCountPreference) {
+        //不允许在被配置默认使用的情况先停用首选项
+        if(cycleCountPreference.getEnable() == false){
+            ConfigValue configValueTemp = new ConfigValue();
+            configValueTemp.setModuleType("cyclecount");
+            configValueTemp.setWarehouseCode(cycleCountPreference.getWarehouseCode());
+            LambdaQueryWrapper<ConfigValue> configValueLambdaQueryWrapper = Wrappers.lambdaQuery(configValueTemp);
+            ConfigValue configValue = configValueService.getOne(configValueLambdaQueryWrapper);
+            if(configValue != null){
+               if(configValue.getIdentifier().equals(cycleCountPreference.getCode())){
+                   return AjaxResult.error("该盘点首选项为系统配置默认选项，请删除系统配置中的选项再停用，修改失败！");
+               }
+            }
+        }
         cycleCountPreference.setLastUpdatedBy(ShiroUtils.getLoginName());
         cycleCountPreference.setLastUpdated(new Date());
         return toAjax(cycleCountPreferenceService.updateById(cycleCountPreference));
@@ -134,7 +149,7 @@ public class cycleCountPreferenceController extends BaseController {
     /**
      * 删除盘点首选项
      */
-    //@RequiresPermissions("config:receiptPreference:remove")
+    @RequiresPermissions("config:cycleCountPreference:remove")
     @Log(title = "通用-盘点首选项", operating = "删除盘点首选项", action = BusinessType.DELETE)
     @PostMapping( "/remove")
     @ResponseBody
@@ -144,6 +159,18 @@ public class cycleCountPreferenceController extends BaseController {
         }
         List<Integer> list = new ArrayList<>();
         for (Integer id : Convert.toIntArray(ids)) {
+            //校验该首选项是否在使用
+            CycleCountPreference cycleCountPreference = cycleCountPreferenceService.getById(id);
+                ConfigValue configValueTemp = new ConfigValue();
+                configValueTemp.setModuleType("cyclecount");
+                configValueTemp.setWarehouseCode(cycleCountPreference.getWarehouseCode());
+                LambdaQueryWrapper<ConfigValue> configValueLambdaQueryWrapper = Wrappers.lambdaQuery(configValueTemp);
+                ConfigValue configValue = configValueService.getOne(configValueLambdaQueryWrapper);
+                if(configValue != null){
+                    if(configValue.getIdentifier().equals(cycleCountPreference.getCode())){
+                        return AjaxResult.error("该盘点首选项为系统配置默认选项，请删除系统配置中的选项再删除，删除失败！");
+                    }
+                }
             list.add(id);
         }
         return toAjax(cycleCountPreferenceService.removeByIds(list));
@@ -48,41 +48,41 @@ public class CycleCountPreference implements Serializable {
      */
     @TableField(value = "promptLocation")
     @ApiModelProperty(value="系统提示货位")
-    private String promptLocation;
+    private Boolean promptLocation;
     /**
-     * 系统提示LPN
+     * 系统提示容器
      */
     @TableField(value = "promptLpn")
-    @ApiModelProperty(value="系统提示LPN")
-    private String promptLpn;
+    @ApiModelProperty(value="系统提示容器")
+    private Boolean promptLpn;
     /**
      * 系统提示物料
      */
     @TableField(value = "promptItem")
     @ApiModelProperty(value="系统提示物料")
-    private String promptItem;
+    private Boolean promptItem;
     /**
      * 显示库存数量
      */
     @TableField(value = "promptQuantity")
     @ApiModelProperty(value="显示库存数量")
-    private Integer promptQuantity;
+    private Boolean promptQuantity;
     /**
      * 允许添加库存
      */
     @TableField(value = "allowAddNewInventory")
     @ApiModelProperty(value="允许添加库存")
-    private Integer allowAddNewInventory;
+    private Boolean allowAddNewInventory;
     /**
      * 有效
      */
-    @TableField(value = "Enable")
-    @ApiModelProperty(value="有效")
+    @TableField(value = "enable")
+    @ApiModelProperty(value="是否有效")
     private Boolean enable;
     /**
@@ -153,7 +153,7 @@ public class CycleCountPreference implements Serializable {
      */
     @TableField(value = "countByPiece")
     @ApiModelProperty(value="RF逐件盘点")
-    private Integer countByPiece;
+    private Boolean countByPiece;
     private static final long serialVersionUID = 1L;
 }
 \ No newline at end of file
 package com.huaheng.pc.config.cycleCountPreference.service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.config.containerType.domain.ContainerType;
+import com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail;
+import com.huaheng.pc.inventory.cycleCountDetail.service.CycleCountDetailService;
+import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.pc.config.cycleCountPreference.mapper.CycleCountPreferenceMapper;
 import com.huaheng.pc.config.cycleCountPreference.domain.CycleCountPreference;
+import org.springframework.transaction.annotation.Transactional;
+
 @Service
 public class CycleCountPreferenceService extends ServiceImpl<CycleCountPreferenceMapper, CycleCountPreference> {
+    /**
+     *新增盘点首选项
+     * @param cycleCountPreference
+     * @return
+     */
+    @Transactional
+    public AjaxResult addSave (CycleCountPreference cycleCountPreference){
+
+        cycleCountPreference.setCode(newCode());
+        cycleCountPreference.setWarehouseCode(ShiroUtils.getWarehouseCode());
+        cycleCountPreference.setCreatedBy(ShiroUtils.getLoginName());
+        cycleCountPreference.setCreated(new Date());
+        cycleCountPreference.setLastUpdatedBy(ShiroUtils.getLoginName());
+        this.save(cycleCountPreference);
+        return AjaxResult.success("新增完成！");
+    }
+
+
+    /**
+     * 自动生成盘点首选项Code
+     * 使用特定字段和ID组合成Code
+     */
+    public String newCode(){
+        //先查询前一个ID生成当前的数字，再拼接
+        String code = null;
+        Date now = new Date();
+        SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
+        LambdaQueryWrapper<CycleCountPreference> lambda = Wrappers.lambdaQuery();
+        lambda.select(CycleCountPreference::getCode)
+                .orderByDesc(CycleCountPreference::getId).last("Limit 1");
+        // code = ccp + 日期 + (排序号 + 1)
+        String maxCode = null;
+        CycleCountPreference cycleCountPreference = this.getOne(lambda);
+        if ( cycleCountPreference != null){
+            maxCode = this.getOne(lambda).getCode();
+        }
+        if (maxCode != null && maxCode.substring(maxCode.length() - 13, maxCode.length() - 5).equals(df.format(now))) {
+            Integer Count = Integer.valueOf(maxCode.substring(maxCode.length() - 5 ));
+            code = "ccp" + df.format(now) + String.format("%05d", Count + 1);
+        } else {
+            code = "ccp" + df.format(now) +"00001";
+        }
+        return code;
+    }
+
+    /**
+     * 复制盘点首选项表
+     *
+     * @param warehouseCode    原仓库编码
+     * @param newWarehouseCode 新仓库编码
+     * @return 是否复制成功
+     */
+    public boolean cycleCountPreferenceCopy(String warehouseCode, String newWarehouseCode) {
+        log.trace("开始复盘点首选项表");
+        LambdaQueryWrapper<CycleCountPreference> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(CycleCountPreference::getWarehouseCode, newWarehouseCode);
+        if (!this.list(lambdaQueryWrapper).isEmpty()){
+            log.error(newWarehouseCode+"仓库已存在");
+            return false;
+        }
+
+        lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(CycleCountPreference::getWarehouseCode, warehouseCode);
+        List<CycleCountPreference> cycleCountPreferenceList = this.list(lambdaQueryWrapper);
+
+        for ( CycleCountPreference countPreference : cycleCountPreferenceList) {
+            countPreference.setId(null);
+            countPreference.setWarehouseCode(newWarehouseCode);
+        }
+
+        if ( this.saveBatch(cycleCountPreferenceList) ){
+            log.trace("复制盘点首选项表成功，新仓库编码是："+newWarehouseCode);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+
+
+
+
+
+
+
 }
@@ -15,16 +15,25 @@ import com.huaheng.framework.web.page.PageDomain;
 import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
 import com.huaheng.pc.config.location.domain.Location;
+import com.huaheng.pc.config.location.domain.LocationStatus;
 import com.huaheng.pc.config.location.service.LocationService;
+import com.huaheng.pc.config.material.domain.Material;
+import com.huaheng.pc.config.material.service.MaterialService;
+import com.huaheng.pc.config.materialType.service.MaterialTypeService;
+import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
+import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
+import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import io.swagger.models.auth.In;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 @Api(tags={"库位操作类"})
@@ -36,6 +45,10 @@ public class LocationController extends BaseController {
     @Resource
     private LocationService locationService;
+    @Resource
+    private InventoryDetailService inventoryDetailService;
+    @Resource
+    private MaterialService materialService;
     @RequiresPermissions("config:location:view")
     @GetMapping()
@@ -89,6 +102,21 @@ public class LocationController extends BaseController {
     }
     /**
+     * 查询库位列表
+     */
+    @Log(title = "通用-库位管理", operating = "查看库位列表", action = BusinessType.GRANT)
+    @PostMapping("/getAllLocation")
+    @ResponseBody
+    public AjaxResult getAllLocation(String type)  {
+        if (StringUtils.isEmpty(type)) {
+            return AjaxResult.error("type不能为空");
+        }
+
+        return AjaxResult.success(locationService.getAllLocation(type));
+    }
+
+
+    /**
      * 新增库位
      */
     @GetMapping("/add")
@@ -123,7 +151,7 @@ public class LocationController extends BaseController {
     /**
      * 批量新增保存库位
      */
-    @RequiresPermissions("config:location:add")
+    @RequiresPermissions("config:location:addBatch")
     @ApiOperation(value="新增库位", notes="批量新增库位", httpMethod = "POST")
     @Log(title = "通用-库位管理", operating = "新增库位", action = BusinessType.INSERT)
     @PostMapping("/addBatchSave")
@@ -163,8 +191,9 @@ public class LocationController extends BaseController {
     @PostMapping( "/remove")
     @ResponseBody
     public AjaxResult remove(String ids) {
-        if (StringUtils.isEmpty(ids))
+        if (StringUtils.isEmpty(ids)){
             return AjaxResult.error("id不能为空");
+        }
         for (Integer id : Convert.toIntArray(ids)) {
             Location location = locationService.getById(id);
             if (StringUtils.isEmpty(location.getContainerCode())) {
@@ -178,4 +207,108 @@ public class LocationController extends BaseController {
         }
         return AjaxResult.success("删除成功！");
     }
+
+    /**
+     * 查询库位列表
+     */
+    @Log(title = "通用-库位管理", operating = "查看库位列表", action = BusinessType.GRANT)
+    @PostMapping("/getLocationInfo")
+    @ResponseBody
+    public AjaxResult getLocationInfo(String type, String row, String line, String layer, String grid)  {
+        if (StringUtils.isEmpty(type)) {
+            return AjaxResult.error("type不能为空");
+        }
+
+        /* 查询库位信息*/
+        LambdaQueryWrapper<Location> locationLambdaQueryWrapper = Wrappers.lambdaQuery();
+        locationLambdaQueryWrapper.eq(StringUtils.isNotEmpty(row), Location::getIRow, row)
+                .eq(StringUtils.isNotEmpty(line), Location::getIColumn, line)
+                .eq(StringUtils.isNotEmpty(layer), Location::getILayer, layer)
+                .eq(Location::getIGrid, 1)
+                .eq(StringUtils.isNotEmpty(type), Location::getLocationType, type)
+                .eq(Location::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                .eq(StringUtils.isNotEmpty(type), Location::getZoneCode, type);
+        List<Location> locations = locationService.list(locationLambdaQueryWrapper);
+        List<Location> locationList = new ArrayList<>();
+
+        /* 查询库存明细*/
+        LambdaQueryWrapper<InventoryDetail> inventoryDetailLambda = Wrappers.lambdaQuery();
+        inventoryDetailLambda.eq(InventoryDetail::getWarehouseCode, ShiroUtils.getWarehouseCode());
+        List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailLambda);
+
+        LambdaQueryWrapper<Material> materialLambda = Wrappers.lambdaQuery();
+        materialLambda.eq(Material::getWarehouseCode, ShiroUtils.getWarehouseCode());
+        List<Material> materialList = materialService.list(materialLambda);
+
+        for(Location location1 : locations) {
+            InventoryDetail inventoryDetail = null;
+            String materialName = null;
+            for (InventoryDetail inventoryDetail2: inventoryDetailList) {
+                if (location1.getCode().equals(inventoryDetail2.getLocationCode())){
+                    inventoryDetail = inventoryDetail2;
+                }
+            }
+            if (inventoryDetail != null){
+                for (Material material :  materialList) {
+                    if (material.getCode().equals(inventoryDetail.getMaterialCode())){
+                        materialName = material.getName();
+                        break;
+                    }
+                }
+            }
+
+            int userDef3 = 0;
+            String status = location1.getStatus();
+            String containerCode = location1.getContainerCode();
+            if (status.equals("empty")) {
+                if(StringUtils.isEmpty(containerCode)) {
+                    userDef3 = LocationStatus.IDLE_EMPTY_LOCATION;
+                } else {
+                    if(inventoryDetail == null) {
+                        userDef3 = LocationStatus.IDLE_EMPTY_CONTAINER;
+                    } else {
+                        location1.setMaterialName(materialName);
+                        location1.setMaterialCode(inventoryDetail.getMaterialCode());
+                        location1.setBatch(inventoryDetail.getBatch());
+                        location1.setQty(String.valueOf(inventoryDetail.getQty()));
+                        userDef3 = LocationStatus.IDLE_FULL_CONTAINER;
+                    }
+                }
+            } else if(status.equals("lock")) {
+                if(StringUtils.isEmpty(containerCode)) {
+                    userDef3 = LocationStatus.LOCK_EMPTY_LOCATION;
+                } else {
+                    if(inventoryDetail == null) {
+                        userDef3 = LocationStatus.LOCK_EMPTY_CONTAINER;
+                    } else {
+                        location1.setMaterialName(materialName);
+                        location1.setMaterialCode(inventoryDetail.getMaterialCode());
+                        location1.setBatch(inventoryDetail.getBatch());
+                        location1.setQty(String.valueOf(inventoryDetail.getQty()));
+                        userDef3 = LocationStatus.LOCK_FULL_CONTAINER;
+                    }
+                }
+            }
+
+            if (location1.getDeleted()) {
+                if(StringUtils.isEmpty(containerCode)) {
+                    userDef3 = LocationStatus.DISABLE_EMPTY_LOCATION;
+                } else {
+                    if(inventoryDetail == null) {
+                        userDef3 = LocationStatus.DISABLE_EMPTY_CONTAINER;
+                    } else {
+                        location1.setMaterialName(materialName);
+                        location1.setMaterialCode(inventoryDetail.getMaterialCode());
+                        location1.setBatch(inventoryDetail.getBatch());
+                        location1.setQty(String.valueOf(inventoryDetail.getQty()));
+                        userDef3 = LocationStatus.DISABLE_FULL_CONTAINER;
+                    }
+                }
+            }
+
+            location1.setUserDef3(String.valueOf(userDef3));
+            locationList.add(location1);
+        }
+        return AjaxResult.success(locations);
+    }
 }
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
 import lombok.Data;
+import org.springframework.transaction.annotation.Transactional;
 @Data
 @TableName(value = "location")
@@ -72,6 +73,12 @@ public class Location implements Serializable {
     private Integer iGrid;
     /**
+     * 巷道
+     */
+    @TableField(value = "roadway")
+    private String roadway;
+
+    /**
      * 名称
      */
     @TableField(value = "name")
@@ -173,57 +180,14 @@ public class Location implements Serializable {
     @TableField(value = "deleted")
     private Boolean deleted;
-    private static final long serialVersionUID = 1L;
-
-    public static final String COL_CODE = "code";
-
-    public static final String COL_WAREHOUSECODE = "warehouseCode";
-
-    public static final String COL_ZONECODE = "zoneCode";
-
-    public static final String COL_LOCATIONTYPE = "locationType";
-
-    public static final String COL_CONTAINERCODE = "containerCode";
-
-    public static final String COL_IROW = "iRow";
-
-    public static final String COL_ICOLUMN = "iColumn";
-
-    public static final String COL_ILAYER = "iLayer";
-
-    public static final String COL_IGRID = "iGrid";
-    public static final String COL_NAME = "name";
+    private transient String materialCode;
-    public static final String COL_ENABLE = "enable";
+    private transient String materialName;
-    public static final String COL_LASTCYCLECOUNTDATE = "lastCycleCountDate";
+    private transient String batch;
-    public static final String COL_CREATED = "created";
+    private transient String qty;
-    public static final String COL_CREATEDBY = "createdBy";
-
-    public static final String COL_LASTUPDATED = "lastUpdated";
-
-    public static final String COL_LASTUPDATEDBY = "lastUpdatedBy";
-
-    public static final String COL_VERSION = "version";
-
-    public static final String COL_USERDEF1 = "userDef1";
-
-    public static final String COL_USERDEF2 = "userDef2";
-
-    public static final String COL_USERDEF3 = "userDef3";
-
-    public static final String COL_USERDEF4 = "userDef4";
-
-    public static final String COL_USERDEF5 = "userDef5";
-
-    public static final String COL_USERDEF6 = "userDef6";
-
-    public static final String COL_USERDEF7 = "userDef7";
-
-    public static final String COL_USERDEF8 = "userDef8";
-
-    public static final String COL_SYSTEMCREATED = "systemCreated";
+    private static final long serialVersionUID = 1L;
 }
 \ No newline at end of file
+package com.huaheng.pc.config.location.domain;
+
+import lombok.Data;
+
+/**
+ * Created by Enzo Cotter on 2019/10/25.
+ */
+@Data
+public class LocationInfo {
+    private long maxRow;
+    private long maxLine;
+    private long maxLayer;
+    private long maxGrid;
+}
+package com.huaheng.pc.config.location.domain;
+
+/**
+ * Created by Enzo Cotter on 2019/10/25.
+ */
+public class LocationStatus {
+
+    public static final int IDLE_EMPTY_LOCATION = 1; //空柜空闲
+    public static final int IDLE_EMPTY_CONTAINER = 2;  //空盘空闲
+    public static final int IDLE_HALF_CONTAINER = 3;  //半盘空闲
+    public static final int IDLE_FULL_CONTAINER = 4;  //满盘空闲
+    public static final int LOCK_EMPTY_LOCATION = 5; //空柜锁定
+    public static final int LOCK_EMPTY_CONTAINER = 6; //空盘锁定
+    public static final int LOCK_HALF_CONTAINER = 7;  //半盘锁定
+    public static final int LOCK_FULL_CONTAINER = 8;  //满盘锁定
+    public static final int DISABLE_EMPTY_LOCATION = 9; //空柜禁用
+    public static final int DISABLE_EMPTY_CONTAINER = 10; //空盘禁用
+    public static final int DISABLE_HALF_CONTAINER = 11;  //半盘禁用
+    public static final int DISABLE_FULL_CONTAINER = 12;  //满盘禁用
+}
@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huaheng.pc.config.location.domain.Location;
 import org.apache.ibatis.annotations.Param;
+import java.util.LinkedHashMap;
+import java.util.List;
+
 public interface LocationMapper extends BaseMapper<Location> {
     void updateStatus(@Param("warehouseCode") String warehouseCode, @Param("code") String code, @Param("status") String status);
@@ -11,4 +14,9 @@ public interface LocationMapper extends BaseMapper&lt;Location&gt; {
     void updateContainerCodeAndStatus(@Param("warehouseCode") String warehouseCode, @Param("locationCode") String locationCode, @Param("containerCode") String containerCode, @Param("status") String status);
     Location position(String locatingRule);
+
+    Location getAllLocation(@Param("warehouseCode") String warehouseCode, @Param("type") String type);
+
+    //库位利用率
+    List<LinkedHashMap<String, Object>> getLocationProp();
 }
 \ No newline at end of file
@@ -3,6 +3,11 @@ package com.huaheng.pc.config.location.service;
 import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.pc.config.location.domain.Location;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huaheng.pc.config.location.domain.LocationInfo;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+
 public interface LocationService extends IService<Location>{
     AjaxResult addsave(Location location);
@@ -15,4 +20,8 @@ public interface LocationService extends IService&lt;Location&gt;{
     void updateContainerCodeAndStatus(String locationCode, String containerCode, String status);
+    LocationInfo getAllLocation(String type);
+
+    //库位利用率
+    List<LinkedHashMap<String, Object>> getLocationProp();
 }
@@ -7,6 +7,7 @@ import com.huaheng.common.exception.service.ServiceException;
 import com.huaheng.common.utils.StringUtils;
 import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.config.location.domain.LocationInfo;
 import com.huaheng.pc.config.locationType.domain.LocationType;
 import com.huaheng.pc.config.locationType.service.LocationTypeService;
 import com.huaheng.pc.config.zone.domain.Zone;
@@ -15,6 +16,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.text.MessageFormat;
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -73,13 +75,18 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
         return AjaxResult.success("新增库位成功");
     }
+    /**
+     * 批量新增库位
+     * @param location
+     * @return boolean
+     */
     @Override
     public boolean insertLocation(Location location) {
         /* 判断库位类型编码是否存在*/
-        LambdaQueryWrapper<LocationType> typelambda = Wrappers.lambdaQuery();
-        typelambda.eq(LocationType::getCode,location.getLocationType())
+        LambdaQueryWrapper<LocationType> typeLambda = Wrappers.lambdaQuery();
+        typeLambda.eq(LocationType::getCode,location.getLocationType())
                         .select(LocationType::getCode);
-        List<Map<String, Object>> list = locationTypeService.listMaps(typelambda);
+        List<Map<String, Object>> list = locationTypeService.listMaps(typeLambda);
         if (list.size() < 1){
             throw new ServiceException("库位类型编码不存在");
         }
@@ -97,7 +104,7 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
         if(!location.getZoneCode().equals(location.getLocationType())){
             throw new ServiceException(location.getLocationType()+"的库位类型与"+location.getZoneCode()+"库区不匹配");
         }
-        String prefix = location.getLocationType().substring(1);
+
         List<Location> locations = new ArrayList<>();
         for (int i=1; i<=location.getIRow().intValue(); i++)  {
             for (int j=1; j<=location.getIColumn().intValue(); j++)  {
@@ -109,6 +116,7 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
                         param.setIColumn(j);
                         param.setILayer(k);
                         param.setIGrid(m);
+                        param.setRoadway(location.getRoadway());
                         param.setZoneCode(location.getZoneCode());
                         param.setLocationType(location.getLocationType());
                         param.setStatus(location.getStatus());
@@ -116,11 +124,12 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
                         param.setCreatedBy(ShiroUtils.getLoginName());
                         param.setLastUpdatedBy(ShiroUtils.getLoginName());
                         String code = MessageFormat.format("{0}{1}-{2}-{3}-{4}",
-                                prefix,
+                                location.getLocationType(),
                                 String.format("%02d", i),
                                 String.format("%02d", j),
                                 String.format("%02d", k),
                                 String.format("%02d", m));
+                        //查询该库位编码是否存在
                         LambdaQueryWrapper<Location> queryWrapper = Wrappers.lambdaQuery();
                         queryWrapper.eq(Location::getCode,code)
                                 .eq(Location::getWarehouseCode,ShiroUtils.getWarehouseCode());
@@ -133,8 +142,7 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
                 }
             }
         }
-        Boolean result = locationService.saveBatch(locations);
-        return result;
+        return locationService.saveBatch(locations);
     }
     @Override
@@ -149,6 +157,7 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
      * @param locatingRule
      * @return
      */
+    @Override
     public String position(String locatingRule){
         return locationMapper.position(locatingRule).getCode();
     }
@@ -158,9 +167,28 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
      * */
     @Override
     public void updateContainerCodeAndStatus(String locationCode, String containerCode, String status) {
-        if (StringUtils.isNotEmpty(locationCode) || StringUtils.isNotEmpty(containerCode))
+        if (StringUtils.isNotEmpty(locationCode) || StringUtils.isNotEmpty(containerCode)) {
             locationMapper.updateContainerCodeAndStatus(ShiroUtils.getWarehouseCode(), locationCode, containerCode, status);
+        }
     }
+    @Override
+    public LocationInfo getAllLocation(String type) {
+        if (StringUtils.isNotEmpty(type)) {
+            Location location = locationMapper.getAllLocation(ShiroUtils.getWarehouseCode(), type);
+            LocationInfo locationInfo = new LocationInfo();
+            locationInfo.setMaxRow(location.getIRow());
+            locationInfo.setMaxLine(location.getIColumn());
+            locationInfo.setMaxLayer(location.getILayer());
+            locationInfo.setMaxGrid(location.getIGrid());
+            return locationInfo;
+        }
+        return null;
+    }
+
+    @Override
+    public List<LinkedHashMap<String, Object>> getLocationProp() {
+        return locationMapper.getLocationProp();
+    }
 }
@@ -8,5 +8,13 @@ import java.util.Map;
 public interface LocationTypeService extends IService<LocationType>{
-    public List<Map<String, Object>> getLocationPrefix();
+    List<Map<String, Object>> getLocationPrefix();
+
+    /**
+     * 复制库位类型表
+     * @param warehouseCode 原仓库编码
+     * @param newWarehouseCode 新仓库编码
+     * @return 是否复制成功
+     */
+    boolean locationTypeCopy(String warehouseCode, String newWarehouseCode);
 }
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.pc.config.cycleCountPreference.domain.CycleCountPreference;
 import com.huaheng.pc.config.locationType.domain.LocationType;
 import com.huaheng.pc.config.locationType.mapper.LocationTypeMapper;
 import org.springframework.stereotype.Service;
@@ -14,10 +15,45 @@ import java.util.Map;
 @Service("locationType")
 public class LocationTypeServiceImpl extends ServiceImpl<LocationTypeMapper, LocationType> implements LocationTypeService{
+    @Override
     public List<Map<String, Object>> getLocationPrefix(){
         LambdaQueryWrapper<LocationType> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.eq(LocationType::getWarehouseCode, ShiroUtils.getWarehouseCode())
                 .eq(LocationType::getEnable, true);
         return this.listMaps(lambdaQueryWrapper);
     }
+
+    /**
+     * 复制库位类型表
+     *
+     * @param warehouseCode    原仓库编码
+     * @param newWarehouseCode 新仓库编码
+     * @return 是否复制成功
+     */
+    @Override
+    public boolean locationTypeCopy(String warehouseCode, String newWarehouseCode) {
+        log.trace("开始复盘点首选项表");
+        LambdaQueryWrapper<LocationType> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(LocationType::getWarehouseCode, newWarehouseCode);
+        if (!this.list(lambdaQueryWrapper).isEmpty()){
+            log.error(newWarehouseCode+"仓库已存在");
+            return false;
+        }
+
+        lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(LocationType::getWarehouseCode, warehouseCode);
+        List<LocationType> locationTypeList = this.list(lambdaQueryWrapper);
+
+        for ( LocationType locationType : locationTypeList) {
+            locationType.setId(null);
+            locationType.setWarehouseCode(newWarehouseCode);
+        }
+
+        if ( this.saveBatch(locationTypeList) ){
+            log.trace("复制盘点首选项表成功，新仓库编码是："+newWarehouseCode);
+            return true;
+        } else {
+            return false;
+        }
+    }
 }
 package com.huaheng.pc.config.receiptPreference.service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huaheng.pc.config.cycleCountPreference.domain.CycleCountPreference;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.List;
@@ -9,4 +12,36 @@ import com.huaheng.pc.config.receiptPreference.domain.ReceiptPreference;
 @Service
 public class ReceiptPreferenceService extends ServiceImpl<ReceiptPreferenceMapper, ReceiptPreference> {
+    /**
+     * 复制盘点首选项表
+     *
+     * @param warehouseCode    原仓库编码
+     * @param newWarehouseCode 新仓库编码
+     * @return 是否复制成功
+     */
+    public boolean receiptPreferenceCopy(String warehouseCode, String newWarehouseCode) {
+        log.trace("开始入库首选项表");
+        LambdaQueryWrapper<ReceiptPreference> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(ReceiptPreference::getWarehouseCode, newWarehouseCode);
+        if (!this.list(lambdaQueryWrapper).isEmpty()){
+            log.error(newWarehouseCode+"仓库已存在");
+            return false;
+        }
+
+        lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(ReceiptPreference::getWarehouseCode, warehouseCode);
+        List<ReceiptPreference> receiptPreferenceList = this.list(lambdaQueryWrapper);
+
+        for ( ReceiptPreference receiptPreference : receiptPreferenceList) {
+            receiptPreference.setId(null);
+            receiptPreference.setWarehouseCode(newWarehouseCode);
+        }
+
+        if ( this.saveBatch(receiptPreferenceList) ){
+            log.trace("复制入库首选项表成功，新仓库编码是："+newWarehouseCode);
+            return true;
+        } else {
+            return false;
+        }
+    }
 }
@@ -5,5 +5,11 @@ import com.huaheng.pc.config.receiptType.domain.ReceiptType;
 public interface ReceiptTypeService extends IService<ReceiptType>{
-
+    /**
+     * 复制入库类型表
+     * @param warehouseCode 原仓库编码
+     * @param newWarehouseCode 新仓库编码
+     * @return 是否复制成功
+     */
+    Boolean receiptTypeCopy(String warehouseCode, String newWarehouseCode);
 }
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.pc.config.address.domain.Address;
 import com.huaheng.pc.config.receiptType.domain.ReceiptType;
 import com.huaheng.pc.config.receiptType.mapper.ReceiptTypeMapper;
 import org.springframework.stereotype.Service;
@@ -20,4 +21,38 @@ public class ReceiptTypeServiceImpl extends ServiceImpl&lt;ReceiptTypeMapper, Recei
                 .in(ReceiptType::getCompanyCode, ShiroUtils.getCompanyCodeList());
         return this.listMaps(lambdaQueryWrapper);
     }
+
+    /**
+     * 复制入库类型表
+     *
+     * @param warehouseCode    原仓库编码
+     * @param newWarehouseCode 新仓库编码
+     * @return 是否复制成功
+     */
+    @Override
+    public Boolean receiptTypeCopy(String warehouseCode, String newWarehouseCode) {
+        log.trace("开始复制入库类型表");
+        LambdaQueryWrapper<ReceiptType> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(ReceiptType::getWarehouseCode, newWarehouseCode);
+        if (!this.list(lambdaQueryWrapper).isEmpty()){
+            log.error("该仓库已存在");
+            return false;
+        }
+
+        lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(ReceiptType::getWarehouseCode, warehouseCode);
+        List<ReceiptType> receiptTypeList = this.list(lambdaQueryWrapper);
+
+        for ( ReceiptType receiptType : receiptTypeList) {
+            receiptType.setId(null);
+            receiptType.setWarehouseCode(newWarehouseCode);
+        }
+
+        if ( this.saveBatch(receiptTypeList) ){
+            log.trace("复制入库类型成功，新仓库编码是："+newWarehouseCode);
+            return true;
+        } else {
+            return false;
+        }
+    }
 }
@@ -10,6 +10,9 @@ import java.io.Serializable;
 import java.util.Date;
 import lombok.Data;
+/**
+ * @author mahuandong
+ */
 @ApiModel(value="com.huaheng.pc.config.sendMail.domain.SendMail")
 @Data
 @TableName(value = "send_mail")
@@ -12,6 +12,7 @@ public interface MailService {
      * @param subject 主题
      * @param content 内容
      * @param cc 抄送
+     * @return 是否发送成功
      */
     Boolean sendSimpleMail(String[] to, String subject, String content, String[] cc);
     /**
@@ -20,6 +21,7 @@ public interface MailService {
      * @param subject 主题
      * @param content 内容（可以包含<html>等标签）
      * @param cc 抄送
+     * @return 是否发送成功
      */
     Boolean sendHtmlMail(String[] to, String subject, String content, String[] cc);
     /**
@@ -29,6 +31,7 @@ public interface MailService {
      * @param content 内容
      * @param filePath 附件路径
      * @param cc 抄送
+     * @return 是否发送成功
      */
     Boolean sendAttachmentMail(String[] to, String subject, String content, String filePath, String[] cc);
     /**
@@ -39,6 +42,7 @@ public interface MailService {
      * @param rscPath 图片路径
      * @param rscId 图片ID，用于在<img>标签中使用，从而显示图片
      * @param cc 抄送邮箱
+     * @return 是否发送成功
      */
     Boolean sendInlineResourceMail(String[] to, String subject, String content, String rscPath, String rscId, String[] cc);
 }
@@ -12,4 +12,12 @@ public interface ShipmentPreferenceService extends IService&lt;ShipmentPreference&gt;{
     //查看出库此操作是否符合出库首选项的出库流程
     List<ShipmentHeader>  checkShipmentProcess(String ids, Integer status,String code);
+    /**
+     * 复制出库首选项表
+     * @param warehouseCode 原仓库编码
+     * @param newWarehouseCode 新仓库编码
+     * @return 是否复制成功
+     */
+    boolean shipmentPreferenceCopy(String warehouseCode, String newWarehouseCode);
+
 }
@@ -109,4 +109,38 @@ public class ShipmentPreferenceServiceImpl extends ServiceImpl&lt;ShipmentPreferenc
         return shipmentHeaderList;
     }
+
+    /**
+     * 复制出库首选项表
+     *
+     * @param warehouseCode    原仓库编码
+     * @param newWarehouseCode 新仓库编码
+     * @return 是否复制成功
+     */
+    @Override
+    public boolean shipmentPreferenceCopy(String warehouseCode, String newWarehouseCode) {
+        log.trace("开始复制出库首选项表");
+        LambdaQueryWrapper<ShipmentPreference> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(ShipmentPreference::getWarehouseCode, newWarehouseCode);
+        if (!this.list(lambdaQueryWrapper).isEmpty()){
+            log.error("该仓库已存在");
+            return false;
+        }
+
+        lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(ShipmentPreference::getWarehouseCode, warehouseCode);
+        List<ShipmentPreference> shipmentPreferenceList = this.list(lambdaQueryWrapper);
+
+        for ( ShipmentPreference shipmentPreference : shipmentPreferenceList) {
+            shipmentPreference.setId(null);
+            shipmentPreference.setWarehouseCode(newWarehouseCode);
+        }
+
+        if ( this.saveBatch(shipmentPreferenceList) ){
+            log.trace("复制出库首选项成功，新仓库编码是："+newWarehouseCode);
+            return true;
+        } else {
+            return false;
+        }
+    }
 }
-package com.huaheng.pc.config.shipmentType.config;
+package com.huaheng.pc.config.shipmentType.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -5,5 +5,11 @@ import com.huaheng.pc.config.shipmentType.domain.ShipmentType;
 public interface ShipmentTypeService extends IService<ShipmentType>{
-
+    /**
+     * 复制出库类型表
+     * @param warehouseCode 原仓库编码
+     * @param newWarehouseCode 新仓库编码
+     * @return 是否复制成功
+     */
+    boolean ShipmentTypeCopy(String warehouseCode, String newWarehouseCode);
 }
 package com.huaheng.pc.config.shipmentType.service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.pc.config.shipmentPreference.domain.ShipmentPreference;
 import com.huaheng.pc.config.shipmentType.domain.ShipmentType;
 import com.huaheng.pc.config.shipmentType.mapper.ShipmentTypeMapper;
 import org.springframework.stereotype.Service;
+import java.util.List;
+
 @Service
 public class ShipmentTypeServiceImpl extends ServiceImpl<ShipmentTypeMapper, ShipmentType> implements ShipmentTypeService {
+    /**
+     * 复制出库首选项表
+     *
+     * @param warehouseCode    原仓库编码
+     * @param newWarehouseCode 新仓库编码
+     * @return 是否复制成功
+     */
+    @Override
+    public boolean ShipmentTypeCopy(String warehouseCode, String newWarehouseCode) {
+        log.trace("开始复制出库类型表");
+        LambdaQueryWrapper<ShipmentType> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(ShipmentType::getWarehouseCode, newWarehouseCode);
+        if (!this.list(lambdaQueryWrapper).isEmpty()){
+            log.error("该仓库已存在");
+            return false;
+        }
+
+        lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(ShipmentType::getWarehouseCode, warehouseCode);
+        List<ShipmentType> shipmentTypeList = this.list(lambdaQueryWrapper);
+
+        for ( ShipmentType shipmentType : shipmentTypeList) {
+            shipmentType.setId(null);
+            shipmentType.setWarehouseCode(newWarehouseCode);
+        }
+
+        if ( this.saveBatch(shipmentTypeList) ){
+            log.trace("复制出库类型成功，新仓库编码是："+newWarehouseCode);
+            return true;
+        } else {
+            return false;
+        }
+    }
 }
+package com.huaheng.pc.config.station.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaheng.common.support.Convert;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.framework.aspectj.lang.annotation.Log;
+import com.huaheng.framework.aspectj.lang.constant.BusinessType;
+import com.huaheng.framework.web.controller.BaseController;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.framework.web.page.PageDomain;
+import com.huaheng.framework.web.page.TableDataInfo;
+import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.config.station.domain.Station;
+import com.huaheng.pc.config.station.service.StationService;
+import io.swagger.annotations.ApiParam;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Created by Enzo Cotter on 2019/10/14.
+ */
+@Controller
+@RequestMapping("/config/station")
+public class stationController extends BaseController {
+
+    @Resource
+    private StationService stationService;
+
+    private String prefix = "config/station";
+
+    @RequiresPermissions("config:station:view")
+    @GetMapping()
+    public String station() {
+        return prefix + "/station";
+    }
+
+    /**
+     * 查询出库类型
+     */
+    @RequiresPermissions("config:station:list")
+    @Log(title = "配置-站台",operating = "站台列表", action = BusinessType.GRANT)
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(@ApiParam(name="shipmentType",value="编码、类型") Station station,
+                              @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
+                              @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd) {
+        LambdaQueryWrapper<Station> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin), Station::getCreated, createdBegin)
+                .lt(StringUtils.isNotEmpty(createdEnd), Station::getCreated, createdEnd)
+                .eq(StringUtils.isNotEmpty(station.getCode()), Station::getCode, station.getCode())
+                .eq(StringUtils.isNotEmpty(station.getType()), Station::getType, station.getType())
+                .eq(Station::getWarehouseCode, ShiroUtils.getWarehouseCode());
+
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+            /*使用分页查询*/
+            Page<Station> page = new Page<>(pageNum, pageSize);
+            IPage<Station> iPage = stationService.page(page, lambdaQueryWrapper);
+            return getMpDataTable(iPage.getRecords(), iPage.getTotal());
+        } else {
+            List<Station> list = stationService.list(lambdaQueryWrapper);
+            return getDataTable(list);
+        }
+    }
+
+    /**
+     * 新增站台
+     */
+    @GetMapping("/add")
+    public String add() {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存站台
+     */
+    @RequiresPermissions("config:station:add")
+    @Log(title = "配置-站台",operating = "新增站台", action = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(Station station) {
+        station.setWarehouseCode(ShiroUtils.getWarehouseCode());
+        return toAjax(stationService.save(station));
+    }
+
+    /**
+     * 修改站台
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
+        Station station = stationService.getById(id);
+        mmap.put("station", station);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存站台
+     */
+    @RequiresPermissions("config:station:edit")
+    @Log(title = "配置-站台",operating = "修改站台", action = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(Station station) {
+        station.setLastUpdatedBy(ShiroUtils.getLoginName());
+        return toAjax(stationService.updateById(station));
+    }
+
+    /**
+     * 删除出库
+     */
+    @RequiresPermissions("config:station:remove")
+    @Log(title = "配置-站台",operating = "删除站台", action = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids) {
+        if (StringUtils.isEmpty(ids)) {
+            return AjaxResult.error("id不能为空");
+        }
+        List<Integer> list = new ArrayList<>(Arrays.asList(Convert.toIntArray(ids)));
+        return toAjax(stationService.removeByIds(list));
+    }
+
+}
+package com.huaheng.pc.config.station.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * Created by Enzo Cotter on 2019/10/11.
+ */
+
+@ApiModel(value="com.huaheng.pc.config.station.domain.Station")
+@Data
+@TableName(value = "station")
+public class Station implements Serializable {
+    @TableId(value = "id", type = IdType.INPUT)
+    @ApiModelProperty(value="null")
+    private Integer id;
+
+    /**
+     * 编码
+     */
+    @TableField(value = "code")
+    @ApiModelProperty(value="编码")
+    private String code;
+
+    /**
+     * 类型
+     */
+    @TableField(value = "type")
+    @ApiModelProperty(value="类型")
+    private String type;
+
+    /**
+     * 状态
+     */
+    @TableField(value = "status")
+    @ApiModelProperty(value="状态")
+    private Integer status;
+
+    /**
+     * 仓库编码
+     */
+    @TableField(value = "warehouseCode")
+    @ApiModelProperty(value="仓库编码")
+    private String warehouseCode;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "created")
+    @ApiModelProperty(value="创建时间")
+    private Date created;
+
+    /**
+     * 创建者
+     */
+    @TableField(value = "createdBy")
+    @ApiModelProperty(value="创建者")
+    private String createdBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "lastUpdated")
+    @ApiModelProperty(value="更新时间")
+    private Date lastUpdated;
+
+    /**
+     * 更新者
+     */
+    @TableField(value = "lastUpdatedBy")
+    @ApiModelProperty(value="更新者")
+    private String lastUpdatedBy;
+
+    private static final long serialVersionUID = 1L;
+}
 \ No newline at end of file
+package com.huaheng.pc.config.station.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huaheng.pc.config.station.domain.Station;
+
+/**
+ * Created by Enzo Cotter on 2019/10/11.
+ */
+
+public interface StationMapper extends BaseMapper<Station> {
+}
 \ No newline at end of file
+package com.huaheng.pc.config.station.service;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.pc.config.station.domain.Station;
+import com.huaheng.pc.config.station.mapper.StationMapper;
+/**
+ * Created by Enzo Cotter on 2019/10/11.
+ */
+
+@Service
+public class StationService extends ServiceImpl<StationMapper, Station> {
+
+}
@@ -96,6 +96,7 @@ public class StatusFlowDetailController extends BaseController {
         StatusFlowHeader statusFlowHeader = statusFlowHeaderService.getById(headerId);
         mmap.put("headerId",headerId);
         mmap.put("headerCode", statusFlowHeader.getCode());
+        mmap.put("moduleType", statusFlowHeader.getModuleType());
         return prefix + "/add";
     }
@@ -82,8 +82,9 @@ public class StatusFlowHeaderController extends BaseController {
     /**
      * 新增流程
      */
-    @GetMapping("/add")
-    public String add() {
+    @GetMapping("/add/{type}")
+    public String add(@PathVariable("type") String type, ModelMap modelMap) {
+        modelMap.put("moduleType", type);
         return prefix + "/add";
     }
@@ -2,6 +2,13 @@ package com.huaheng.pc.config.statusFlow.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huaheng.pc.config.statusFlow.domain.StatusFlowDetail;
+import org.apache.ibatis.annotations.Param;
 public interface StatusFlowDetailMapper extends BaseMapper<StatusFlowDetail> {
+
+    //复制流程明细
+    int statusFlowDetailCopy(@Param("code") String code, @Param("newCode") String newCode);
+
+    //修改流程明细headerId
+    int updateHeaderId(@Param("code") String code);
 }
 \ No newline at end of file
@@ -2,6 +2,10 @@ package com.huaheng.pc.config.statusFlow.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huaheng.pc.config.statusFlow.domain.StatusFlowHeader;
+import org.apache.ibatis.annotations.Param;
 public interface StatusFlowHeaderMapper extends BaseMapper<StatusFlowHeader> {
+
+    //复制流程主表
+    int statusFlowHeaderCopy(@Param("code") String code, @Param("newCode") String newCode);
 }
 \ No newline at end of file
@@ -2,6 +2,7 @@ package com.huaheng.pc.config.statusFlow.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huaheng.common.utils.security.ShiroUtils;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.List;
@@ -16,7 +17,8 @@ public class StatusFlowDetailService extends ServiceImpl&lt;StatusFlowDetailMapper,
     public List<StatusFlowDetail> queryStatusFlowDetail(String headerCode){
         LambdaQueryWrapper<StatusFlowDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.orderByAsc(StatusFlowDetail::getSequence)
-                .eq(StatusFlowDetail::getHeaderCode, headerCode);
+                .eq(StatusFlowDetail::getHeaderCode, headerCode)
+                .eq(StatusFlowDetail::getWarehouseCode, ShiroUtils.getWarehouseCode());
         return this.list(lambdaQueryWrapper);
     }
 }
@@ -2,19 +2,27 @@ package com.huaheng.pc.config.statusFlow.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huaheng.common.exception.service.ServiceException;
 import com.huaheng.common.utils.security.ShiroUtils;
-import org.springframework.aop.aspectj.AspectJPrecedenceInformation;
+import com.huaheng.pc.config.statusFlow.mapper.StatusFlowDetailMapper;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.pc.config.statusFlow.domain.StatusFlowHeader;
 import com.huaheng.pc.config.statusFlow.mapper.StatusFlowHeaderMapper;
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 @Service("StatusFlow")
 public class StatusFlowHeaderService extends ServiceImpl<StatusFlowHeaderMapper, StatusFlowHeader> {
+    @Resource
+    private StatusFlowHeaderMapper statusFlowHeaderMapper;
+    @Resource
+    private StatusFlowDetailMapper statusFlowDetailMapper;
+
+
     public List<Map<String, Object>> flowList(String recordType){
         LambdaQueryWrapper<StatusFlowHeader> lambda = Wrappers.lambdaQuery();
         lambda.select(StatusFlowHeader::getCode, StatusFlowHeader::getName)
@@ -30,4 +38,28 @@ public class StatusFlowHeaderService extends ServiceImpl&lt;StatusFlowHeaderMapper,
                 .eq(StatusFlowHeader::getWarehouseCode, ShiroUtils.getWarehouseCode());
         return this.list(lambda);
     }
+
+
+    //复制流程
+    public Boolean statusFlowCopy(String code,String newCode){
+        int i = 0;
+        //复制流程主表
+        i = statusFlowHeaderMapper.statusFlowHeaderCopy(code,newCode);
+        if(i < 1){
+            throw new ServiceException("复制菜单数据失败");
+        }
+
+        //复制流程明细
+        i = statusFlowDetailMapper.statusFlowDetailCopy(code,newCode);
+        if(i < 1){
+            throw new ServiceException("复制菜单数据失败");
+        }
+
+        //修改流程明细headerId
+        i = statusFlowDetailMapper.updateHeaderId(newCode);
+        if(i < 1){
+            throw new ServiceException("复制菜单数据失败");
+        }
+        return true;
+    }
 }
@@ -158,4 +158,24 @@ public class WareHouseController extends BaseController {
         }
         return AjaxResult.success("删除成功！");
     }
+
+    /**
+     * 修改保存仓库
+     */
+    @RequiresPermissions("config:warehouse:copy")
+    @Log(title = "通用-仓库管理", operating = "复制仓库", action = BusinessType.INSERT)
+    @GetMapping("/copy")
+    public String copy(String newWarehouseCode) {
+        return prefix+"/copy";
+    }
+    /**
+     * 修改保存仓库
+     */
+    @RequiresPermissions("config:warehouse:copy")
+    @Log(title = "通用-仓库管理", operating = "复制仓库", action = BusinessType.INSERT)
+    @PostMapping("/copySave")
+    @ResponseBody
+    public AjaxResult copySave(String newWarehouseCode) {
+        return toAjax(warehouseService.warehouseCopy(ShiroUtils.getWarehouseCode(), newWarehouseCode));
+    }
 }
@@ -3,6 +3,7 @@ package com.huaheng.pc.config.warehouse.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huaheng.pc.config.warehouse.domain.Warehouse;
 import com.huaheng.pc.system.user.domain.SysUserWarehouse;
+import org.apache.ibatis.annotations.Param;
 import java.util.List;
@@ -13,4 +14,9 @@ public interface WarehouseMapper extends BaseMapper&lt;Warehouse&gt; {
     public List<Warehouse> selectWarehouseByUserId(Integer userId);
     public List<Warehouse> selectWarehouseAll();
+
+    int companyCopy(@Param("warehouseCode") String warehouseCode, @Param("newWarehouseCode")String newWarehouseCode);
+
+    List<Warehouse> selectListEntityByEqual(Warehouse condition);
+
 }
 \ No newline at end of file
@@ -10,8 +10,17 @@ public interface WarehouseService extends IService&lt;Warehouse&gt;{
     List<Map<String,Object>> getWarehouseList(Integer id);
-    public List<Warehouse> selectWarehouseByUserId(Integer userId);
+    List<Warehouse> selectWarehouseByUserId(Integer userId);
+    /**
+     * 复制仓库
+     * @param warehouseCode 仓库编码
+     * @param newWarehouseCode 新仓库编码
+     */
+    Boolean warehouseCopy(String warehouseCode, String newWarehouseCode);
+
+
+    List<Warehouse> selectListEntityByEqual(Warehouse condition);
 }