增加ERP 单据下发、取消接口

肖超群
1 parent 724c73e4
Showing 13 changed files with 425 additions and 16 deletions
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/erp/controller/ErpController.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/erp/entity/ErpShipment.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/erp/entity/ErpShipmentDetail.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/erp/entity/ErpShipmentHeader.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/erp/entity/InventoryQueryParam.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/erp/service/IErpService.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/erp/service/impl/ErpServiceImpl.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/service/ICompanyService.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/service/impl/CompanyServiceImpl.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/IReceiptHeaderService.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/service/IShipmentHeaderService.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/service/impl/ShipmentHeaderServiceImpl.java
@@ -3,6 +3,7 @@ package org.jeecg.modules.wms.api.erp.controller;
 import com.google.gson.Gson;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import net.sf.json.JSON;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -11,6 +12,7 @@ import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.modules.wms.api.erp.entity.ErpReceipt;
 import org.jeecg.modules.wms.api.erp.entity.ErpReceiptDetail;
 import org.jeecg.modules.wms.api.erp.entity.ErpReceiptHeader;
+import org.jeecg.modules.wms.api.erp.entity.ErpShipment;
 import org.jeecg.modules.wms.api.erp.service.IErpService;
 import org.jeecg.modules.wms.api.wcs.entity.WarecellDomain;
 import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
@@ -22,6 +24,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 /**
  * @author 游杰
@@ -35,7 +38,7 @@ public class ErpController extends BaseController {
     @PostMapping("/receipt")
     @ResponseBody
-    @ApiLogger(apiName = "入库单下发", from="WCS")
+    @ApiLogger(apiName = "入库单下发", from="ERP")
     public Result receipt(@RequestBody ErpReceipt erpReceipt, HttpServletRequest req) {
        String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
        Result result =  handleMultiProcess("receipt", new JeecgController.MultiProcessListener() {
@@ -46,4 +49,50 @@ public class ErpController extends BaseController {
         });
         return result;
     }
+
+    @PostMapping("/cancelReceipt")
+    @ResponseBody
+    @ApiLogger(apiName = "取消入库单", from="ERP")
+    public Result cancelReceipt(@RequestBody Map<String, String> param, HttpServletRequest req) {
+        String referCode = param.get("referCode");
+        String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
+        Result result =  handleMultiProcess("cancelReceipt", new JeecgController.MultiProcessListener() {
+            @Override
+            public Result doProcess() {
+                return erpService.cancelReceipt(referCode, warehouseCode);
+            }
+        });
+        return result;
+    }
+
+
+    @PostMapping("/shipment")
+    @ResponseBody
+    @ApiLogger(apiName = "出库单下发", from="ERP")
+    public Result shipment(@RequestBody ErpShipment erpShipment, HttpServletRequest req) {
+        String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
+        Result result =  handleMultiProcess("shipment", new JeecgController.MultiProcessListener() {
+            @Override
+            public Result doProcess() {
+                return erpService.shipment(erpShipment, warehouseCode);
+            }
+        });
+        return result;
+    }
+
+
+    @PostMapping("/cancelShipment")
+    @ResponseBody
+    @ApiLogger(apiName = "取消出库单", from="ERP")
+    public Result cancelShipment(@RequestBody Map<String, String> param, HttpServletRequest req) {
+        String referCode = param.get("referCode");
+        String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
+        Result result =  handleMultiProcess("cancelShipment", new JeecgController.MultiProcessListener() {
+            @Override
+            public Result doProcess() {
+                return erpService.cancelShipment(referCode, warehouseCode);
+            }
+        });
+        return result;
+    }
 }
+package org.jeecg.modules.wms.api.erp.entity;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author 游杰
+ */
+@Data
+public class ErpShipment {
+
+    private ErpShipmentHeader shipmentHeader;
+    private List<ErpShipmentDetail> shipmentDetailList;
+}
+package org.jeecg.modules.wms.api.erp.entity;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class ErpShipmentDetail {
+
+    /**
+     * 物料编码
+     */
+    private String materialCode;
+
+    /**
+     * 单据数量
+     */
+    private BigDecimal qty;
+
+    /**
+     * 库存状况
+     */
+    private String inventoryStatus;
+
+    /**
+     * 批次
+     */
+    private String batch;
+
+    /**
+     * 批号
+     */
+    private String lot;
+
+    /**
+     * 项目号
+     */
+    private String project;
+}
+package org.jeecg.modules.wms.api.erp.entity;
+
+import lombok.Data;
+
+@Data
+public class ErpShipmentHeader {
+
+    /**
+     * 货主
+     */
+    private String companyCode;
+    /**
+     * 出库单类型
+     */
+    private String shipmentType;
+    /**
+     * 上游单号
+     */
+    private String referCode;
+    /**
+     * 客户编码
+     */
+    private String customerCode;
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
+package org.jeecg.modules.wms.api.erp.entity;
+
+import lombok.Data;
+
+/**
+ * @author 游杰
+ */
+@Data
+public class InventoryQueryParam {
+
+    private String warehouseCode;
+    private String companyCode;
+    private String materialCode;
+    private String containerCode;
+    private String locationCode;
+    private String zoneCode;
+}
@@ -2,8 +2,18 @@ package org.jeecg.modules.wms.api.erp.service;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.wms.api.erp.entity.ErpReceipt;
+import org.jeecg.modules.wms.api.erp.entity.ErpShipment;
+import org.jeecg.modules.wms.api.erp.entity.InventoryQueryParam;
 public interface IErpService {
     public Result receipt(ErpReceipt erpReceipt, String warehouseCode);
+
+    public Result cancelReceipt(String referCode, String warehouseCode);
+
+    public Result shipment(ErpShipment erpShipment, String warehouseCode);
+
+    public Result cancelShipment(String referCode, String warehouseCode);
+
+    public Result searchInventory(InventoryQueryParam inventoryQueryParam);
 }
 package org.jeecg.modules.wms.api.erp.service.impl;
 import com.aliyun.oss.ServiceException;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.wms.api.erp.entity.ErpReceipt;
-import org.jeecg.modules.wms.api.erp.entity.ErpReceiptDetail;
-import org.jeecg.modules.wms.api.erp.entity.ErpReceiptHeader;
+import org.jeecg.modules.wms.api.erp.entity.*;
 import org.jeecg.modules.wms.api.erp.service.IErpService;
 import org.jeecg.modules.wms.config.company.entity.Company;
 import org.jeecg.modules.wms.config.company.service.ICompanyService;
@@ -12,10 +12,16 @@ import org.jeecg.modules.wms.config.material.entity.Material;
 import org.jeecg.modules.wms.config.material.service.IMaterialService;
 import org.jeecg.modules.wms.config.warehouse.entity.Warehouse;
 import org.jeecg.modules.wms.config.warehouse.service.IWarehouseService;
+import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryDetail;
+import org.jeecg.modules.wms.inventory.inventoryHeader.service.IInventoryDetailService;
 import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptDetail;
 import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
 import org.jeecg.modules.wms.receipt.receiptHeader.service.IReceiptDetailService;
 import org.jeecg.modules.wms.receipt.receiptHeader.service.IReceiptHeaderService;
+import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentDetail;
+import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentHeader;
+import org.jeecg.modules.wms.shipment.shipmentHeader.service.IShipmentDetailService;
+import org.jeecg.modules.wms.shipment.shipmentHeader.service.IShipmentHeaderService;
 import org.jeecg.utils.StringUtils;
 import org.jeecg.utils.constant.QuantityConstant;
 import org.springframework.stereotype.Service;
@@ -38,9 +44,15 @@ public class ErpServiceImpl implements IErpService {
     @Resource
     private IReceiptHeaderService receiptHeaderService;
     @Resource
+    private IShipmentHeaderService shipmentHeaderService;
+    @Resource
     private IMaterialService materialService;
     @Resource
     private IReceiptDetailService receiptDetailService;
+    @Resource
+    private IShipmentDetailService shipmentDetailService;
+    @Resource
+    private IInventoryDetailService inventoryDetailService;
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -80,8 +92,14 @@ public class ErpServiceImpl implements IErpService {
                 return Result.error("入库单下发， company为空");
             }
             companyCode = company.getCode();
+        } else {
+            Company company = companyService.getCompanyByCode(companyCode, warehouseCode);
+            if(company == null) {
+                return Result.error("入库单下发， 没有找到货主");
+            }
         }
         ReceiptHeader receiptHeader = new ReceiptHeader();
+        receiptHeader.setWarehouseCode(warehouseCode);
         receiptHeader.setCompanyCode(companyCode);
         receiptHeader.setType(receiptType);
         receiptHeader.setReferCode(referCode);
@@ -89,7 +107,7 @@ public class ErpServiceImpl implements IErpService {
         receiptHeader.setRemark(remark);
         Result result = receiptHeaderService.saveReceiptHeader(receiptHeader);
         if(!result.isSuccess()) {
-            throw new ServiceException("创建入库单头失败");
+            throw new ServiceException("创建入库单头失败" + result.getMessage());
         }
         for(ErpReceiptDetail erpReceiptDetail : erpReceiptDetailList) {
             BigDecimal qty = erpReceiptDetail.getQty();
@@ -104,10 +122,11 @@ public class ErpServiceImpl implements IErpService {
             if(StringUtils.isEmpty(inventoryStatus)) {
                 inventoryStatus = QuantityConstant.QUALITY_GOOD;
             }
-            if(qty.compareTo(BigDecimal.ZERO) > 0) {
-                throw new ServiceException("入库单下发， 单据数量大于0");
+            if(qty.compareTo(BigDecimal.ZERO) <= 0) {
+                throw new ServiceException("入库单下发， 单据数量必须大于0");
             }
             ReceiptDetail receiptDetail = new ReceiptDetail();
+            receiptDetail.setWarehouseCode(warehouseCode);
             receiptDetail.setCompanyCode(companyCode);
             receiptDetail.setReceiptCode(receiptHeader.getCode());
             receiptDetail.setReceiptId(receiptHeader.getId());
@@ -130,8 +149,176 @@ public class ErpServiceImpl implements IErpService {
                 throw new ServiceException("入库单下发, 保存入库单详情失败");
             }
         }
+        boolean success = receiptHeaderService.updateReceiptHeader(receiptHeader.getId());
+        if(!success) {
+            throw new ServiceException("入库单下发, 更新入库单失败");
+        }
         return Result.OK("入库单下发成功");
     }
+    @Override
+    public Result cancelReceipt(String referCode, String warehouseCode) {
+        if(StringUtils.isEmpty(warehouseCode)) {
+            return  Result.error("入库单取消，仓库编码为空");
+        }
+        Warehouse warehouse = warehouseService.getWarehouseByCode(warehouseCode);
+        if(warehouse == null) {
+            return  Result.error("入库单取消， 没有找到仓库");
+        }
+        ReceiptHeader receiptHeader = receiptHeaderService.getReceiptHeaderByReferCode(referCode, warehouseCode);
+        if(receiptHeader == null) {
+            return  Result.error("入库单取消， 没有找到入库单");
+        }
+        boolean success = receiptHeaderService.delMain(String.valueOf(receiptHeader.getId()));
+        if(!success) {
+            return  Result.error("入库单取消失败");
+        }
+        return Result.OK("取消入库单成功");
+    }
+
+    @Override
+    public Result shipment(ErpShipment erpShipment, String warehouseCode) {
+        if(StringUtils.isEmpty(warehouseCode)) {
+            return  Result.error("出库单下发，仓库编码为空");
+        }
+        Warehouse warehouse = warehouseService.getWarehouseByCode(warehouseCode);
+        if(warehouse == null) {
+            return  Result.error("出库单下发， 没有找到仓库");
+        }
+        if(erpShipment == null) {
+            return  Result.error("出库单下发，没有传shipment");
+        }
+        ErpShipmentHeader erpShipmentHeader = erpShipment.getShipmentHeader();
+        List<ErpShipmentDetail> erpShipmentDetailList = erpShipment.getShipmentDetailList();
+        if(erpShipmentHeader == null) {
+            return  Result.error("出库单下发，没有传shipmentHeader");
+        }
+        if(erpShipmentDetailList == null) {
+            return  Result.error("出库单下发，没有传shipmentDetailList");
+        }
+        String shipmentType = erpShipmentHeader.getShipmentType();
+        String referCode = erpShipmentHeader.getReferCode();
+        String companyCode = erpShipmentHeader.getCompanyCode();
+        String remark = erpShipmentHeader.getRemark();
+        String customerCode = erpShipmentHeader.getCustomerCode();
+        if(StringUtils.isEmpty(shipmentType)) {
+            return  Result.error("出库单下发， shipmentType为空");
+        }
+        if(StringUtils.isEmpty(referCode)) {
+            return  Result.error("出库单下发， referCode为空");
+        }
+        if(StringUtils.isEmpty(companyCode)) {
+            Company company =  companyService.getDefaultCompany();
+            if(company == null) {
+                return Result.error("出库单下发， company为空");
+            }
+            companyCode = company.getCode();
+        } else {
+            Company company = companyService.getCompanyByCode(companyCode, warehouseCode);
+            if(company == null) {
+                return Result.error("出库单下发， 没有找到货主");
+            }
+        }
+        ShipmentHeader shipmentHeader = new ShipmentHeader();
+        shipmentHeader.setWarehouseCode(warehouseCode);
+        shipmentHeader.setCompanyCode(companyCode);
+        shipmentHeader.setType(shipmentType);
+        shipmentHeader.setReferCode(referCode);
+        shipmentHeader.setCustomerCode(customerCode);
+        shipmentHeader.setRemark(remark);
+        Result result = shipmentHeaderService.saveShipmentHeader(shipmentHeader);
+        if(!result.isSuccess()) {
+            throw new ServiceException("创建出库单头失败" + result.getMessage());
+        }
+
+        for(ErpShipmentDetail erpShipmentDetail : erpShipmentDetailList) {
+            BigDecimal qty = erpShipmentDetail.getQty();
+            String materialCode = erpShipmentDetail.getMaterialCode();
+            String inventoryStatus = erpShipmentDetail.getInventoryStatus();
+            String batch = erpShipmentDetail.getBatch();
+            String lot = erpShipmentDetail.getLot();
+            String project = erpShipmentDetail.getProject();
+            if(StringUtils.isEmpty(materialCode)) {
+                throw new ServiceException("出库单下发， 物料编码为空");
+            }
+            if(StringUtils.isEmpty(inventoryStatus)) {
+                inventoryStatus = QuantityConstant.QUALITY_GOOD;
+            }
+            if(qty.compareTo(BigDecimal.ZERO) <= 0) {
+                throw new ServiceException("出库单下发， 单据数量必须大于0");
+            }
+            ShipmentDetail shipmentDetail = new ShipmentDetail();
+            shipmentDetail.setWarehouseCode(warehouseCode);
+            shipmentDetail.setCompanyCode(companyCode);
+            shipmentDetail.setShipmentCode(shipmentHeader.getCode());
+            shipmentDetail.setShipmentId(shipmentHeader.getId());
+            shipmentDetail.setStatus(QuantityConstant.SHIPMENT_HEADER_BUILD);
+            shipmentDetail.setQty(qty);
+            Material material = materialService.getMaterialByCode(materialCode);
+            if(material == null) {
+                throw new ServiceException("出库单下发, 没有找到物料信息" + materialCode);
+            }
+            shipmentDetail.setInventoryStatus(inventoryStatus);
+            shipmentDetail.setMaterialCode(materialCode);
+            shipmentDetail.setMaterialName(material.getName());
+            shipmentDetail.setMaterialSpec(material.getSpec());
+            shipmentDetail.setMaterialUnit(material.getUnit());
+            shipmentDetail.setBatch(batch);
+            shipmentDetail.setLot(lot);
+            shipmentDetail.setProject(project);
+            boolean success = shipmentDetailService.save(shipmentDetail);
+            if(!success) {
+                throw new ServiceException("出库单下发, 保存入库单详情失败");
+            }
+        }
+        boolean success = shipmentHeaderService.updateShipmentHeader(shipmentHeader.getId());
+        if(!success) {
+            throw new ServiceException("出库单下发, 更新入库单失败");
+        }
+        return Result.OK("出库单下发成功");
+    }
+
+    @Override
+    public Result cancelShipment(String referCode, String warehouseCode) {
+        if(StringUtils.isEmpty(warehouseCode)) {
+            return  Result.error("出库单取消，仓库编码为空");
+        }
+        Warehouse warehouse = warehouseService.getWarehouseByCode(warehouseCode);
+        if(warehouse == null) {
+            return  Result.error("出库单取消， 没有找到仓库");
+        }
+        ShipmentHeader shipmentHeader = shipmentHeaderService.getShipmentHeaderByReferCode(referCode, warehouseCode);
+        if(shipmentHeader == null) {
+            return  Result.error("出库单取消， 没有找到出库单");
+        }
+        boolean success = shipmentHeaderService.delMain(String.valueOf(shipmentHeader.getId()));
+        if(!success) {
+            return  Result.error("出库单取消失败");
+        }
+        return Result.OK("取消出库单成功");
+    }
+
+    @Override
+    public Result searchInventory(InventoryQueryParam inventoryQueryParam) {
+        LambdaQueryWrapper<InventoryDetail> inventoryDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
+        inventoryDetailLambdaQueryWrapper.eq(StringUtils.isNotEmpty(inventoryQueryParam.getWarehouseCode()),
+                InventoryDetail::getWarehouseCode, inventoryQueryParam.getWarehouseCode())
+                                        .eq(StringUtils.isNotEmpty(inventoryQueryParam.getMaterialCode()),
+                InventoryDetail::getMaterialCode, inventoryQueryParam.getMaterialCode())
+                                        .eq(StringUtils.isNotEmpty(inventoryQueryParam.getCompanyCode()),
+                InventoryDetail::getCompanyCode, inventoryQueryParam.getCompanyCode())
+                                         .eq(StringUtils.isNotEmpty(inventoryQueryParam.getZoneCode()),
+                InventoryDetail::getZoneCode, inventoryQueryParam.getZoneCode())
+                                        .eq(StringUtils.isNotEmpty(inventoryQueryParam.getContainerCode()),
+                InventoryDetail::getContainerCode, inventoryQueryParam.getContainerCode())
+                                        .eq(StringUtils.isNotEmpty(inventoryQueryParam.getLocationCode()),
+                InventoryDetail::getLocationCode, inventoryQueryParam.getLocationCode());
+        List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailLambdaQueryWrapper);
+        if(inventoryDetailList.size() == 0) {
+            return Result.error("没有找到对应库存");
+        }
+        return Result.ok(inventoryDetailList);
+    }
+
 }
@@ -12,4 +12,6 @@ import org.jeecg.modules.wms.config.company.entity.Company;
 public interface ICompanyService extends IService<Company> {
     public Company getDefaultCompany();
+
+    public Company getCompanyByCode(String code, String warehouseCode);
 }
@@ -25,4 +25,13 @@ public class CompanyServiceImpl extends ServiceImpl&lt;CompanyMapper, Company&gt; impl
         Company company = getOne(companyLambdaQueryWrapper);
         return company;
     }
+
+    @Override
+    public Company getCompanyByCode(String code, String warehouseCode) {
+        LambdaQueryWrapper<Company> companyLambdaQueryWrapper = Wrappers.lambdaQuery();
+        companyLambdaQueryWrapper.eq(Company::getCode, code)
+                                .eq(Company::getWarehouseCode, warehouseCode);
+        Company company = getOne(companyLambdaQueryWrapper);
+        return company;
+    }
 }
@@ -19,13 +19,16 @@ public interface IReceiptHeaderService extends IService&lt;ReceiptHeader&gt; {
 	/**
 	 * 删除一对多
 	 */
-	public void delMain (String id);
+	public boolean delMain (String id);
 	/**
 	 * 批量删除一对多
 	 */
 	public void delBatchMain (Collection<? extends Serializable> idList);
+	/**
+	 *
+	 */
 	public Result saveReceiptHeader(ReceiptHeader receiptHeader);
 	public String createCode(String receiptType);
@@ -34,5 +37,7 @@ public interface IReceiptHeaderService extends IService&lt;ReceiptHeader&gt; {
 	public boolean updateReceiptHeader(Integer id);
+	public ReceiptHeader getReceiptHeaderByCode(String code, String warehouseCode);
+	public ReceiptHeader getReceiptHeaderByReferCode(String referCode, String warehouseCode);
 }
@@ -54,14 +54,18 @@ public class ReceiptHeaderServiceImpl extends ServiceImpl&lt;ReceiptHeaderMapper, R
 	@Override
 	@Transactional
-	public void delMain(String id) {
+	public boolean delMain(String id) {
 		ReceiptHeader receiptHeader = getById(id);
 		if(receiptHeader.getFirstStatus().intValue() > QuantityConstant.RECEIPT_HEADER_BUILD) {
 			throw new ServiceException("不能删除非新建状态单据");
 		}
 		receiptHeaderHistoryService.saveById(id);
-		receiptDetailMapper.deleteByMainId(id);
-		receiptHeaderMapper.deleteById(id);
+		boolean success = receiptDetailMapper.deleteByMainId(id);
+		if(!success) {
+			return success;
+		}
+		success = removeById(id);
+		return success;
 	}
 	@Override
@@ -195,4 +199,22 @@ public class ReceiptHeaderServiceImpl extends ServiceImpl&lt;ReceiptHeaderMapper, R
 		return true;
 	}
+	@Override
+	public ReceiptHeader getReceiptHeaderByCode(String code, String warehouseCode) {
+		LambdaQueryWrapper<ReceiptHeader> receiptHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
+		receiptHeaderLambdaQueryWrapper.eq(ReceiptHeader::getCode, code)
+										.eq(ReceiptHeader::getWarehouseCode, warehouseCode);
+		ReceiptHeader receiptHeader = getOne(receiptHeaderLambdaQueryWrapper);
+		return receiptHeader;
+	}
+
+	@Override
+	public ReceiptHeader getReceiptHeaderByReferCode(String referCode, String warehouseCode) {
+		LambdaQueryWrapper<ReceiptHeader> receiptHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
+		receiptHeaderLambdaQueryWrapper.eq(ReceiptHeader::getReferCode, referCode)
+				.eq(ReceiptHeader::getWarehouseCode, warehouseCode);
+		ReceiptHeader receiptHeader = getOne(receiptHeaderLambdaQueryWrapper);
+		return receiptHeader;
+	}
+
 }
@@ -22,7 +22,7 @@ public interface IShipmentHeaderService extends IService&lt;ShipmentHeader&gt; {
 	/**
 	 * 删除一对多
 	 */
-	public void delMain (String id);
+	public boolean delMain (String id);
 	/**
 	 * 批量删除一对多
@@ -36,4 +36,8 @@ public interface IShipmentHeaderService extends IService&lt;ShipmentHeader&gt; {
 	public boolean updateShipmentHeaderStatus(Integer id);
 	public boolean updateShipmentHeader(Integer id);
+
+	public ShipmentHeader getShipmentHeaderByCode(String code, String warehouseCode);
+
+	public ShipmentHeader getShipmentHeaderByReferCode(String referCode, String warehouseCode);
 }
@@ -79,14 +79,17 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
 	@Override
 	@Transactional
-	public void delMain(String id) {
+	public boolean delMain(String id) {
 		ShipmentHeader shipmentHeader = getById(id);
 		if(shipmentHeader.getFirstStatus().intValue() > QuantityConstant.RECEIPT_HEADER_BUILD) {
 			throw new ServiceException("不能删除非新建状态单据");
 		}
-		shipmentHeaderHistoryService.saveById(id);
-		shipmentDetailMapper.deleteByMainId(id);
-		shipmentHeaderMapper.deleteById(id);
+		boolean success = shipmentDetailMapper.deleteByMainId(id);
+		if(!success) {
+			return success;
+		}
+		success = removeById(id);
+		return success;
 	}
 	@Override
@@ -208,4 +211,22 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
 		return true;
 	}
+	@Override
+	public ShipmentHeader getShipmentHeaderByCode(String code, String warehouseCode) {
+		LambdaQueryWrapper<ShipmentHeader> shipmentHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
+		shipmentHeaderLambdaQueryWrapper.eq(ShipmentHeader::getCode, code)
+										.eq(ShipmentHeader::getWarehouseCode, warehouseCode);
+		ShipmentHeader shipmentHeader = getOne(shipmentHeaderLambdaQueryWrapper);
+		return shipmentHeader;
+	}
+
+	@Override
+	public ShipmentHeader getShipmentHeaderByReferCode(String referCode, String warehouseCode) {
+		LambdaQueryWrapper<ShipmentHeader> shipmentHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
+		shipmentHeaderLambdaQueryWrapper.eq(ShipmentHeader::getReferCode, referCode)
+				.eq(ShipmentHeader::getWarehouseCode, warehouseCode);
+		ShipmentHeader shipmentHeader = getOne(shipmentHeaderLambdaQueryWrapper);
+		return shipmentHeader;
+	}
+
 }