From b400063e1a28ec567abf7e394c2615f14b7efda2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <9634538+git_rabbit@user.noreply.gitee.com> Date: Fri, 8 Mar 2024 08:28:14 +0800 Subject: [PATCH] =?UTF-8?q?WMS=E7=9B=B8=E5=85=B3=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=8C=E4=BB=85=E6=B7=BB=E5=8A=A0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E5=8F=AF=E5=90=AF=E5=8A=A8=E4=BD=86=E6=9C=AA?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/pro/ProWorkorderV2Controller.cs | 20 +++ .../Controllers/mes/wms/AreaController.cs | 83 +++++++++++ .../Controllers/mes/wms/RackController.cs | 83 +++++++++++ ZR.Model/MES/wms/POJO/DTO/Pageable.cs | 11 ++ ZR.Model/MES/wms/POJO/VO/BaseAudit.cs | 27 ++++ .../MES/wms/POJO/VO/InventoryCheckDetailVO.cs | 34 +++++ ZR.Model/MES/wms/POJO/VO/ItemVO.cs | 49 +++++++ .../wms/POJO/VO/form/InventoryCheckFrom.cs | 11 ++ ZR.Model/MES/wms/POJO/query/AreaQuery.cs | 18 +++ ZR.Model/MES/wms/POJO/query/CarrierQuery.cs | 37 +++++ ZR.Model/MES/wms/POJO/query/CustomerQuery.cs | 38 +++++ .../POJO/query/CustomerTransactionQuery.cs | 35 +++++ ZR.Model/MES/wms/POJO/query/DeliveryQuery.cs | 18 +++ .../POJO/query/InventoryCheckDetailQuery.cs | 27 ++++ .../MES/wms/POJO/query/InventoryCheckQuery.cs | 39 ++++++ .../wms/POJO/query/InventoryHistoryQuery.cs | 23 +++ .../query/InventoryMovementDetailQuery.cs | 39 ++++++ .../wms/POJO/query/InventoryMovementQuery.cs | 12 ++ ZR.Model/MES/wms/POJO/query/InventoryQuery.cs | 26 ++++ .../query/InventorySettlementDetailQuery.cs | 64 +++++++++ .../POJO/query/InventorySettlementQuery.cs | 15 ++ ZR.Model/MES/wms/POJO/query/ItemQuery.cs | 36 +++++ ZR.Model/MES/wms/POJO/query/ItemTypeQuery.cs | 21 +++ ZR.Model/MES/wms/POJO/query/RackQuery.cs | 18 +++ .../wms/POJO/query/ReceiptOrderDetailQuery.cs | 30 ++++ .../MES/wms/POJO/query/ReceiptOrderQuery.cs | 21 +++ .../POJO/query/ShipmentOrderDetailQuery.cs | 21 +++ .../MES/wms/POJO/query/ShipmentOrderQuery.cs | 21 +++ ZR.Model/MES/wms/POJO/query/SupplierQuery.cs | 30 ++++ .../POJO/query/SupplierTransactionQuery.cs | 35 +++++ ZR.Model/MES/wms/POJO/query/WarehouseQuery.cs | 12 ++ ZR.Model/MES/wms/POJO/query/WaveQuery.cs | 14 ++ ZR.Model/MES/wms/WmsArea.cs | 65 +++++++++ ZR.Model/MES/wms/WmsCarrier.cs | 93 ++++++++++++ ZR.Model/MES/wms/WmsCustomer.cs | 109 +++++++++++++++ ZR.Model/MES/wms/WmsCustomerTransaction.cs | 76 ++++++++++ ZR.Model/MES/wms/WmsDelivery.cs | 72 ++++++++++ ZR.Model/MES/wms/WmsInventory.cs | 77 ++++++++++ ZR.Model/MES/wms/WmsInventoryCheck.cs | 108 ++++++++++++++ ZR.Model/MES/wms/WmsInventoryCheckDetail.cs | 87 ++++++++++++ ZR.Model/MES/wms/WmsInventoryHistory.cs | 87 ++++++++++++ ZR.Model/MES/wms/WmsInventoryMovement.cs | 87 ++++++++++++ .../MES/wms/WmsInventoryMovementDetail.cs | 107 ++++++++++++++ ZR.Model/MES/wms/WmsInventorySettlement.cs | 78 +++++++++++ .../MES/wms/WmsInventorySettlementDetail.cs | 132 ++++++++++++++++++ ZR.Model/MES/wms/WmsItem.cs | 117 ++++++++++++++++ ZR.Model/MES/wms/WmsItemType.cs | 77 ++++++++++ ZR.Model/MES/wms/WmsRack.cs | 72 ++++++++++ ZR.Model/MES/wms/WmsReceiptOrder.cs | 87 ++++++++++++ ZR.Model/MES/wms/WmsReceiptOrderDetail.cs | 97 +++++++++++++ ZR.Model/MES/wms/WmsShipmentOrder.cs | 102 ++++++++++++++ ZR.Model/MES/wms/WmsShipmentOrderDetail.cs | 97 +++++++++++++ ZR.Model/MES/wms/WmsSupplier.cs | 108 ++++++++++++++ ZR.Model/MES/wms/WmsSupplierTransaction.cs | 79 +++++++++++ ZR.Model/MES/wms/WmsWarehouse.cs | 62 ++++++++ ZR.Model/MES/wms/WmsWave.cs | 68 +++++++++ .../pro/IService/IProWorkorderServiceV2.cs | 1 + ZR.Service/mes/pro/ProWorkorderServiceV2.cs | 15 +- ZR.Service/mes/wms/IService/IAreaService.cs | 60 ++++++++ .../mes/wms/IService/ICarrierService.cs | 58 ++++++++ .../mes/wms/IService/ICustomerService.cs | 58 ++++++++ .../IService/ICustomerTransactionService.cs | 58 ++++++++ .../mes/wms/IService/IDeliveryService.cs | 59 ++++++++ .../IService/IInventoryCheckDetailService.cs | 63 +++++++++ .../wms/IService/IInventoryCheckService.cs | 68 +++++++++ .../wms/IService/IInventoryHistoryService.cs | 12 ++ .../IInventoryMovementDetailService.cs | 12 ++ .../wms/IService/IInventoryMovementService.cs | 12 ++ .../mes/wms/IService/IInventoryService.cs | 12 ++ .../IInventorySettlementDetailService.cs | 12 ++ .../IService/IInventorySettlementService.cs | 12 ++ ZR.Service/mes/wms/IService/IItemService.cs | 12 ++ .../mes/wms/IService/IItemTypeService.cs | 12 ++ ZR.Service/mes/wms/IService/IRackService.cs | 12 ++ .../IService/IReceiptOrderDetailService.cs | 12 ++ .../mes/wms/IService/IReceiptOrderService.cs | 12 ++ .../IService/IShipmentOrderDetailService.cs | 12 ++ .../mes/wms/IService/IShipmentOrderService.cs | 12 ++ .../mes/wms/IService/ISupplierService.cs | 12 ++ .../IService/ISupplierTransactionService.cs | 12 ++ .../mes/wms/IService/IWarehouseService.cs | 12 ++ .../wms/IService/IWaveForReceiptService.cs | 12 ++ ZR.Service/mes/wms/IService/IWaveService.cs | 12 ++ 83 files changed, 3767 insertions(+), 1 deletion(-) create mode 100644 ZR.Admin.WebApi/Controllers/mes/wms/AreaController.cs create mode 100644 ZR.Admin.WebApi/Controllers/mes/wms/RackController.cs create mode 100644 ZR.Model/MES/wms/POJO/DTO/Pageable.cs create mode 100644 ZR.Model/MES/wms/POJO/VO/BaseAudit.cs create mode 100644 ZR.Model/MES/wms/POJO/VO/InventoryCheckDetailVO.cs create mode 100644 ZR.Model/MES/wms/POJO/VO/ItemVO.cs create mode 100644 ZR.Model/MES/wms/POJO/VO/form/InventoryCheckFrom.cs create mode 100644 ZR.Model/MES/wms/POJO/query/AreaQuery.cs create mode 100644 ZR.Model/MES/wms/POJO/query/CarrierQuery.cs create mode 100644 ZR.Model/MES/wms/POJO/query/CustomerQuery.cs create mode 100644 ZR.Model/MES/wms/POJO/query/CustomerTransactionQuery.cs create mode 100644 ZR.Model/MES/wms/POJO/query/DeliveryQuery.cs create mode 100644 ZR.Model/MES/wms/POJO/query/InventoryCheckDetailQuery.cs create mode 100644 ZR.Model/MES/wms/POJO/query/InventoryCheckQuery.cs create mode 100644 ZR.Model/MES/wms/POJO/query/InventoryHistoryQuery.cs create mode 100644 ZR.Model/MES/wms/POJO/query/InventoryMovementDetailQuery.cs create mode 100644 ZR.Model/MES/wms/POJO/query/InventoryMovementQuery.cs create mode 100644 ZR.Model/MES/wms/POJO/query/InventoryQuery.cs create mode 100644 ZR.Model/MES/wms/POJO/query/InventorySettlementDetailQuery.cs create mode 100644 ZR.Model/MES/wms/POJO/query/InventorySettlementQuery.cs create mode 100644 ZR.Model/MES/wms/POJO/query/ItemQuery.cs create mode 100644 ZR.Model/MES/wms/POJO/query/ItemTypeQuery.cs create mode 100644 ZR.Model/MES/wms/POJO/query/RackQuery.cs create mode 100644 ZR.Model/MES/wms/POJO/query/ReceiptOrderDetailQuery.cs create mode 100644 ZR.Model/MES/wms/POJO/query/ReceiptOrderQuery.cs create mode 100644 ZR.Model/MES/wms/POJO/query/ShipmentOrderDetailQuery.cs create mode 100644 ZR.Model/MES/wms/POJO/query/ShipmentOrderQuery.cs create mode 100644 ZR.Model/MES/wms/POJO/query/SupplierQuery.cs create mode 100644 ZR.Model/MES/wms/POJO/query/SupplierTransactionQuery.cs create mode 100644 ZR.Model/MES/wms/POJO/query/WarehouseQuery.cs create mode 100644 ZR.Model/MES/wms/POJO/query/WaveQuery.cs create mode 100644 ZR.Model/MES/wms/WmsArea.cs create mode 100644 ZR.Model/MES/wms/WmsCarrier.cs create mode 100644 ZR.Model/MES/wms/WmsCustomer.cs create mode 100644 ZR.Model/MES/wms/WmsCustomerTransaction.cs create mode 100644 ZR.Model/MES/wms/WmsDelivery.cs create mode 100644 ZR.Model/MES/wms/WmsInventory.cs create mode 100644 ZR.Model/MES/wms/WmsInventoryCheck.cs create mode 100644 ZR.Model/MES/wms/WmsInventoryCheckDetail.cs create mode 100644 ZR.Model/MES/wms/WmsInventoryHistory.cs create mode 100644 ZR.Model/MES/wms/WmsInventoryMovement.cs create mode 100644 ZR.Model/MES/wms/WmsInventoryMovementDetail.cs create mode 100644 ZR.Model/MES/wms/WmsInventorySettlement.cs create mode 100644 ZR.Model/MES/wms/WmsInventorySettlementDetail.cs create mode 100644 ZR.Model/MES/wms/WmsItem.cs create mode 100644 ZR.Model/MES/wms/WmsItemType.cs create mode 100644 ZR.Model/MES/wms/WmsRack.cs create mode 100644 ZR.Model/MES/wms/WmsReceiptOrder.cs create mode 100644 ZR.Model/MES/wms/WmsReceiptOrderDetail.cs create mode 100644 ZR.Model/MES/wms/WmsShipmentOrder.cs create mode 100644 ZR.Model/MES/wms/WmsShipmentOrderDetail.cs create mode 100644 ZR.Model/MES/wms/WmsSupplier.cs create mode 100644 ZR.Model/MES/wms/WmsSupplierTransaction.cs create mode 100644 ZR.Model/MES/wms/WmsWarehouse.cs create mode 100644 ZR.Model/MES/wms/WmsWave.cs create mode 100644 ZR.Service/mes/wms/IService/IAreaService.cs create mode 100644 ZR.Service/mes/wms/IService/ICarrierService.cs create mode 100644 ZR.Service/mes/wms/IService/ICustomerService.cs create mode 100644 ZR.Service/mes/wms/IService/ICustomerTransactionService.cs create mode 100644 ZR.Service/mes/wms/IService/IDeliveryService.cs create mode 100644 ZR.Service/mes/wms/IService/IInventoryCheckDetailService.cs create mode 100644 ZR.Service/mes/wms/IService/IInventoryCheckService.cs create mode 100644 ZR.Service/mes/wms/IService/IInventoryHistoryService.cs create mode 100644 ZR.Service/mes/wms/IService/IInventoryMovementDetailService.cs create mode 100644 ZR.Service/mes/wms/IService/IInventoryMovementService.cs create mode 100644 ZR.Service/mes/wms/IService/IInventoryService.cs create mode 100644 ZR.Service/mes/wms/IService/IInventorySettlementDetailService.cs create mode 100644 ZR.Service/mes/wms/IService/IInventorySettlementService.cs create mode 100644 ZR.Service/mes/wms/IService/IItemService.cs create mode 100644 ZR.Service/mes/wms/IService/IItemTypeService.cs create mode 100644 ZR.Service/mes/wms/IService/IRackService.cs create mode 100644 ZR.Service/mes/wms/IService/IReceiptOrderDetailService.cs create mode 100644 ZR.Service/mes/wms/IService/IReceiptOrderService.cs create mode 100644 ZR.Service/mes/wms/IService/IShipmentOrderDetailService.cs create mode 100644 ZR.Service/mes/wms/IService/IShipmentOrderService.cs create mode 100644 ZR.Service/mes/wms/IService/ISupplierService.cs create mode 100644 ZR.Service/mes/wms/IService/ISupplierTransactionService.cs create mode 100644 ZR.Service/mes/wms/IService/IWarehouseService.cs create mode 100644 ZR.Service/mes/wms/IService/IWaveForReceiptService.cs create mode 100644 ZR.Service/mes/wms/IService/IWaveService.cs diff --git a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs index 512ac6f8..c65e1a17 100644 --- a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs +++ b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs @@ -14,6 +14,7 @@ using ZR.Admin.WebApi.Filters; using ZR.Model.MES.pro; using ZR.Service.mes.pro; using ZR.Service.mes.pro.IService; +using static System.Runtime.InteropServices.JavaScript.JSType; namespace ZR.Admin.WebApi.Controllers.mes.pro { @@ -276,6 +277,25 @@ namespace ZR.Admin.WebApi.Controllers.mes.pro return ToResponse(new ApiResult(200, "success", data)); } + /// + /// 根据工单顺序 排序（排序掉转） + /// + /// 初始序号 + /// 初始排序 + /// 放入序号 + /// 放入排序 + /// + [HttpGet("updateSort2")] + public IActionResult UpdateSort2(string oldId, int oldSort, string newId, int newSort) + { + int result = 0; + if (string.IsNullOrEmpty(oldId)&& string.IsNullOrEmpty(newId)) + { + return ToResponse(new ApiResult(400, "updateSortError", "排序参数异常")); + } + result = proWorkorderService.UpdateworkorderSort2(oldId, oldSort, newId, newSort); + return ToResponse(new ApiResult(200, "success", result)); + } /// diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/AreaController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/AreaController.cs new file mode 100644 index 00000000..9ab0717d --- /dev/null +++ b/ZR.Admin.WebApi/Controllers/mes/wms/AreaController.cs @@ -0,0 +1,83 @@ +using Microsoft.AspNetCore.Mvc; +using ZR.Model.MES.wms; +using ZR.Model.MES.wms.POJO.DTO; +using ZR.Model.MES.wms.POJO.query; + +namespace ZR.Admin.WebApi.Controllers.mes.wms +{ + /// + /// 货区接口列表 + /// + [Route("mes/wms/area")] + public class AreaController : BaseController + { + + + /// + /// 查询货区列表 + /// + /// 查询条件 + /// 分页条件 + /// + [HttpPost("list")] + public IActionResult List(AreaQuery query, Pageable page) + { + return ToResponse(new ApiResult(200, "success", null)); + } + + /// + /// 导出货区列表 + /// + /// 查询条件 + /// + [HttpGet("export")] + public IActionResult Export(AreaQuery query) + { + return ToResponse(new ApiResult(200, "success", null)); + } + + /// + /// 获取货区详细信息 + /// + /// 货区id + /// + [HttpGet("getInfo")] + public IActionResult GetInfo(long id) + { + return ToResponse(new ApiResult(200, "success", null)); + } + + /// + /// 新增货区 + /// + /// 新增数据 + /// + [HttpPost("add")] + public IActionResult Add(WmsArea area) + { + return ToResponse(new ApiResult(200, "success", null)); + } + + /// + /// 修改货区 + /// + /// 修改数据 + /// + [HttpPost("edit")] + public IActionResult Edit(WmsArea area) + { + return ToResponse(new ApiResult(200, "success", null)); + } + + /// + /// 删除货区 + /// + /// 删除id列表 + /// + [HttpPost("remove")] + public IActionResult Remove(long[] ids) + { + return ToResponse(new ApiResult(200, "success", null)); + } + } +} diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/RackController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/RackController.cs new file mode 100644 index 00000000..fcbbb6ad --- /dev/null +++ b/ZR.Admin.WebApi/Controllers/mes/wms/RackController.cs @@ -0,0 +1,83 @@ +using Microsoft.AspNetCore.Mvc; +using ZR.Model.MES.wms; +using ZR.Model.MES.wms.POJO.DTO; +using ZR.Model.MES.wms.POJO.query; + +namespace ZR.Admin.WebApi.Controllers.mes.wms +{ + /// + /// 货架接口列表 + /// + [Route("mes/wms/rack")] + public class RackController : BaseController + { + + + /// + /// 查询货架列表 + /// + /// 查询条件 + /// 分页条件 + /// + [HttpPost("list")] + public IActionResult List(AreaQuery query, Pageable page) + { + return ToResponse(new ApiResult(200, "success", null)); + } + + /// + /// 导出货架列表 + /// + /// 查询条件 + /// + [HttpGet("export")] + public IActionResult Export(AreaQuery query) + { + return ToResponse(new ApiResult(200, "success", null)); + } + + /// + /// 获取货架详细信息 + /// + /// 货区id + /// + [HttpGet("getInfo")] + public IActionResult GetInfo(long id) + { + return ToResponse(new ApiResult(200, "success", null)); + } + + /// + /// 新增货架 + /// + /// 新增数据 + /// + [HttpPost("add")] + public IActionResult Add(WmsArea area) + { + return ToResponse(new ApiResult(200, "success", null)); + } + + /// + /// 修改货架 + /// + /// 修改数据 + /// + [HttpPost("edit")] + public IActionResult Edit(WmsArea area) + { + return ToResponse(new ApiResult(200, "success", null)); + } + + /// + /// 删除货架 + /// + /// 删除数据 + /// + [HttpPost("remove")] + public IActionResult Remove(long[] ids) + { + return ToResponse(new ApiResult(200, "success", null)); + } + } +} diff --git a/ZR.Model/MES/wms/POJO/DTO/Pageable.cs b/ZR.Model/MES/wms/POJO/DTO/Pageable.cs new file mode 100644 index 00000000..dd937485 --- /dev/null +++ b/ZR.Model/MES/wms/POJO/DTO/Pageable.cs @@ -0,0 +1,11 @@ +namespace ZR.Model.MES.wms.POJO.DTO +{ + public class Pageable + { + // 分页 页码 + public int pageNum { get; set; } + + // 分页 每一页大小 + public int pageSize { get; set; } + } +} diff --git a/ZR.Model/MES/wms/POJO/VO/BaseAudit.cs b/ZR.Model/MES/wms/POJO/VO/BaseAudit.cs new file mode 100644 index 00000000..d9f1e70e --- /dev/null +++ b/ZR.Model/MES/wms/POJO/VO/BaseAudit.cs @@ -0,0 +1,27 @@ +namespace ZR.Model.MES.wms.POJO.VO +{ + public class BaseAudit + { + /** + * 创建者 + */ + public long CreateBy { get; set; } + + /** + * 创建时间 + */ + // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + public DateTime? CreateTime { get; set; } + + /** + * 更新者 + */ + public long UpdateBy { get; set; } + + /** + * 更新时间 + */ + // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + public DateTime? UpdateTime { get; set; } + } +} diff --git a/ZR.Model/MES/wms/POJO/VO/InventoryCheckDetailVO.cs b/ZR.Model/MES/wms/POJO/VO/InventoryCheckDetailVO.cs new file mode 100644 index 00000000..fc63334e --- /dev/null +++ b/ZR.Model/MES/wms/POJO/VO/InventoryCheckDetailVO.cs @@ -0,0 +1,34 @@ +namespace ZR.Model.MES.wms.POJO.VO +{ + public class InventoryCheckDetailVO : BaseAudit + { + + /** ID */ + private long id; + /** 库存盘点单 */ + // @Excel(name = "库存盘点单") + private long inventoryCheckId; + /** 物料 */ + // @Excel(name = "物料") + private long itemId; + /** 库存数量 */ + // @Excel(name = "库存数量") + private decimal quantity; + /** 盘点数量 */ + // @Excel(name = "盘点数量") + private decimal checkQuantity; + /** 所属仓库 */ + // @Excel(name = "所属仓库") + private long warehouseId; + /** 所属库区 */ + // @Excel(name = "所属库区") + private long areaId; + /** 货架 */ + // @Excel(name = "货架") + private long rackId; + /** 备注 */ + // @Excel(name = "备注") + private String remark; + private List place; + } +} diff --git a/ZR.Model/MES/wms/POJO/VO/ItemVO.cs b/ZR.Model/MES/wms/POJO/VO/ItemVO.cs new file mode 100644 index 00000000..2d14772c --- /dev/null +++ b/ZR.Model/MES/wms/POJO/VO/ItemVO.cs @@ -0,0 +1,49 @@ +namespace ZR.Model.MES.wms.POJO.VO +{ + public class ItemVO : BaseAudit + { + + /** ID */ + private long id; + /** 编号 */ + // @Excel(name = "编号") + private String itemNo; + /** 名称 */ + // @Excel(name = "名称") + private String itemName; + /** 分类 */ + private String itemType; + /** + * 所属类别 + */ + // @Excel(name = "所属类别") + private String itemTypeName; + /** 单位类别 */ + // @Excel(name = "单位类别") + private String unit; + /** 所属货架 */ + private long rackId; + /** 所属库区 */ + private long areaId; + /** 所属仓库名称 */ + // @Excel(name = "所属仓库") + private String warehouseName; + /** 所属库区名称 */ + // @Excel(name = "所属库区") + private String areaName; + /** 所属仓库 */ + private long warehouseId; + /** 安全库存 */ + // @Excel(name = "安全库存") + private decimal quantity; + /** 有效期 */ + // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + // @Excel(name = "有效期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private DateTime? expiryDate; + /** 备注 */ + // @Excel(name = "备注") + private String remark; + private List place; + private int delFlag; + } +} diff --git a/ZR.Model/MES/wms/POJO/VO/form/InventoryCheckFrom.cs b/ZR.Model/MES/wms/POJO/VO/form/InventoryCheckFrom.cs new file mode 100644 index 00000000..8e35bd81 --- /dev/null +++ b/ZR.Model/MES/wms/POJO/VO/form/InventoryCheckFrom.cs @@ -0,0 +1,11 @@ +namespace ZR.Model.MES.wms.POJO.VO.form +{ + public class InventoryCheckFrom : WmsInventoryCheck + { + + // 盘库单据详情 + private List details; + // 所有商品 + private List items; + } +} diff --git a/ZR.Model/MES/wms/POJO/query/AreaQuery.cs b/ZR.Model/MES/wms/POJO/query/AreaQuery.cs new file mode 100644 index 00000000..b3afbf4e --- /dev/null +++ b/ZR.Model/MES/wms/POJO/query/AreaQuery.cs @@ -0,0 +1,18 @@ +namespace ZR.Model.MES.wms.POJO.query +{ + public class AreaQuery + { + // 货区编号 精确匹配 + private String areaNo; + + // 货区名称 精确匹配 + private String areaNameLike; + + // 所属仓库ID 精确匹配 + private long warehouseId; + + public string AreaNo { get => areaNo; set => areaNo = value; } + public string AreaNameLike { get => areaNameLike; set => areaNameLike = value; } + public long WarehouseId { get => warehouseId; set => warehouseId = value; } + } +} diff --git a/ZR.Model/MES/wms/POJO/query/CarrierQuery.cs b/ZR.Model/MES/wms/POJO/query/CarrierQuery.cs new file mode 100644 index 00000000..d08a48ef --- /dev/null +++ b/ZR.Model/MES/wms/POJO/query/CarrierQuery.cs @@ -0,0 +1,37 @@ +namespace ZR.Model.MES.wms.POJO.query +{ + public class CarrierQuery + { + // 承运商编号 精确匹配 + private String carrierNo; + // 承运商名称 精确匹配 + private String carrierNameLike; + + //承运商地址 精确匹配 + private String address; + + //手机号 精确匹配 + private String mobile; + + //座机号 精确匹配 + private String tel; + + //联系人 精确匹配 + private String contact; + + //级别 精确匹配 + private String level; + + // Email 精确匹配 + private String email; + + public string CarrierNo { get => carrierNo; set => carrierNo = value; } + public string CarrierNameLike { get => carrierNameLike; set => carrierNameLike = value; } + public string Address { get => address; set => address = value; } + public string Mobile { get => mobile; set => mobile = value; } + public string Tel { get => tel; set => tel = value; } + public string Contact { get => contact; set => contact = value; } + public string Level { get => level; set => level = value; } + public string Email { get => email; set => email = value; } + } +} diff --git a/ZR.Model/MES/wms/POJO/query/CustomerQuery.cs b/ZR.Model/MES/wms/POJO/query/CustomerQuery.cs new file mode 100644 index 00000000..3e043195 --- /dev/null +++ b/ZR.Model/MES/wms/POJO/query/CustomerQuery.cs @@ -0,0 +1,38 @@ +namespace ZR.Model.MES.wms.POJO.query +{ + public class CustomerQuery + { + // @ApiModelProperty("客户编号 精确匹配") + private String customerNo; + + // @ApiModelProperty("客户名称 精确匹配") + private String customerNameLike; + + // @ApiModelProperty("客户地址 精确匹配") + private String address; + + // @ApiModelProperty("手机号 精确匹配") + private String mobile; + + // @ApiModelProperty("座机号 精确匹配") + private String tel; + + // @ApiModelProperty("联系人 精确匹配") + private String customerPerson; + + // @ApiModelProperty("级别 精确匹配") + private String customerLevel; + + // @ApiModelProperty("Email 精确匹配") + private String email; + + public string CustomerNo { get => customerNo; set => customerNo = value; } + public string CustomerNameLike { get => customerNameLike; set => customerNameLike = value; } + public string Address { get => address; set => address = value; } + public string Mobile { get => mobile; set => mobile = value; } + public string Tel { get => tel; set => tel = value; } + public string CustomerPerson { get => customerPerson; set => customerPerson = value; } + public string CustomerLevel { get => customerLevel; set => customerLevel = value; } + public string Email { get => email; set => email = value; } + } +} diff --git a/ZR.Model/MES/wms/POJO/query/CustomerTransactionQuery.cs b/ZR.Model/MES/wms/POJO/query/CustomerTransactionQuery.cs new file mode 100644 index 00000000..7eae747c --- /dev/null +++ b/ZR.Model/MES/wms/POJO/query/CustomerTransactionQuery.cs @@ -0,0 +1,35 @@ +namespace ZR.Model.MES.wms.POJO.query +{ + public class CustomerTransactionQuery + { + // @ApiModelProperty("交易编号 精确匹配") + private String transactionCode; + + //@ApiModelProperty("用户编号 精确匹配") + private String customerId; + + //@ApiModelProperty("交易类型 1：结款 2：应付 精确匹配") + private String transactionType; + + //@ApiModelProperty("交易金额 精确匹配") + private decimal transactionAmount; + + //@ApiModelProperty("上期余额 精确匹配") + private decimal previousBalance; + + //@ApiModelProperty("当前余额 精确匹配") + private decimal currentBalance; + + //@ApiModelProperty("出库单号 精确匹配") + private long shipmentOrderId; + + //@ApiModelProperty("开始时间 精确匹配") + //@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private DateTime? startTime; + + //@ApiModelProperty("结束时间 精确匹配") + //@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private DateTime? endTime; + + } +} diff --git a/ZR.Model/MES/wms/POJO/query/DeliveryQuery.cs b/ZR.Model/MES/wms/POJO/query/DeliveryQuery.cs new file mode 100644 index 00000000..ff93f742 --- /dev/null +++ b/ZR.Model/MES/wms/POJO/query/DeliveryQuery.cs @@ -0,0 +1,18 @@ +namespace ZR.Model.MES.wms.POJO.query +{ + public class DeliveryQuery + { + // @ApiModelProperty("出库单主表Id 精确匹配") + private long shipmentOrderId; + + // @ApiModelProperty("承运商Id 精确匹配") + private long carrierId; + + // @ApiModelProperty("发货日期 精确匹配") + private DateTime? deliveryDate; + + // @ApiModelProperty("快递单号 精确匹配") + private String trackingNo; + + } +} diff --git a/ZR.Model/MES/wms/POJO/query/InventoryCheckDetailQuery.cs b/ZR.Model/MES/wms/POJO/query/InventoryCheckDetailQuery.cs new file mode 100644 index 00000000..0fa5b692 --- /dev/null +++ b/ZR.Model/MES/wms/POJO/query/InventoryCheckDetailQuery.cs @@ -0,0 +1,27 @@ +namespace ZR.Model.MES.wms.POJO.query +{ + public class InventoryCheckDetailQuery + { + // @ApiModelProperty("库存盘点单 精确匹配") + private long inventoryCheckId; + + // @ApiModelProperty("物料 精确匹配") + private long itemId; + + // @ApiModelProperty("库存数量 精确匹配") + private decimal quantity; + + // @ApiModelProperty("盘点数量 精确匹配") + private decimal checkQuantity; + + // @ApiModelProperty("所属仓库 精确匹配") + private long warehouseId; + + // @ApiModelProperty("所属库区 精确匹配") + private long areaId; + + // @ApiModelProperty("货架 精确匹配") + private long rackId; + + } +} diff --git a/ZR.Model/MES/wms/POJO/query/InventoryCheckQuery.cs b/ZR.Model/MES/wms/POJO/query/InventoryCheckQuery.cs new file mode 100644 index 00000000..66681b47 --- /dev/null +++ b/ZR.Model/MES/wms/POJO/query/InventoryCheckQuery.cs @@ -0,0 +1,39 @@ +namespace ZR.Model.MES.wms.POJO.query +{ + public class InventoryCheckQuery + { + // @ApiModelProperty("库存盘点单号，系统自动生成 精确匹配") + private String inventoryCheckNo; + + // @ApiModelProperty("库存盘点类型 精确匹配") + private int inventoryCheckType; + + // @ApiModelProperty("库存盘点单状态11：盘点中 22：已完成 精确匹配") + private int inventoryCheckStatus; + + // @ApiModelProperty("盈亏数 精确匹配") + private decimal inventoryCheckTotal; + + // @ApiModelProperty("审核状态 精确匹配") + private int checkStatus; + + // @ApiModelProperty("审核人 精确匹配") + private long checkUserId; + + // @ApiModelProperty("审核时间 精确匹配") + private DateTime? checkTime; + + // @ApiModelProperty("所属仓库 精确匹配") + private long warehouseId; + + // @ApiModelProperty("所属库区 精确匹配") + private long areaId; + + // @ApiModelProperty("货架 精确匹配") + private long rackId; + + // @ApiModelProperty("附件文件 精确匹配") + private String attachment; + + } +} diff --git a/ZR.Model/MES/wms/POJO/query/InventoryHistoryQuery.cs b/ZR.Model/MES/wms/POJO/query/InventoryHistoryQuery.cs new file mode 100644 index 00000000..248cbb1d --- /dev/null +++ b/ZR.Model/MES/wms/POJO/query/InventoryHistoryQuery.cs @@ -0,0 +1,23 @@ +namespace ZR.Model.MES.wms.POJO.query +{ + public class InventoryHistoryQuery + { + // @ApiModelProperty("操作id（出库、入库、库存移动表单id） 精确匹配") + private long formId; + + // @ApiModelProperty("操作类型 精确匹配") + private int formType; + + // @ApiModelProperty("物料ID 精确匹配") + private long itemId; + + // @ApiModelProperty("货架id 精确匹配") + private long warehouseId; + private long areaId; + private long rackId; + + // @ApiModelProperty("库存变化 精确匹配") + private decimal quantity; + + } +} diff --git a/ZR.Model/MES/wms/POJO/query/InventoryMovementDetailQuery.cs b/ZR.Model/MES/wms/POJO/query/InventoryMovementDetailQuery.cs new file mode 100644 index 00000000..e42bf85a --- /dev/null +++ b/ZR.Model/MES/wms/POJO/query/InventoryMovementDetailQuery.cs @@ -0,0 +1,39 @@ +namespace ZR.Model.MES.wms.POJO.query +{ + public class InventoryMovementDetailQuery + { + // @ApiModelProperty("库存移动Id 精确匹配") + private long inventoryMovementId; + + // @ApiModelProperty("物料 精确匹配") + private long itemId; + + // @ApiModelProperty("计划数量 精确匹配") + private decimal planQuantity; + + // @ApiModelProperty("实际数量 精确匹配") + private decimal realQuantity; + + // @ApiModelProperty("源货架 精确匹配") + private long sourceRackId; + + // @ApiModelProperty("源仓库 精确匹配") + private long sourceWarehouseId; + + // @ApiModelProperty("源库区 精确匹配") + private long sourceAreaId; + + // @ApiModelProperty("移库状态 精确匹配") + private int moveStatus; + + // @ApiModelProperty("目标货架 精确匹配") + private long targetRackId; + + // @ApiModelProperty("目标仓库 精确匹配") + private long targetWarehouseId; + + // @ApiModelProperty("目标库区 精确匹配") + private long targetAreaId; + + } +} diff --git a/ZR.Model/MES/wms/POJO/query/InventoryMovementQuery.cs b/ZR.Model/MES/wms/POJO/query/InventoryMovementQuery.cs new file mode 100644 index 00000000..82be023b --- /dev/null +++ b/ZR.Model/MES/wms/POJO/query/InventoryMovementQuery.cs @@ -0,0 +1,12 @@ +namespace ZR.Model.MES.wms.POJO.query +{ + public class InventoryMovementQuery + { + // @ApiModelProperty("库存移动编号 精确匹配") + private String inventoryMovementNo; + + // @ApiModelProperty("状态 精确匹配") + private int status; + + } +} diff --git a/ZR.Model/MES/wms/POJO/query/InventoryQuery.cs b/ZR.Model/MES/wms/POJO/query/InventoryQuery.cs new file mode 100644 index 00000000..e7868c36 --- /dev/null +++ b/ZR.Model/MES/wms/POJO/query/InventoryQuery.cs @@ -0,0 +1,26 @@ +namespace ZR.Model.MES.wms.POJO.query +{ + public class InventoryQuery + { + // @ApiModelProperty("物料ID 精确匹配") + private long itemId; + + // @ApiModelProperty("货架id 精确匹配") + private long warehouseId; + + // @ApiModelProperty("看板类型") + private long panelType; + + // @ApiModelProperty("区 id") + private long areaId; + + //@ApiModelProperty("货架 id") + private long rackId; + + // @ApiModelProperty("库存 起始值") + private decimal quantityStart; + // @ApiModelProperty("库存 结束值") + private decimal quantityEnd; + + } +} diff --git a/ZR.Model/MES/wms/POJO/query/InventorySettlementDetailQuery.cs b/ZR.Model/MES/wms/POJO/query/InventorySettlementDetailQuery.cs new file mode 100644 index 00000000..f242f824 --- /dev/null +++ b/ZR.Model/MES/wms/POJO/query/InventorySettlementDetailQuery.cs @@ -0,0 +1,64 @@ +namespace ZR.Model.MES.wms.POJO.query +{ + public class InventorySettlementDetailQuery + { + // @ApiModelProperty("结算单id 精确匹配") + private long settlementId; + + // @ApiModelProperty("结算类型,1:月结，2:年结 精确匹配") + private int settlementType; + + // @ApiModelProperty("物料id 精确匹配") + private long itemId; + + // @ApiModelProperty("编号 精确匹配") + private String itemNo; + + // @ApiModelProperty("名称 精确匹配") + private String itemNameLike; + + // @ApiModelProperty("仓库id 精确匹配") + private long warehouseId; + + // @ApiModelProperty("仓库编号 精确匹配") + private String warehouseNo; + + // @ApiModelProperty("仓库名称 精确匹配") + private String warehouseNameLike; + + // @ApiModelProperty("库区id 精确匹配") + private long areaId; + + // @ApiModelProperty("库区编号 精确匹配") + private String areaNo; + + // @ApiModelProperty("库区名称 精确匹配") + private String areaNameLike; + + // @ApiModelProperty("上期结存 精确匹配") + private decimal previousBalance; + + // @ApiModelProperty("本期入库 精确匹配") + private decimal currentEnter; + + // @ApiModelProperty("本期出库 精确匹配") + private decimal currentOut; + + // @ApiModelProperty("本期盘点 精确匹配") + private decimal currentCheck; + + // @ApiModelProperty("本期结存 精确匹配") + private decimal currentBalance; + + /** + * 开始时间 + */ + private DateTime? startTime; + + /** + * 结束时间 + */ + private DateTime? endTime; + + } +} diff --git a/ZR.Model/MES/wms/POJO/query/InventorySettlementQuery.cs b/ZR.Model/MES/wms/POJO/query/InventorySettlementQuery.cs new file mode 100644 index 00000000..4d179017 --- /dev/null +++ b/ZR.Model/MES/wms/POJO/query/InventorySettlementQuery.cs @@ -0,0 +1,15 @@ +namespace ZR.Model.MES.wms.POJO.query +{ + public class InventorySettlementQuery + { + // @ApiModelProperty("库存结算单状态11：结算中 22：已完成 精确匹配") + private int inventorySettlementStatus; + + // @ApiModelProperty("结算类型,1:月结，2:年结 精确匹配") + private int settlementType; + + // @ApiModelProperty("库存结算单号 精确匹配") + private String inventorySettlementNo; + + } +} diff --git a/ZR.Model/MES/wms/POJO/query/ItemQuery.cs b/ZR.Model/MES/wms/POJO/query/ItemQuery.cs new file mode 100644 index 00000000..0f25ef23 --- /dev/null +++ b/ZR.Model/MES/wms/POJO/query/ItemQuery.cs @@ -0,0 +1,36 @@ +namespace ZR.Model.MES.wms.POJO.query +{ + public class ItemQuery + { + // @ApiModelProperty("搜索内容") + private String search; + private List ids; + // @ApiModelProperty("编号 精确匹配") + private String itemNo; + + // @ApiModelProperty("名称 精确匹配") + private String itemNameLike; + + // @ApiModelProperty("分类 精确匹配") + private String itemType; + + // @ApiModelProperty("单位类别 精确匹配") + private String unit; + + // @ApiModelProperty("所属货架 精确匹配") + private long rackId; + + // @ApiModelProperty("所属库区 精确匹配") + private long areaId; + + // @ApiModelProperty("所属仓库 精确匹配") + private long warehouseId; + + // @ApiModelProperty("安全库存 精确匹配") + private decimal quantity; + + // @ApiModelProperty("有效期 精确匹配") + private DateTime? expiryDate; + + } +} diff --git a/ZR.Model/MES/wms/POJO/query/ItemTypeQuery.cs b/ZR.Model/MES/wms/POJO/query/ItemTypeQuery.cs new file mode 100644 index 00000000..369e80c7 --- /dev/null +++ b/ZR.Model/MES/wms/POJO/query/ItemTypeQuery.cs @@ -0,0 +1,21 @@ +namespace ZR.Model.MES.wms.POJO.query +{ + public class ItemTypeQuery + { + // @ApiModelProperty("父物料类型id 精确匹配") + private long parentId; + + // @ApiModelProperty("祖级列表 精确匹配") + private String ancestors; + + // @ApiModelProperty("物料类型名称 精确匹配") + private String typeNameLike; + + // @ApiModelProperty("显示顺序 精确匹配") + private int orderNum; + + // @ApiModelProperty("物料类型状态（0正常 1停用） 精确匹配") + private String status; + + } +} diff --git a/ZR.Model/MES/wms/POJO/query/RackQuery.cs b/ZR.Model/MES/wms/POJO/query/RackQuery.cs new file mode 100644 index 00000000..0d360daa --- /dev/null +++ b/ZR.Model/MES/wms/POJO/query/RackQuery.cs @@ -0,0 +1,18 @@ +namespace ZR.Model.MES.wms.POJO.query +{ + public class RackQuery + { + // @ApiModelProperty("货架编号 精确匹配") + private String rackNo; + + // @ApiModelProperty("货架名称 精确匹配") + private String rackNameLike; + + // @ApiModelProperty("所属货区 精确匹配") + private long areaId; + + // @ApiModelProperty("所属仓库 精确匹配") + private long warehouseId; + + } +} diff --git a/ZR.Model/MES/wms/POJO/query/ReceiptOrderDetailQuery.cs b/ZR.Model/MES/wms/POJO/query/ReceiptOrderDetailQuery.cs new file mode 100644 index 00000000..42d85782 --- /dev/null +++ b/ZR.Model/MES/wms/POJO/query/ReceiptOrderDetailQuery.cs @@ -0,0 +1,30 @@ +namespace ZR.Model.MES.wms.POJO.query +{ + public class ReceiptOrderDetailQuery + { + // @ApiModelProperty("入库单号 精确匹配") + private long receiptOrderId; + + // @ApiModelProperty("物料 精确匹配") + private long itemId; + + // @ApiModelProperty("计划数量 精确匹配") + private decimal planQuantity; + + // @ApiModelProperty("实际数量 精确匹配") + private decimal realQuantity; + + // @ApiModelProperty("所属货架 精确匹配") + private long rackId; + + // @ApiModelProperty("所属仓库 精确匹配") + private long warehouseId; + + // @ApiModelProperty("所属库区 精确匹配") + private long areaId; + + // @ApiModelProperty("入库状态 精确匹配") + private int receiptOrderStatus; + + } +} diff --git a/ZR.Model/MES/wms/POJO/query/ReceiptOrderQuery.cs b/ZR.Model/MES/wms/POJO/query/ReceiptOrderQuery.cs new file mode 100644 index 00000000..94a963cb --- /dev/null +++ b/ZR.Model/MES/wms/POJO/query/ReceiptOrderQuery.cs @@ -0,0 +1,21 @@ +namespace ZR.Model.MES.wms.POJO.query +{ + public class ReceiptOrderQuery + { + // @ApiModelProperty("入库单号 精确匹配") + private String receiptOrderNo; + + // @ApiModelProperty("入库类型 精确匹配") + private int receiptOrderType; + + // @ApiModelProperty("供应商 精确匹配") + private long supplierId; + + // @ApiModelProperty("订单号 精确匹配") + private String orderNo; + + // @ApiModelProperty("入库状态 精确匹配") + private int receiptOrderStatus; + + } +} diff --git a/ZR.Model/MES/wms/POJO/query/ShipmentOrderDetailQuery.cs b/ZR.Model/MES/wms/POJO/query/ShipmentOrderDetailQuery.cs new file mode 100644 index 00000000..57912d4d --- /dev/null +++ b/ZR.Model/MES/wms/POJO/query/ShipmentOrderDetailQuery.cs @@ -0,0 +1,21 @@ +namespace ZR.Model.MES.wms.POJO.query +{ + public class ShipmentOrderDetailQuery + { + // @ApiModelProperty("出库单 精确匹配") + private long shipmentOrderId; + + // @ApiModelProperty("物料 精确匹配") + private long itemId; + + // @ApiModelProperty("计划数量 精确匹配") + private decimal planQuantity; + + // @ApiModelProperty("实际数量 精确匹配") + private decimal realQuantity; + + // @ApiModelProperty("货架 精确匹配") + private long rackId; + + } +} diff --git a/ZR.Model/MES/wms/POJO/query/ShipmentOrderQuery.cs b/ZR.Model/MES/wms/POJO/query/ShipmentOrderQuery.cs new file mode 100644 index 00000000..dda3bd87 --- /dev/null +++ b/ZR.Model/MES/wms/POJO/query/ShipmentOrderQuery.cs @@ -0,0 +1,21 @@ +namespace ZR.Model.MES.wms.POJO.query +{ + public class ShipmentOrderQuery + { + // @ApiModelProperty("出库单号，系统自动生成 精确匹配") + private String shipmentOrderNo; + + // @ApiModelProperty("出库类型 精确匹配") + private int shipmentOrderType; + + // @ApiModelProperty("出库订单 精确匹配") + private String orderNo; + + // @ApiModelProperty("客户 精确匹配") + private long customerId; + + // @ApiModelProperty("出库单状态 精确匹配") + private int shipmentOrderStatus; + + } +} diff --git a/ZR.Model/MES/wms/POJO/query/SupplierQuery.cs b/ZR.Model/MES/wms/POJO/query/SupplierQuery.cs new file mode 100644 index 00000000..4564f909 --- /dev/null +++ b/ZR.Model/MES/wms/POJO/query/SupplierQuery.cs @@ -0,0 +1,30 @@ +namespace ZR.Model.MES.wms.POJO.query +{ + public class SupplierQuery + { + // @ApiModelProperty("供应商编号 精确匹配") + private String supplierNo; + + // @ApiModelProperty("供应商名称 精确匹配") + private String supplierNameLike; + + // @ApiModelProperty("供应商地址 精确匹配") + private String address; + + // @ApiModelProperty("手机号 精确匹配") + private String mobileNo; + + // @ApiModelProperty("座机号 精确匹配") + private String telNo; + + // @ApiModelProperty("联系人 精确匹配") + private String contact; + + // @ApiModelProperty("级别 精确匹配") + private String level; + + // @ApiModelProperty("Email 精确匹配") + private String email; + + } +} diff --git a/ZR.Model/MES/wms/POJO/query/SupplierTransactionQuery.cs b/ZR.Model/MES/wms/POJO/query/SupplierTransactionQuery.cs new file mode 100644 index 00000000..dbe0b061 --- /dev/null +++ b/ZR.Model/MES/wms/POJO/query/SupplierTransactionQuery.cs @@ -0,0 +1,35 @@ +namespace ZR.Model.MES.wms.POJO.query +{ + public class SupplierTransactionQuery + { + // @ApiModelProperty("交易编号 精确匹配") + private String transactionCode; + + // @ApiModelProperty("供应商编号 精确匹配") + private String supplierId; + + // @ApiModelProperty("交易类型 1：结款 2：应付 精确匹配") + private String transactionType; + + // @ApiModelProperty("交易金额 精确匹配") + private decimal transactionAmount; + + // @ApiModelProperty("上期余额 精确匹配") + private decimal previousBalance; + + // @ApiModelProperty("当前余额 精确匹配") + private decimal currentBalance; + + // @ApiModelProperty("入库单号 精确匹配") + private long receiptOrderId; + + // @ApiModelProperty("开始时间 精确匹配") + // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private DateTime? startTime; + + // @ApiModelProperty("结束时间 精确匹配") + // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private DateTime? endTime; + + } +} diff --git a/ZR.Model/MES/wms/POJO/query/WarehouseQuery.cs b/ZR.Model/MES/wms/POJO/query/WarehouseQuery.cs new file mode 100644 index 00000000..5411d517 --- /dev/null +++ b/ZR.Model/MES/wms/POJO/query/WarehouseQuery.cs @@ -0,0 +1,12 @@ +namespace ZR.Model.MES.wms.POJO.query +{ + public class WarehouseQuery + { + // @ApiModelProperty("仓库编号 精确匹配") + private String warehouseNo; + + // @ApiModelProperty("仓库名称 精确匹配") + private String warehouseNameLike; + + } +} diff --git a/ZR.Model/MES/wms/POJO/query/WaveQuery.cs b/ZR.Model/MES/wms/POJO/query/WaveQuery.cs new file mode 100644 index 00000000..39f4167b --- /dev/null +++ b/ZR.Model/MES/wms/POJO/query/WaveQuery.cs @@ -0,0 +1,14 @@ +namespace ZR.Model.MES.wms.POJO.query +{ + public class WaveQuery + { + // @ApiModelProperty("波次号 精确匹配") + private String waveNo; + + // @ApiModelProperty("状态 精确匹配") + private String status; + + private int type; + + } +} diff --git a/ZR.Model/MES/wms/WmsArea.cs b/ZR.Model/MES/wms/WmsArea.cs new file mode 100644 index 00000000..9f9011eb --- /dev/null +++ b/ZR.Model/MES/wms/WmsArea.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using SqlSugar; +namespace ZR.Model.MES.wms +{ + /// + /// 库区 + /// + [SugarTable("wms_area")] + public class WmsArea + { + /// + /// + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] + public long Id { get; set; } + /// + /// 编号 + /// + [SugarColumn(ColumnName = "area_no")] + public string AreaNo { get; set; } + /// + /// 名称 + /// + [SugarColumn(ColumnName = "area_name")] + public string AreaName { get; set; } + /// + /// 所属仓库ID + /// + [SugarColumn(ColumnName = "warehouse_id")] + public long WarehouseId { get; set; } + /// + /// 备注 + /// + [SugarColumn(ColumnName = "remark")] + public string Remark { get; set; } + /// + /// 删除标识 + /// 默认值: 0 + /// + [SugarColumn(ColumnName = "del_flag")] + public byte DelFlag { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "create_by")] + public long? CreateBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "create_time")] + public DateTime? CreateTime { get; set; } + /// + /// 修改人 + /// + [SugarColumn(ColumnName = "update_by")] + public long? UpdateBy { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "update_time")] + public DateTime? UpdateTime { get; set; } + } +} diff --git a/ZR.Model/MES/wms/WmsCarrier.cs b/ZR.Model/MES/wms/WmsCarrier.cs new file mode 100644 index 00000000..34b591b3 --- /dev/null +++ b/ZR.Model/MES/wms/WmsCarrier.cs @@ -0,0 +1,93 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SqlSugar; + +namespace ZR.Model.MES.wms +{ + /// + /// 承运商 + /// + [SugarTable("wms_carrier")] + public class WmsCarrier + { + /// + /// + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] + public long Id { get; set; } + /// + /// 编号 + /// + [SugarColumn(ColumnName = "carrier_no")] + public string CarrierNo { get; set; } + /// + /// 名称 + /// + [SugarColumn(ColumnName = "carrier_name")] + public string CarrierName { get; set; } + /// + /// 地址 + /// + [SugarColumn(ColumnName = "address")] + public string Address { get; set; } + /// + /// 手机号 + /// + [SugarColumn(ColumnName = "mobile")] + public string Mobile { get; set; } + /// + /// 座机号 + /// + [SugarColumn(ColumnName = "tel")] + public string Tel { get; set; } + /// + /// 联系人 + /// + [SugarColumn(ColumnName = "contact")] + public string Contact { get; set; } + /// + /// 级别 + /// + [SugarColumn(ColumnName = "level")] + public string Level { get; set; } + /// + /// Email + /// + [SugarColumn(ColumnName = "email")] + public string Email { get; set; } + /// + /// 备注 + /// + [SugarColumn(ColumnName = "remark")] + public string Remark { get; set; } + /// + /// 删除标识 + /// 默认值: 0 + /// + [SugarColumn(ColumnName = "del_flag")] + public byte DelFlag { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "create_by")] + public long? CreateBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "create_time")] + public DateTime? CreateTime { get; set; } + /// + /// 修改人 + /// + [SugarColumn(ColumnName = "update_by")] + public long? UpdateBy { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "update_time")] + public DateTime? UpdateTime { get; set; } + } +} diff --git a/ZR.Model/MES/wms/WmsCustomer.cs b/ZR.Model/MES/wms/WmsCustomer.cs new file mode 100644 index 00000000..ee1e4e33 --- /dev/null +++ b/ZR.Model/MES/wms/WmsCustomer.cs @@ -0,0 +1,109 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SqlSugar; +namespace ZR.Model.MES.wms +{ + /// + /// 客户 + /// + [SugarTable("wms_customer")] + public class WmsCustomer + { + /// + /// + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] + public long Id { get; set; } + /// + /// 编号 + /// + [SugarColumn(ColumnName = "customer_no")] + public string CustomerNo { get; set; } + /// + /// 名称 + /// + [SugarColumn(ColumnName = "customer_name")] + public string CustomerName { get; set; } + /// + /// 开户行 + /// + [SugarColumn(ColumnName = "bank_name")] + public string BankName { get; set; } + /// + /// 银行账户 + /// + [SugarColumn(ColumnName = "bank_account")] + public string BankAccount { get; set; } + /// + /// 应收款 + /// 默认值: 0.00 + /// + [SugarColumn(ColumnName = "receivable_amount")] + public decimal? ReceivableAmount { get; set; } + /// + /// 地址 + /// + [SugarColumn(ColumnName = "address")] + public string Address { get; set; } + /// + /// 手机号 + /// + [SugarColumn(ColumnName = "mobile")] + public string Mobile { get; set; } + /// + /// 座机号 + /// + [SugarColumn(ColumnName = "tel")] + public string Tel { get; set; } + /// + /// 联系人 + /// + [SugarColumn(ColumnName = "customer_person")] + public string CustomerPerson { get; set; } + /// + /// 级别 + /// + [SugarColumn(ColumnName = "customer_level")] + public string CustomerLevel { get; set; } + /// + /// Email + /// + [SugarColumn(ColumnName = "email")] + public string Email { get; set; } + /// + /// 备注 + /// + [SugarColumn(ColumnName = "remark")] + public string Remark { get; set; } + /// + /// 删除标识 + /// 默认值: 0 + /// + [SugarColumn(ColumnName = "del_flag")] + public byte DelFlag { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "create_by")] + public long? CreateBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "create_time")] + public DateTime? CreateTime { get; set; } + /// + /// + /// 修改人 + /// + [SugarColumn(ColumnName = "update_by")] + public long? UpdateBy { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "update_time")] + public DateTime? UpdateTime { get; set; } + } +} diff --git a/ZR.Model/MES/wms/WmsCustomerTransaction.cs b/ZR.Model/MES/wms/WmsCustomerTransaction.cs new file mode 100644 index 00000000..880ffab4 --- /dev/null +++ b/ZR.Model/MES/wms/WmsCustomerTransaction.cs @@ -0,0 +1,76 @@ +namespace ZR.Model.MES.wms +{ + /// + /// 客户账户流水 + /// + [SugarTable("wms_customer_transaction")] + public class WmsCustomerTransaction + { + public static String ENTER = "11"; + public static String EXIT = "22"; + public static String SHIPMENT = "33"; + /// + /// id + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + /// + /// 交易编号 + /// + [SugarColumn(ColumnName = "transaction_code")] + public string TransactionCode { get; set; } + /// + /// 用户编号 + /// + [SugarColumn(ColumnName = "customer_id")] + public string CustomerId { get; set; } + /// + /// 交易类型 1：结款 2：应付 + /// + [SugarColumn(ColumnName = "transaction_type")] + public string TransactionType { get; set; } + /// + /// 交易金额 + /// + [SugarColumn(ColumnName = "transaction_amount")] + public decimal TransactionAmount { get; set; } + /// + /// 上期余额 + /// + [SugarColumn(ColumnName = "previous_balance")] + public decimal PreviousBalance { get; set; } + /// + /// 当前余额 + /// + [SugarColumn(ColumnName = "current_balance")] + public decimal CurrentBalance { get; set; } + /// + /// 出库单号 + /// + [SugarColumn(ColumnName = "shipment_order_id")] + public long? ShipmentOrderId { get; set; } + /// + /// 备注 + /// + [SugarColumn(ColumnName = "remark")] + public string Remark { get; set; } + /// + /// 删除标志 + /// 默认值: 0 + /// + [SugarColumn(ColumnName = "del_flag")] + public byte DelFlag { get; set; } + /// + /// 创建时间 + /// 默认值: CURRENT_TIMESTAMP + /// + [SugarColumn(ColumnName = "create_time")] + public DateTime CreateTime { get; set; } + /// + /// 更新时间 + /// 默认值: CURRENT_TIMESTAMP + /// + [SugarColumn(ColumnName = "update_time")] + public DateTime UpdateTime { get; set; } + } +} diff --git a/ZR.Model/MES/wms/WmsDelivery.cs b/ZR.Model/MES/wms/WmsDelivery.cs new file mode 100644 index 00000000..ea41f087 --- /dev/null +++ b/ZR.Model/MES/wms/WmsDelivery.cs @@ -0,0 +1,72 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SqlSugar; +namespace ZR.Model.MES.wms +{ + /// + /// 发货记录 + /// + [SugarTable("wms_delivery")] + public class WmsDelivery + { + /// + /// + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] + public long Id { get; set; } + /// + /// 出库单主表Id + /// + [SugarColumn(ColumnName = "shipment_order_id")] + public long? ShipmentOrderId { get; set; } + /// + /// 承运商Id + /// + [SugarColumn(ColumnName = "carrier_id")] + public long? CarrierId { get; set; } + /// + /// 发货日期 + /// + [SugarColumn(ColumnName = "delivery_date")] + public DateTime? DeliveryDate { get; set; } + /// + /// 快递单号 + /// + [SugarColumn(ColumnName = "tracking_no")] + public string TrackingNo { get; set; } + /// + /// 备注 + /// + [SugarColumn(ColumnName = "remark")] + public string Remark { get; set; } + /// + /// 删除标识 + /// 默认值: 0 + /// + [SugarColumn(ColumnName = "del_flag")] + public byte DelFlag { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "create_by")] + public long? CreateBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "create_time")] + public DateTime? CreateTime { get; set; } + /// + /// 修改人 + /// + [SugarColumn(ColumnName = "update_by")] + public long? UpdateBy { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "update_time")] + public DateTime? UpdateTime { get; set; } + } +} diff --git a/ZR.Model/MES/wms/WmsInventory.cs b/ZR.Model/MES/wms/WmsInventory.cs new file mode 100644 index 00000000..c522fdf4 --- /dev/null +++ b/ZR.Model/MES/wms/WmsInventory.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SqlSugar; +namespace ZR.Model.MES.wms +{ + /// + /// 库存 + /// + [SugarTable("wms_inventory")] + public class WmsInventory + { + /// + /// + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] + public long Id { get; set; } + /// + /// 物料ID + /// + [SugarColumn(ColumnName = "item_id")] + public long ItemId { get; set; } + /// + /// 货架id + /// + [SugarColumn(ColumnName = "rack_id")] + public long? RackId { get; set; } + /// + /// 库存 + /// + [SugarColumn(ColumnName = "quantity")] + public decimal? Quantity { get; set; } + /// + /// 备注 + /// + [SugarColumn(ColumnName = "remark")] + public string Remark { get; set; } + /// + /// 删除标识 + /// 默认值: 0 + /// + [SugarColumn(ColumnName = "del_flag")] + public byte DelFlag { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "create_by")] + public long? CreateBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "create_time")] + public DateTime? CreateTime { get; set; } + /// + /// 修改人 + /// + [SugarColumn(ColumnName = "update_by")] + public long? UpdateBy { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "update_time")] + public DateTime? UpdateTime { get; set; } + /// + /// 所属仓库 + /// + [SugarColumn(ColumnName = "warehouse_id")] + public long? WarehouseId { get; set; } + /// + /// 所属库区 + /// + [SugarColumn(ColumnName = "area_id")] + public long? AreaId { get; set; } + } +} diff --git a/ZR.Model/MES/wms/WmsInventoryCheck.cs b/ZR.Model/MES/wms/WmsInventoryCheck.cs new file mode 100644 index 00000000..b387f12a --- /dev/null +++ b/ZR.Model/MES/wms/WmsInventoryCheck.cs @@ -0,0 +1,108 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SqlSugar; +namespace ZR.Model.MES.wms +{ + /// + /// 库存盘点单据 + /// + [SugarTable("wms_inventory_check")] + public class WmsInventoryCheck + { + /// + /// + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] + public long Id { get; set; } + /// + /// 库存盘点单号，系统自动生成 + /// + [SugarColumn(ColumnName = "inventory_check_no")] + public string InventoryCheckNo { get; set; } + /// + /// 库存盘点类型 + /// + [SugarColumn(ColumnName = "inventory_check_type")] + public int? InventoryCheckType { get; set; } + /// + /// 库存盘点单状态11：盘点中 22：已完成 + /// 默认值: 11 + /// + [SugarColumn(ColumnName = "inventory_check_status")] + public byte? InventoryCheckStatus { get; set; } + /// + /// 盈亏数 + /// + [SugarColumn(ColumnName = "inventory_check_total")] + public decimal? InventoryCheckTotal { get; set; } + /// + /// 审核状态 + /// + [SugarColumn(ColumnName = "check_status")] + public byte? CheckStatus { get; set; } + /// + /// 审核人 + /// + [SugarColumn(ColumnName = "check_user_id")] + public long? CheckUserId { get; set; } + /// + /// 审核时间 + /// + [SugarColumn(ColumnName = "check_time")] + public DateTime? CheckTime { get; set; } + /// + /// 所属仓库 + /// + [SugarColumn(ColumnName = "warehouse_id")] + public long? WarehouseId { get; set; } + /// + /// 所属库区 + /// + [SugarColumn(ColumnName = "area_id")] + public long? AreaId { get; set; } + /// + /// 货架 + /// + [SugarColumn(ColumnName = "rack_id")] + public long? RackId { get; set; } + /// + /// 附件文件 + /// + [SugarColumn(ColumnName = "attachment")] + public string Attachment { get; set; } + /// + /// 备注 + /// + [SugarColumn(ColumnName = "remark")] + public string Remark { get; set; } + /// + /// 删除标识 + /// 默认值: 0 + /// + [SugarColumn(ColumnName = "del_flag")] + public byte DelFlag { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "create_by")] + public long? CreateBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "create_time")] + public DateTime? CreateTime { get; set; } + /// + /// 修改人 + /// + [SugarColumn(ColumnName = "update_by")] + public long? UpdateBy { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "update_time")] + public DateTime? UpdateTime { get; set; } + } +} diff --git a/ZR.Model/MES/wms/WmsInventoryCheckDetail.cs b/ZR.Model/MES/wms/WmsInventoryCheckDetail.cs new file mode 100644 index 00000000..dcee8b97 --- /dev/null +++ b/ZR.Model/MES/wms/WmsInventoryCheckDetail.cs @@ -0,0 +1,87 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SqlSugar; +namespace ZR.Model.MES.wms +{ + /// + /// 库存盘点单据详情 + /// + [SugarTable("wms_inventory_check_detail")] + public class WmsInventoryCheckDetail + { + /// + /// + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] + public long Id { get; set; } + /// + /// 库存盘点单 + /// + [SugarColumn(ColumnName = "inventory_check_id")] + public long? InventoryCheckId { get; set; } + /// + /// 物料 + /// + [SugarColumn(ColumnName = "item_id")] + public long ItemId { get; set; } + /// + /// 库存数量 + /// + [SugarColumn(ColumnName = "quantity")] + public decimal? Quantity { get; set; } + /// + /// 盘点数量 + /// + [SugarColumn(ColumnName = "check_quantity")] + public decimal? CheckQuantity { get; set; } + /// + /// 所属仓库 + /// + [SugarColumn(ColumnName = "warehouse_id")] + public long? WarehouseId { get; set; } + /// + /// 所属库区 + /// + [SugarColumn(ColumnName = "area_id")] + public long? AreaId { get; set; } + /// + /// 货架 + /// + [SugarColumn(ColumnName = "rack_id")] + public long? RackId { get; set; } + /// + /// 删除标识 + /// 默认值: 0 + /// + [SugarColumn(ColumnName = "del_flag")] + public byte DelFlag { get; set; } + /// + /// 备注 + /// + [SugarColumn(ColumnName = "remark")] + public string Remark { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "create_by")] + public long? CreateBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "create_time")] + public DateTime? CreateTime { get; set; } + /// + /// 修改人 + /// + [SugarColumn(ColumnName = "update_by")] + public long? UpdateBy { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "update_time")] + public DateTime? UpdateTime { get; set; } + } +} diff --git a/ZR.Model/MES/wms/WmsInventoryHistory.cs b/ZR.Model/MES/wms/WmsInventoryHistory.cs new file mode 100644 index 00000000..a158d754 --- /dev/null +++ b/ZR.Model/MES/wms/WmsInventoryHistory.cs @@ -0,0 +1,87 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SqlSugar; +namespace ZR.Model.MES.wms +{ + /// + /// 库存记录 + /// + [SugarTable("wms_inventory_history")] + public class WmsInventoryHistory + { + /// + /// + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] + public long Id { get; set; } + /// + /// 操作id（出库、入库、库存移动表单id） + /// + [SugarColumn(ColumnName = "form_id")] + public long? FormId { get; set; } + /// + /// 操作类型 + /// + [SugarColumn(ColumnName = "form_type")] + public int? FormType { get; set; } + /// + /// 物料ID + /// + [SugarColumn(ColumnName = "item_id")] + public long? ItemId { get; set; } + /// + /// 货架id + /// + [SugarColumn(ColumnName = "rack_id")] + public long? RackId { get; set; } + /// + /// 库存变化 + /// + [SugarColumn(ColumnName = "quantity")] + public decimal? Quantity { get; set; } + /// + /// 备注 + /// + [SugarColumn(ColumnName = "remark")] + public string Remark { get; set; } + /// + /// 删除标识 + /// 默认值: 0 + /// + [SugarColumn(ColumnName = "del_flag")] + public byte DelFlag { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "create_by")] + public long? CreateBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "create_time")] + public DateTime? CreateTime { get; set; } + /// + /// 修改人 + /// + [SugarColumn(ColumnName = "update_by")] + public long? UpdateBy { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "update_time")] + public DateTime? UpdateTime { get; set; } + /// + /// 所属仓库 + /// + [SugarColumn(ColumnName = "warehouse_id")] + public long? WarehouseId { get; set; } + /// + /// 所属库区 + /// + [SugarColumn(ColumnName = "area_id")] + public long? AreaId { get; set; } + } +} diff --git a/ZR.Model/MES/wms/WmsInventoryMovement.cs b/ZR.Model/MES/wms/WmsInventoryMovement.cs new file mode 100644 index 00000000..27c6bbfb --- /dev/null +++ b/ZR.Model/MES/wms/WmsInventoryMovement.cs @@ -0,0 +1,87 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SqlSugar; +namespace ZR.Model.MES.wms +{ + /// + /// 库存移动 + /// + [SugarTable("wms_inventory_movement")] + public class WmsInventoryMovement + { + /// + /// + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] + public long Id { get; set; } + /// + /// 编号 + /// + [SugarColumn(ColumnName = "inventory_movement_no")] + public string InventoryMovementNo { get; set; } + /// + /// 原货架Id + /// + [SugarColumn(ColumnName = "source_rack_id")] + public long? SourceRackId { get; set; } + /// + /// 目标货架 + /// + [SugarColumn(ColumnName = "target_rack_id")] + public long? TargetRackId { get; set; } + /// + /// 状态 + /// + [SugarColumn(ColumnName = "status")] + public byte? Status { get; set; } + /// + /// 审核状态 + /// + [SugarColumn(ColumnName = "check_status")] + public byte? CheckStatus { get; set; } + /// + /// 审核人 + /// + [SugarColumn(ColumnName = "check_user_id")] + public long? CheckUserId { get; set; } + /// + /// 审核时间 + /// + [SugarColumn(ColumnName = "check_time")] + public DateTime? CheckTime { get; set; } + /// + /// 备注 + /// + [SugarColumn(ColumnName = "remark")] + public string Remark { get; set; } + /// + /// 删除标识 + /// 默认值: 0 + /// + [SugarColumn(ColumnName = "del_flag")] + public byte DelFlag { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "create_by")] + public long? CreateBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "create_time")] + public DateTime? CreateTime { get; set; } + /// + /// 修改人 + /// + [SugarColumn(ColumnName = "update_by")] + public long? UpdateBy { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "update_time")] + public DateTime? UpdateTime { get; set; } + } +} diff --git a/ZR.Model/MES/wms/WmsInventoryMovementDetail.cs b/ZR.Model/MES/wms/WmsInventoryMovementDetail.cs new file mode 100644 index 00000000..59a322f8 --- /dev/null +++ b/ZR.Model/MES/wms/WmsInventoryMovementDetail.cs @@ -0,0 +1,107 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SqlSugar; +namespace ZR.Model.MES.wms +{ + /// + /// 库存移动详情 + /// + [SugarTable("wms_inventory_movement_detail")] + public class WmsInventoryMovementDetail + { + /// + /// + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] + public long Id { get; set; } + /// + /// 库存移动Id + /// + [SugarColumn(ColumnName = "inventory_movement_id")] + public long? InventoryMovementId { get; set; } + /// + /// 物料 + /// + [SugarColumn(ColumnName = "item_id")] + public long? ItemId { get; set; } + /// + /// 计划数量 + /// + [SugarColumn(ColumnName = "plan_quantity")] + public decimal? PlanQuantity { get; set; } + /// + /// 实际数量 + /// + [SugarColumn(ColumnName = "real_quantity")] + public decimal? RealQuantity { get; set; } + /// + /// 删除标识 + /// 默认值: 0 + /// + [SugarColumn(ColumnName = "del_flag")] + public byte DelFlag { get; set; } + /// + /// 备注 + /// + [SugarColumn(ColumnName = "remark")] + public string Remark { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "create_by")] + public long? CreateBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "create_time")] + public DateTime? CreateTime { get; set; } + /// + /// 修改人 + /// + [SugarColumn(ColumnName = "update_by")] + public long? UpdateBy { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "update_time")] + public DateTime? UpdateTime { get; set; } + /// + /// 源货架 + /// + [SugarColumn(ColumnName = "source_rack_id")] + public long? SourceRackId { get; set; } + /// + /// 源仓库 + /// + [SugarColumn(ColumnName = "source_warehouse_id")] + public long? SourceWarehouseId { get; set; } + /// + /// 源库区 + /// + [SugarColumn(ColumnName = "source_area_id")] + public long? SourceAreaId { get; set; } + /// + /// 移库状态 + /// + [SugarColumn(ColumnName = "move_status")] + public byte? MoveStatus { get; set; } + /// + /// 目标货架 + /// + [SugarColumn(ColumnName = "target_rack_id")] + public long? TargetRackId { get; set; } + /// + /// 目标仓库 + /// + [SugarColumn(ColumnName = "target_warehouse_id")] + public long? TargetWarehouseId { get; set; } + /// + /// 目标库区 + /// + [SugarColumn(ColumnName = "target_area_id")] + public long? TargetAreaId { get; set; } + } +} diff --git a/ZR.Model/MES/wms/WmsInventorySettlement.cs b/ZR.Model/MES/wms/WmsInventorySettlement.cs new file mode 100644 index 00000000..d3e0a17f --- /dev/null +++ b/ZR.Model/MES/wms/WmsInventorySettlement.cs @@ -0,0 +1,78 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SqlSugar; +namespace ZR.Model.MES.wms +{ + /// + /// 库存结算单 + /// + [SugarTable("wms_inventory_settlement")] + public class WmsInventorySettlement + { + /// + /// + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] + public long Id { get; set; } + /// + /// 库存结算单号 + /// + [SugarColumn(ColumnName = "inventory_settlement_no")] + public string InventorySettlementNo { get; set; } + /// + /// 库存结算单状态11：结算中 22：已完成 + /// 默认值: 11 + /// + [SugarColumn(ColumnName = "inventory_settlement_status")] + public byte? InventorySettlementStatus { get; set; } + /// + /// 库存结算周期开始时间 + /// + [SugarColumn(ColumnName = "inventory_settlement_start_time")] + public DateTime? InventorySettlementStartTime { get; set; } + /// + /// 库存结算周期结束时间 + /// + [SugarColumn(ColumnName = "inventory_settlement_end_time")] + public DateTime? InventorySettlementEndTime { get; set; } + /// + /// 结算类型,1:月结，2:年结 + /// + [SugarColumn(ColumnName = "settlement_type")] + public int SettlementType { get; set; } + /// + /// 删除标识 + /// 默认值: 0 + /// + [SugarColumn(ColumnName = "del_flag")] + public byte DelFlag { get; set; } + /// + /// 备注 + /// + [SugarColumn(ColumnName = "remark")] + public string Remark { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "create_by")] + public long? CreateBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "create_time")] + public DateTime? CreateTime { get; set; } + /// + /// 修改人 + /// + [SugarColumn(ColumnName = "update_by")] + public long? UpdateBy { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "update_time")] + public DateTime? UpdateTime { get; set; } + } +} diff --git a/ZR.Model/MES/wms/WmsInventorySettlementDetail.cs b/ZR.Model/MES/wms/WmsInventorySettlementDetail.cs new file mode 100644 index 00000000..d77eaa52 --- /dev/null +++ b/ZR.Model/MES/wms/WmsInventorySettlementDetail.cs @@ -0,0 +1,132 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SqlSugar; +namespace ZR.Model.MES.wms +{ + /// + /// 库存结算明细 + /// + [SugarTable("wms_inventory_settlement_detail")] + public class WmsInventorySettlementDetail + { + /// + /// + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] + public long Id { get; set; } + /// + /// 结算单id + /// + [SugarColumn(ColumnName = "settlement_id")] + public long SettlementId { get; set; } + /// + /// 结算类型,1:月结，2:年结 + /// + [SugarColumn(ColumnName = "settlement_type")] + public int? SettlementType { get; set; } + /// + /// 物料id + /// + [SugarColumn(ColumnName = "item_id")] + public long ItemId { get; set; } + /// + /// 编号 + /// + [SugarColumn(ColumnName = "item_no")] + public string ItemNo { get; set; } + /// + /// 名称 + /// + [SugarColumn(ColumnName = "item_name")] + public string ItemName { get; set; } + /// + /// 仓库id + /// + [SugarColumn(ColumnName = "warehouse_id")] + public long? WarehouseId { get; set; } + /// + /// 仓库编号 + /// + [SugarColumn(ColumnName = "warehouse_no")] + public string WarehouseNo { get; set; } + /// + /// 仓库名称 + /// + [SugarColumn(ColumnName = "warehouse_name")] + public string WarehouseName { get; set; } + /// + /// 库区id + /// + [SugarColumn(ColumnName = "area_id")] + public long? AreaId { get; set; } + /// + /// 库区编号 + /// + [SugarColumn(ColumnName = "area_no")] + public string AreaNo { get; set; } + /// + /// 库区名称 + /// + [SugarColumn(ColumnName = "area_name")] + public string AreaName { get; set; } + /// + /// 上期结存 + /// + [SugarColumn(ColumnName = "previous_balance")] + public decimal? PreviousBalance { get; set; } + /// + /// 本期入库 + /// + [SugarColumn(ColumnName = "current_enter")] + public decimal? CurrentEnter { get; set; } + /// + /// 本期出库 + /// + [SugarColumn(ColumnName = "current_out")] + public decimal? CurrentOut { get; set; } + /// + /// 本期盘点 + /// + [SugarColumn(ColumnName = "current_check")] + public decimal? CurrentCheck { get; set; } + /// + /// 本期结存 + /// + [SugarColumn(ColumnName = "current_balance")] + public decimal? CurrentBalance { get; set; } + /// + /// 删除标识 + /// 默认值: 0 + /// + [SugarColumn(ColumnName = "del_flag")] + public byte DelFlag { get; set; } + /// + /// 备注 + /// + [SugarColumn(ColumnName = "remark")] + public string Remark { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "create_by")] + public long? CreateBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "create_time")] + public DateTime? CreateTime { get; set; } + /// + /// 修改人 + /// + [SugarColumn(ColumnName = "update_by")] + public long? UpdateBy { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "update_time")] + public DateTime? UpdateTime { get; set; } + } +} diff --git a/ZR.Model/MES/wms/WmsItem.cs b/ZR.Model/MES/wms/WmsItem.cs new file mode 100644 index 00000000..3e00c82b --- /dev/null +++ b/ZR.Model/MES/wms/WmsItem.cs @@ -0,0 +1,117 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SqlSugar; +namespace ZR.Model.MES.wms +{ + /// + /// 物料 + /// + [SugarTable("wms_item")] + public class WmsItem + { + /// + /// + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] + public long Id { get; set; } + /// + /// 编号 + /// + [SugarColumn(ColumnName = "item_no")] + public string ItemNo { get; set; } + /// + /// 名称 + /// + [SugarColumn(ColumnName = "item_name")] + public string ItemName { get; set; } + /// + /// 规格 + /// + [SugarColumn(ColumnName = "specification")] + public string Specification { get; set; } + /// + /// 分类 + /// + [SugarColumn(ColumnName = "item_type")] + public string ItemType { get; set; } + /// + /// 单位类别 + /// + [SugarColumn(ColumnName = "unit")] + public string Unit { get; set; } + /// + /// 单价 + /// + [SugarColumn(ColumnName = "unit_price")] + public decimal? UnitPrice { get; set; } + /// + /// 所属货架 + /// + [SugarColumn(ColumnName = "rack_id")] + public long? RackId { get; set; } + /// + /// 所属库区 + /// + [SugarColumn(ColumnName = "area_id")] + public long? AreaId { get; set; } + /// + /// 所属仓库 + /// + [SugarColumn(ColumnName = "warehouse_id")] + public long? WarehouseId { get; set; } + /// + /// 安全库存 + /// + [SugarColumn(ColumnName = "quantity")] + public decimal? Quantity { get; set; } + /// + /// 生产日期 + /// + [SugarColumn(ColumnName = "production_date")] + public DateTime? ProductionDate { get; set; } + /// + /// 有效期 + /// + [SugarColumn(ColumnName = "expiry_date")] + public DateTime? ExpiryDate { get; set; } + /// + /// 批次 + /// + [SugarColumn(ColumnName = "batch")] + public string Batch { get; set; } + /// + /// 删除标识 + /// 默认值: 0 + /// + [SugarColumn(ColumnName = "del_flag")] + public byte DelFlag { get; set; } + /// + /// 备注 + /// + [SugarColumn(ColumnName = "remark")] + public string Remark { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "create_by")] + public long? CreateBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "create_time")] + public DateTime? CreateTime { get; set; } + /// + /// 修改人 + /// + [SugarColumn(ColumnName = "update_by")] + public long? UpdateBy { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "update_time")] + public DateTime? UpdateTime { get; set; } + } +} diff --git a/ZR.Model/MES/wms/WmsItemType.cs b/ZR.Model/MES/wms/WmsItemType.cs new file mode 100644 index 00000000..94d3c7bc --- /dev/null +++ b/ZR.Model/MES/wms/WmsItemType.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SqlSugar; +namespace ZR.Model.MES.wms +{ + /// + /// 物料类型表 + /// + [SugarTable("wms_item_type")] + public class WmsItemType + { + /// + /// 物料类型id + /// + [SugarColumn(ColumnName = "item_type_id", IsPrimaryKey = true, IsIdentity = true)] + public long ItemTypeId { get; set; } + /// + /// 父物料类型id + /// 默认值: 0 + /// + [SugarColumn(ColumnName = "parent_id")] + public long? ParentId { get; set; } + /// + /// 祖级列表 + /// 默认值: + /// + [SugarColumn(ColumnName = "ancestors")] + public string Ancestors { get; set; } + /// + /// 物料类型名称 + /// 默认值: + /// + [SugarColumn(ColumnName = "type_name")] + public string TypeName { get; set; } + /// + /// 显示顺序 + /// 默认值: 0 + /// + [SugarColumn(ColumnName = "order_num")] + public int? OrderNum { get; set; } + /// + /// 物料类型状态（0正常 1停用） + /// 默认值: 0 + /// + [SugarColumn(ColumnName = "status")] + public string Status { get; set; } + /// + /// 删除标志（0代表存在 2代表删除） + /// 默认值: 0 + /// + [SugarColumn(ColumnName = "del_flag")] + public string DelFlag { get; set; } + /// + /// 创建者 + /// + [SugarColumn(ColumnName = "create_by")] + public long? CreateBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "create_time")] + public DateTime? CreateTime { get; set; } + /// + /// 更新者 + /// + [SugarColumn(ColumnName = "update_by")] + public long? UpdateBy { get; set; } + /// + /// 更新时间 + /// + [SugarColumn(ColumnName = "update_time")] + public DateTime? UpdateTime { get; set; } + } +} diff --git a/ZR.Model/MES/wms/WmsRack.cs b/ZR.Model/MES/wms/WmsRack.cs new file mode 100644 index 00000000..26bc4605 --- /dev/null +++ b/ZR.Model/MES/wms/WmsRack.cs @@ -0,0 +1,72 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SqlSugar; +namespace ZR.Model.MES.wms +{ + /// + /// 货架 + /// + [SugarTable("wms_rack")] + public class WmsRack + { + /// + /// + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] + public long Id { get; set; } + /// + /// 编号 + /// + [SugarColumn(ColumnName = "rack_no")] + public string RackNo { get; set; } + /// + /// 名称 + /// + [SugarColumn(ColumnName = "rack_name")] + public string RackName { get; set; } + /// + /// 所属库区 + /// + [SugarColumn(ColumnName = "area_id")] + public long AreaId { get; set; } + /// + /// 所属仓库 + /// + [SugarColumn(ColumnName = "warehouse_id")] + public long WarehouseId { get; set; } + /// + /// 备注 + /// + [SugarColumn(ColumnName = "remark")] + public string Remark { get; set; } + /// + /// 删除标识 + /// 默认值: 0 + /// + [SugarColumn(ColumnName = "del_flag")] + public byte DelFlag { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "create_by")] + public long? CreateBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "create_time")] + public DateTime? CreateTime { get; set; } + /// + /// 修改人 + /// + [SugarColumn(ColumnName = "update_by")] + public long? UpdateBy { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "update_time")] + public DateTime? UpdateTime { get; set; } + } +} diff --git a/ZR.Model/MES/wms/WmsReceiptOrder.cs b/ZR.Model/MES/wms/WmsReceiptOrder.cs new file mode 100644 index 00000000..e27ad0f6 --- /dev/null +++ b/ZR.Model/MES/wms/WmsReceiptOrder.cs @@ -0,0 +1,87 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SqlSugar; +namespace ZR.Model.MES.wms +{ + /// + /// 入库单 + /// + [SugarTable("wms_receipt_order")] + public class WmsReceiptOrder + { + /// + /// + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] + public long Id { get; set; } + /// + /// 入库单号 + /// + [SugarColumn(ColumnName = "receipt_order_no")] + public string ReceiptOrderNo { get; set; } + /// + /// 入库类型 + /// + [SugarColumn(ColumnName = "receipt_order_type")] + public int? ReceiptOrderType { get; set; } + /// + /// 供应商 + /// + [SugarColumn(ColumnName = "supplier_id")] + public long? SupplierId { get; set; } + /// + /// 订单号 + /// + [SugarColumn(ColumnName = "order_no")] + public string OrderNo { get; set; } + /// + /// 订单金额 + /// + [SugarColumn(ColumnName = "payable_amount")] + public decimal? PayableAmount { get; set; } + /// + /// 入库状态 + /// + [SugarColumn(ColumnName = "receipt_order_status")] + public byte? ReceiptOrderStatus { get; set; } + /// + /// 备注 + /// + [SugarColumn(ColumnName = "remark")] + public string Remark { get; set; } + /// + /// 删除标识 + /// 默认值: 0 + /// + [SugarColumn(ColumnName = "del_flag")] + public byte DelFlag { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "create_by")] + public long? CreateBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "create_time")] + public DateTime? CreateTime { get; set; } + /// + /// 修改人 + /// + [SugarColumn(ColumnName = "update_by")] + public long? UpdateBy { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "update_time")] + public DateTime? UpdateTime { get; set; } + /// + /// 波次号 + /// + [SugarColumn(ColumnName = "wave_no")] + public string WaveNo { get; set; } + } +} diff --git a/ZR.Model/MES/wms/WmsReceiptOrderDetail.cs b/ZR.Model/MES/wms/WmsReceiptOrderDetail.cs new file mode 100644 index 00000000..ce3b42f4 --- /dev/null +++ b/ZR.Model/MES/wms/WmsReceiptOrderDetail.cs @@ -0,0 +1,97 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SqlSugar; +namespace ZR.Model.MES.wms +{ + /// + /// 入库单详情 + /// + [SugarTable("wms_receipt_order_detail")] + public class WmsReceiptOrderDetail + { + /// + /// + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] + public long Id { get; set; } + /// + /// 入库单号 + /// + [SugarColumn(ColumnName = "receipt_order_id")] + public long? ReceiptOrderId { get; set; } + /// + /// 物料 + /// + [SugarColumn(ColumnName = "item_id")] + public long? ItemId { get; set; } + /// + /// 计划数量 + /// + [SugarColumn(ColumnName = "plan_quantity")] + public decimal? PlanQuantity { get; set; } + /// + /// 实际数量 + /// + [SugarColumn(ColumnName = "real_quantity")] + public decimal? RealQuantity { get; set; } + /// + /// 所属货架 + /// + [SugarColumn(ColumnName = "rack_id")] + public long? RackId { get; set; } + /// + /// 金额 + /// + [SugarColumn(ColumnName = "money")] + public decimal? Money { get; set; } + /// + /// 删除标识 + /// 默认值: 0 + /// + [SugarColumn(ColumnName = "del_flag")] + public byte DelFlag { get; set; } + /// + /// 备注 + /// + [SugarColumn(ColumnName = "remark")] + public string Remark { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "create_by")] + public long? CreateBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "create_time")] + public DateTime? CreateTime { get; set; } + /// + /// 修改人 + /// + [SugarColumn(ColumnName = "update_by")] + public long? UpdateBy { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "update_time")] + public DateTime? UpdateTime { get; set; } + /// + /// 所属仓库 + /// + [SugarColumn(ColumnName = "warehouse_id")] + public long? WarehouseId { get; set; } + /// + /// 所属库区 + /// + [SugarColumn(ColumnName = "area_id")] + public long? AreaId { get; set; } + /// + /// 入库状态 + /// + [SugarColumn(ColumnName = "receipt_order_status")] + public byte? ReceiptOrderStatus { get; set; } + } +} diff --git a/ZR.Model/MES/wms/WmsShipmentOrder.cs b/ZR.Model/MES/wms/WmsShipmentOrder.cs new file mode 100644 index 00000000..676547bd --- /dev/null +++ b/ZR.Model/MES/wms/WmsShipmentOrder.cs @@ -0,0 +1,102 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SqlSugar; +namespace ZR.Model.MES.wms +{ + /// + /// 出库单 + /// + [SugarTable("wms_shipment_order")] + public class WmsShipmentOrder + { + /// + /// + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] + public long Id { get; set; } + /// + /// 出库单号，系统自动生成 + /// + [SugarColumn(ColumnName = "shipment_order_no")] + public string ShipmentOrderNo { get; set; } + /// + /// 出库类型 + /// + [SugarColumn(ColumnName = "shipment_order_type")] + public int? ShipmentOrderType { get; set; } + /// + /// 出库订单 + /// + [SugarColumn(ColumnName = "order_no")] + public string OrderNo { get; set; } + /// + /// 客户 + /// + [SugarColumn(ColumnName = "customer_id")] + public long? CustomerId { get; set; } + /// + /// 订单金额 + /// + [SugarColumn(ColumnName = "receivable_amount")] + public decimal? ReceivableAmount { get; set; } + /// + /// 出库单状态 + /// + [SugarColumn(ColumnName = "shipment_order_status")] + public byte? ShipmentOrderStatus { get; set; } + /// + /// 审核状态 + /// + [SugarColumn(ColumnName = "check_status")] + public byte? CheckStatus { get; set; } + /// + /// 审核人 + /// + [SugarColumn(ColumnName = "check_user_id")] + public long? CheckUserId { get; set; } + /// + /// 审核时间 + /// + [SugarColumn(ColumnName = "check_time")] + public DateTime? CheckTime { get; set; } + /// + /// 波次号 + /// + [SugarColumn(ColumnName = "wave_no")] + public string WaveNo { get; set; } + /// + /// 备注 + /// + [SugarColumn(ColumnName = "remark")] + public string Remark { get; set; } + /// + /// 删除标识 + /// 默认值: 0 + /// + [SugarColumn(ColumnName = "del_flag")] + public byte DelFlag { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "create_by")] + public long? CreateBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "create_time")] + public DateTime? CreateTime { get; set; } + /// + /// 修改人 + /// + [SugarColumn(ColumnName = "update_by")] + public long? UpdateBy { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "update_time")] + public DateTime? UpdateTime { get; set; } + } +} diff --git a/ZR.Model/MES/wms/WmsShipmentOrderDetail.cs b/ZR.Model/MES/wms/WmsShipmentOrderDetail.cs new file mode 100644 index 00000000..e662265e --- /dev/null +++ b/ZR.Model/MES/wms/WmsShipmentOrderDetail.cs @@ -0,0 +1,97 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SqlSugar; +namespace ZR.Model.MES.wms +{ + /// + /// 出库单详情 + /// + [SugarTable("wms_shipment_order_detail")] + public class WmsShipmentOrderDetail + { + /// + /// + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] + public long Id { get; set; } + /// + /// 出库单 + /// + [SugarColumn(ColumnName = "shipment_order_id")] + public long? ShipmentOrderId { get; set; } + /// + /// 物料 + /// + [SugarColumn(ColumnName = "item_id")] + public long? ItemId { get; set; } + /// + /// 计划数量 + /// + [SugarColumn(ColumnName = "plan_quantity")] + public decimal? PlanQuantity { get; set; } + /// + /// 实际数量 + /// + [SugarColumn(ColumnName = "real_quantity")] + public decimal? RealQuantity { get; set; } + /// + /// 货架 + /// + [SugarColumn(ColumnName = "rack_id")] + public long? RackId { get; set; } + /// + /// 金额 + /// + [SugarColumn(ColumnName = "money")] + public decimal? Money { get; set; } + /// + /// 删除标识 + /// 默认值: 0 + /// + [SugarColumn(ColumnName = "del_flag")] + public byte DelFlag { get; set; } + /// + /// 备注 + /// + [SugarColumn(ColumnName = "remark")] + public string Remark { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "create_by")] + public long? CreateBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "create_time")] + public DateTime? CreateTime { get; set; } + /// + /// 修改人 + /// + [SugarColumn(ColumnName = "update_by")] + public long? UpdateBy { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "update_time")] + public DateTime? UpdateTime { get; set; } + /// + /// 所属仓库 + /// + [SugarColumn(ColumnName = "warehouse_id")] + public long? WarehouseId { get; set; } + /// + /// 所属库区 + /// + [SugarColumn(ColumnName = "area_id")] + public long? AreaId { get; set; } + /// + /// 出库状态 + /// + [SugarColumn(ColumnName = "shipment_order_status")] + public byte? ShipmentOrderStatus { get; set; } + } +} diff --git a/ZR.Model/MES/wms/WmsSupplier.cs b/ZR.Model/MES/wms/WmsSupplier.cs new file mode 100644 index 00000000..b9bb393a --- /dev/null +++ b/ZR.Model/MES/wms/WmsSupplier.cs @@ -0,0 +1,108 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SqlSugar; +namespace ZR.Model.MES.wms +{ + /// + /// 供应商 + /// + [SugarTable("wms_supplier")] + public class WmsSupplier + { + /// + /// + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] + public long Id { get; set; } + /// + /// 编号 + /// + [SugarColumn(ColumnName = "supplier_no")] + public string SupplierNo { get; set; } + /// + /// 名称 + /// + [SugarColumn(ColumnName = "supplier_name")] + public string SupplierName { get; set; } + /// + /// 开户行 + /// + [SugarColumn(ColumnName = "bank_name")] + public string BankName { get; set; } + /// + /// 银行账户 + /// + [SugarColumn(ColumnName = "bank_account")] + public string BankAccount { get; set; } + /// + /// 应付款 + /// 默认值: 0.00 + /// + [SugarColumn(ColumnName = "payable_amount")] + public decimal? PayableAmount { get; set; } + /// + /// 地址 + /// + [SugarColumn(ColumnName = "address")] + public string Address { get; set; } + /// + /// 手机号 + /// + [SugarColumn(ColumnName = "mobile_no")] + public string MobileNo { get; set; } + /// + /// 座机号 + /// + [SugarColumn(ColumnName = "tel_no")] + public string TelNo { get; set; } + /// + /// 联系人 + /// + [SugarColumn(ColumnName = "contact")] + public string Contact { get; set; } + /// + /// 级别 + /// + [SugarColumn(ColumnName = "level")] + public string Level { get; set; } + /// + /// Email + /// + [SugarColumn(ColumnName = "email")] + public string Email { get; set; } + /// + /// 备注 + /// + [SugarColumn(ColumnName = "remark")] + public string Remark { get; set; } + /// + /// 删除标识 + /// 默认值: 0 + /// + [SugarColumn(ColumnName = "del_flag")] + public byte DelFlag { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "create_by")] + public long? CreateBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "create_time")] + public DateTime? CreateTime { get; set; } + /// + /// 修改人 + /// + [SugarColumn(ColumnName = "update_by")] + public long? UpdateBy { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "update_time")] + public DateTime? UpdateTime { get; set; } + } +} diff --git a/ZR.Model/MES/wms/WmsSupplierTransaction.cs b/ZR.Model/MES/wms/WmsSupplierTransaction.cs new file mode 100644 index 00000000..8f6681a5 --- /dev/null +++ b/ZR.Model/MES/wms/WmsSupplierTransaction.cs @@ -0,0 +1,79 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SqlSugar; +namespace ZR.Model.MES.wms +{ + /// + /// 供应商账户流水 + /// + [SugarTable("wms_supplier_transaction")] + public class WmsSupplierTransaction + { + /// + /// id + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + /// + /// 交易编号 + /// + [SugarColumn(ColumnName = "transaction_code")] + public string TransactionCode { get; set; } + /// + /// 供应商编号 + /// + [SugarColumn(ColumnName = "supplier_id")] + public string SupplierId { get; set; } + /// + /// 交易类型 1：结款 2：应付 + /// + [SugarColumn(ColumnName = "transaction_type")] + public string TransactionType { get; set; } + /// + /// 交易金额 + /// + [SugarColumn(ColumnName = "transaction_amount")] + public decimal TransactionAmount { get; set; } + /// + /// 上期余额 + /// + [SugarColumn(ColumnName = "previous_balance")] + public decimal PreviousBalance { get; set; } + /// + /// 当前余额 + /// + [SugarColumn(ColumnName = "current_balance")] + public decimal CurrentBalance { get; set; } + /// + /// 入库单号 + /// + [SugarColumn(ColumnName = "receipt_order_id")] + public long? ReceiptOrderId { get; set; } + /// + /// 备注 + /// + [SugarColumn(ColumnName = "remark")] + public string Remark { get; set; } + /// + /// 删除标志 + /// 默认值: 0 + /// + [SugarColumn(ColumnName = "del_flag")] + public byte DelFlag { get; set; } + /// + /// 创建时间 + /// 默认值: CURRENT_TIMESTAMP + /// + [SugarColumn(ColumnName = "create_time")] + public DateTime CreateTime { get; set; } + /// + /// 更新时间 + /// 默认值: CURRENT_TIMESTAMP + /// + [SugarColumn(ColumnName = "update_time")] + public DateTime UpdateTime { get; set; } + } +} diff --git a/ZR.Model/MES/wms/WmsWarehouse.cs b/ZR.Model/MES/wms/WmsWarehouse.cs new file mode 100644 index 00000000..7ba27a65 --- /dev/null +++ b/ZR.Model/MES/wms/WmsWarehouse.cs @@ -0,0 +1,62 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SqlSugar; +namespace ZR.Model.MES.wms +{ + /// + /// 仓库 + /// + [SugarTable("wms_warehouse")] + public class WmsWarehouse + { + /// + /// + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] + public long Id { get; set; } + /// + /// 编号 + /// + [SugarColumn(ColumnName = "warehouse_no")] + public string WarehouseNo { get; set; } + /// + /// 名称 + /// + [SugarColumn(ColumnName = "warehouse_name")] + public string WarehouseName { get; set; } + /// + /// 删除标识 + /// 默认值: 0 + /// + [SugarColumn(ColumnName = "del_flag")] + public byte DelFlag { get; set; } + /// + /// 备注 + /// + [SugarColumn(ColumnName = "remark")] + public string Remark { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "create_by")] + public long? CreateBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "create_time")] + public DateTime? CreateTime { get; set; } + /// + /// 修改人 + /// + [SugarColumn(ColumnName = "update_by")] + public long? UpdateBy { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "update_time")] + public DateTime? UpdateTime { get; set; } + } +} diff --git a/ZR.Model/MES/wms/WmsWave.cs b/ZR.Model/MES/wms/WmsWave.cs new file mode 100644 index 00000000..a87aa990 --- /dev/null +++ b/ZR.Model/MES/wms/WmsWave.cs @@ -0,0 +1,68 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SqlSugar; +namespace ZR.Model.MES.wms +{ + /// + /// 波次 + /// + [SugarTable("wms_wave")] + public class WmsWave + { + /// + /// + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] + public long Id { get; set; } + /// + /// 波次号 + /// + [SugarColumn(ColumnName = "wave_no")] + public string WaveNo { get; set; } + /// + /// 状态 + /// + [SugarColumn(ColumnName = "status")] + public string Status { get; set; } + /// + /// 备注 + /// + [SugarColumn(ColumnName = "remark")] + public string Remark { get; set; } + /// + /// 删除标识 + /// 默认值: 0 + /// + [SugarColumn(ColumnName = "del_flag")] + public byte DelFlag { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "create_by")] + public long? CreateBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "create_time")] + public DateTime? CreateTime { get; set; } + /// + /// 修改人 + /// + [SugarColumn(ColumnName = "update_by")] + public long? UpdateBy { get; set; } + /// + /// 修改时间 + /// + [SugarColumn(ColumnName = "update_time")] + public DateTime? UpdateTime { get; set; } + /// + /// 1：入库单 2：出库单 + /// 默认值: 2 + /// + [SugarColumn(ColumnName = "type")] + public int? Type { get; set; } + } +} diff --git a/ZR.Service/mes/pro/IService/IProWorkorderServiceV2.cs b/ZR.Service/mes/pro/IService/IProWorkorderServiceV2.cs index fc2afb12..8aaf7a89 100644 --- a/ZR.Service/mes/pro/IService/IProWorkorderServiceV2.cs +++ b/ZR.Service/mes/pro/IService/IProWorkorderServiceV2.cs @@ -38,6 +38,7 @@ namespace ZR.Service.mes.pro.IService public int UpdateWorkOrder(ProWorkorder_v2 workorder); public int UpdateworkorderSort(string id ,int sort); + public int UpdateworkorderSort2(string oldId,int oldSort, string newId,int newSort); public int StartWorkOrder(string id); diff --git a/ZR.Service/mes/pro/ProWorkorderServiceV2.cs b/ZR.Service/mes/pro/ProWorkorderServiceV2.cs index d1845c05..188ab921 100644 --- a/ZR.Service/mes/pro/ProWorkorderServiceV2.cs +++ b/ZR.Service/mes/pro/ProWorkorderServiceV2.cs @@ -174,7 +174,8 @@ namespace ZR.Service.mes.pro public (string, string) ExportExceldata(int year, int week, int date) { //1.0 读取表数据 - var list = Queryable().Where(it => it.Year == year && it.Week == week && it.Date == date).ToList(); + var list = Queryable().Where(it => it.Year == year && it.Week == week && it.Date == date) + .OrderBy(it => it.Sort).ToList(); //2.0 保存为excel IWebHostEnvironment webHostEnvironment = (IWebHostEnvironment)App.ServiceProvider.GetService(typeof(IWebHostEnvironment)); @@ -397,5 +398,17 @@ namespace ZR.Service.mes.pro DateTime firstDayOfThisWeek = firstDayOfFirstWeek.AddDays((weekNum - 1) * 7); return firstDayOfThisWeek; } + + public int UpdateworkorderSort2(string oldId, int oldSort, string newId, int newSort) + { + int finalreuslt = 0; + int result1 = Context.Updateable().Where(it => it.Id == oldId).SetColumns(it => it.Sort == newSort).ExecuteCommand(); + int result2 = Context.Updateable().Where(it => it.Id == newId).SetColumns(it => it.Sort == oldSort).ExecuteCommand(); + if (result1 > 0 && result2 >0) + { + finalreuslt = 1; + } + return finalreuslt; + } } } diff --git a/ZR.Service/mes/wms/IService/IAreaService.cs b/ZR.Service/mes/wms/IService/IAreaService.cs new file mode 100644 index 00000000..1c02efea --- /dev/null +++ b/ZR.Service/mes/wms/IService/IAreaService.cs @@ -0,0 +1,60 @@ +using System.Collections.ObjectModel; +using ZR.Model.MES.wms; +using ZR.Model.MES.wms.POJO.DTO; +using ZR.Model.MES.wms.POJO.query; + +namespace ZR.Service.mes.wms.IService +{ + public interface IAreaService + { + /** + * 查询货区 + * + * @param id 货区主键 + * @return 货区 + */ + public WmsArea SelectById(long id); + /** + * 查询货区列表 + * + * @param query 查询条件 + * @param page 分页条件 + * @return 货区 + */ + public List SelectList(AreaQuery query, Pageable page); + + /** + * 新增货区 + * + * @param area 货区 + * @return 结果 + */ + public int Insert(WmsArea area); + + /** + * 修改货区 + * + * @param area 货区 + * @return 结果 + */ + public int Update(WmsArea area); + + /** + * 批量删除货区 + * + * @param ids 需要删除的货区主键 + * @return 结果 + */ + public int DeleteByIds(long[] ids); + + /** + * 删除货区信息 + * + * @param id 货区主键 + * @return 结果 + */ + public int DeleteById(long id); + + public List SelectByIdIn(Collection ids); + } +} diff --git a/ZR.Service/mes/wms/IService/ICarrierService.cs b/ZR.Service/mes/wms/IService/ICarrierService.cs new file mode 100644 index 00000000..f9ea1ec6 --- /dev/null +++ b/ZR.Service/mes/wms/IService/ICarrierService.cs @@ -0,0 +1,58 @@ +using ZR.Model.MES.wms; +using ZR.Model.MES.wms.POJO.DTO; +using ZR.Model.MES.wms.POJO.query; + +namespace ZR.Service.mes.wms.IService +{ + public interface ICarrierService + { + + /** + * 查询承运商 + * + * @param id 承运商主键 + * @return 承运商 + */ + public WmsCarrier SelectById(long id); + + /** + * 查询承运商列表 + * + * @param query 查询条件 + * @param page 分页条件 + * @return 承运商 + */ + public List SelectList(CarrierQuery query, Pageable page); + + /** + * 新增承运商 + * + * @param carrier 承运商 + * @return 结果 + */ + public int Insert(WmsCarrier carrier); + + /** + * 修改承运商 + * + * @param carrier 承运商 + * @return 结果 + */ + public int Update(WmsCarrier carrier); + + /** + * 批量删除承运商 + * + * @param ids 需要删除的承运商主键 + * @return 结果 + */ + public int DeleteByIds(long[] ids); + /** + * 删除承运商信息 + * + * @param id 承运商主键 + * @return 结果 + */ + public int DeleteById(long id); + } +} diff --git a/ZR.Service/mes/wms/IService/ICustomerService.cs b/ZR.Service/mes/wms/IService/ICustomerService.cs new file mode 100644 index 00000000..1fd18c58 --- /dev/null +++ b/ZR.Service/mes/wms/IService/ICustomerService.cs @@ -0,0 +1,58 @@ +using ZR.Model.MES.wms; +using ZR.Model.MES.wms.POJO.DTO; +using ZR.Model.MES.wms.POJO.query; + +namespace ZR.Service.mes.wms.IService +{ + public interface ICustomerService + { + /** + * 查询客户 + * + * @param id 客户主键 + * @return 客户 + */ + public WmsCustomer SelectById(long id); + + /** + * 查询客户列表 + * + * @param query 查询条件 + * @param page 分页条件 + * @return 客户 + */ + public List SelectList(CustomerQuery query, Pageable page); + + /** + * 新增客户 + * + * @param customer 客户 + * @return 结果 + */ + public int Insert(WmsCustomer customer); + + /** + * 修改客户 + * + * @param customer 客户 + * @return 结果 + */ + public int Update(WmsCustomer customer); + + /** + * 批量删除客户 + * + * @param ids 需要删除的客户主键 + * @return 结果 + */ + public int DeleteByIds(long[] ids); + + /** + * 删除客户信息 + * + * @param id 客户主键 + * @return 结果 + */ + public int DeleteById(long id); + } +} diff --git a/ZR.Service/mes/wms/IService/ICustomerTransactionService.cs b/ZR.Service/mes/wms/IService/ICustomerTransactionService.cs new file mode 100644 index 00000000..b5dd4568 --- /dev/null +++ b/ZR.Service/mes/wms/IService/ICustomerTransactionService.cs @@ -0,0 +1,58 @@ +using ZR.Model.MES.wms; +using ZR.Model.MES.wms.POJO.DTO; +using ZR.Model.MES.wms.POJO.query; + +namespace ZR.Service.mes.wms.IService +{ + public interface ICustomerTransactionService + { + /** + * 查询客户账户流水 + * + * @param id 客户账户流水主键 + * @return 客户账户流水 + */ + public WmsCustomerTransaction SelectById(int id); + + /** + * 查询客户账户流水列表 + * + * @param query 查询条件 + * @param page 分页条件 + * @return 客户账户流水 + */ + public List SelectList(CustomerTransactionQuery query, Pageable page); + + /** + * 新增客户账户流水 + * + * @param WmsCustomerTransaction 客户账户流水 + * @return 结果 + */ + public int Insert(WmsCustomerTransaction WmsCustomerTransaction); + + /** + * 修改客户账户流水 + * + * @param WmsCustomerTransaction 客户账户流水 + * @return 结果 + */ + public int Update(WmsCustomerTransaction WmsCustomerTransaction); + + /** + * 批量删除客户账户流水 + * + * @param ids 需要删除的客户账户流水主键 + * @return 结果 + */ + public int DeleteByIds(int[] ids); + + /** + * 删除客户账户流水信息 + * + * @param id 客户账户流水主键 + * @return 结果 + */ + public int DeleteById(int id); + } +} diff --git a/ZR.Service/mes/wms/IService/IDeliveryService.cs b/ZR.Service/mes/wms/IService/IDeliveryService.cs new file mode 100644 index 00000000..3b5203a5 --- /dev/null +++ b/ZR.Service/mes/wms/IService/IDeliveryService.cs @@ -0,0 +1,59 @@ +using ZR.Model.MES.wms; +using ZR.Model.MES.wms.POJO.DTO; +using ZR.Model.MES.wms.POJO.query; + +namespace ZR.Service.mes.wms.IService +{ + public interface IDeliveryService + { + + /** + * 查询发货记录 + * + * @param id 发货记录主键 + * @return 发货记录 + */ + public WmsDelivery SelectById(long id); + + /** + * 查询发货记录列表 + * + * @param query 查询条件 + * @param page 分页条件 + * @return 发货记录 + */ + public List SelectList(DeliveryQuery query, Pageable page); + + /** + * 新增发货记录 + * + * @param WmsDelivery 发货记录 + * @return 结果 + */ + public int Insert(WmsDelivery WmsDelivery); + + /** + * 修改发货记录 + * + * @param WmsDelivery 发货记录 + * @return 结果 + */ + public int Update(WmsDelivery WmsDelivery); + + /** + * 批量删除发货记录 + * + * @param ids 需要删除的发货记录主键 + * @return 结果 + */ + public int DeleteByIds(long[] ids); + + /** + * 删除发货记录信息 + * + * @param id 发货记录主键 + * @return 结果 + */ + public int DeleteById(long id); + } +} diff --git a/ZR.Service/mes/wms/IService/IInventoryCheckDetailService.cs b/ZR.Service/mes/wms/IService/IInventoryCheckDetailService.cs new file mode 100644 index 00000000..a6f3a1d0 --- /dev/null +++ b/ZR.Service/mes/wms/IService/IInventoryCheckDetailService.cs @@ -0,0 +1,63 @@ +using ZR.Model.MES.wms; +using ZR.Model.MES.wms.POJO.DTO; +using ZR.Model.MES.wms.POJO.query; +using ZR.Model.MES.wms.POJO.VO; + +namespace ZR.Service.mes.wms.IService +{ + public interface IInventoryCheckDetailService + { + + /** + * 查询库存盘点单据详情 + * + * @param id 库存盘点单据详情主键 + * @return 库存盘点单据详情 + */ + public WmsInventoryCheckDetail SelectById(long id); + + public List ToVos(List items); + + /** + * 查询库存盘点单据详情列表 + * + * @param query 查询条件 + * @param page 分页条件 + * @return 库存盘点单据详情 + */ + public List SelectList(InventoryCheckDetailQuery query, Pageable page); + + /** + * 新增库存盘点单据详情 + * + * @param WmsInventoryCheckDetail 库存盘点单据详情 + * @return 结果 + */ + public int Insert(WmsInventoryCheckDetail WmsInventoryCheckDetail); + + /** + * 修改库存盘点单据详情 + * + * @param WmsInventoryCheckDetail 库存盘点单据详情 + * @return 结果 + */ + public int Update(WmsInventoryCheckDetail WmsInventoryCheckDetail); + + /** + * 批量删除库存盘点单据详情 + * + * @param ids 需要删除的库存盘点单据详情主键 + * @return 结果 + */ + public int DeleteByIds(long[] ids); + /** + * 删除库存盘点单据详情信息 + * + * @param id 库存盘点单据详情主键 + * @return 结果 + */ + public int DeleteById(long id); + + public WmsInventoryHistory Vo2InventoryHistory(InventoryCheckDetailVO it); + } +} diff --git a/ZR.Service/mes/wms/IService/IInventoryCheckService.cs b/ZR.Service/mes/wms/IService/IInventoryCheckService.cs new file mode 100644 index 00000000..11b72910 --- /dev/null +++ b/ZR.Service/mes/wms/IService/IInventoryCheckService.cs @@ -0,0 +1,68 @@ +using ZR.Model.MES.wms; +using ZR.Model.MES.wms.POJO.DTO; +using ZR.Model.MES.wms.POJO.query; +using ZR.Model.MES.wms.POJO.VO.form; + +namespace ZR.Service.mes.wms.IService +{ + public interface IInventoryCheckService + { + /** + * 查询库存盘点单据 + * + * @param id 库存盘点单据主键 + * @return 库存盘点单据 + */ + public InventoryCheckFrom SelectById(long id); + /** + * 查询库存盘点单据列表 + * + * @param query 查询条件 + * @param page 分页条件 + * @return 库存盘点单据 + */ + public List SelectList(InventoryCheckQuery query, Pageable page); + + /** + * 新增库存盘点单据 + * + * @param WmsInventoryCheck 库存盘点单据 + * @return 结果 + */ + public int Insert(WmsInventoryCheck WmsInventoryCheck); + + /** + * 修改库存盘点单据 + * + * @param WmsInventoryCheck 库存盘点单据 + * @return 结果 + */ + public int Update(WmsInventoryCheck WmsInventoryCheck); + + /** + * 批量删除库存盘点单据 + * + * @param ids 需要删除的库存盘点单据主键 + * @return 结果 + */ + public int DeleteByIds(long[] ids); + + /** + * 删除库存盘点单据信息 + * + * @param id 库存盘点单据主键 + * @return 结果 + */ + public int DeleteById(long id); + + /** + * 新增或更新盘点单据以及盘点单据明细 + * + * @param WmsInventoryCheckFrom 盘点单据 + * @return 结果 + */ + // @Transactional + public int AddOrUpdate(InventoryCheckFrom WmsInventoryCheckFrom); + + } +} diff --git a/ZR.Service/mes/wms/IService/IInventoryHistoryService.cs b/ZR.Service/mes/wms/IService/IInventoryHistoryService.cs new file mode 100644 index 00000000..ebd52a38 --- /dev/null +++ b/ZR.Service/mes/wms/IService/IInventoryHistoryService.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ZR.Service.mes.wms.IService +{ + internal interface IInventoryHistoryService + { + } +} diff --git a/ZR.Service/mes/wms/IService/IInventoryMovementDetailService.cs b/ZR.Service/mes/wms/IService/IInventoryMovementDetailService.cs new file mode 100644 index 00000000..ea29d5c8 --- /dev/null +++ b/ZR.Service/mes/wms/IService/IInventoryMovementDetailService.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ZR.Service.mes.wms.IService +{ + internal interface IInventoryMovementDetailService + { + } +} diff --git a/ZR.Service/mes/wms/IService/IInventoryMovementService.cs b/ZR.Service/mes/wms/IService/IInventoryMovementService.cs new file mode 100644 index 00000000..4c0d7508 --- /dev/null +++ b/ZR.Service/mes/wms/IService/IInventoryMovementService.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ZR.Service.mes.wms.IService +{ + internal interface IInventoryMovementService + { + } +} diff --git a/ZR.Service/mes/wms/IService/IInventoryService.cs b/ZR.Service/mes/wms/IService/IInventoryService.cs new file mode 100644 index 00000000..795cfcaf --- /dev/null +++ b/ZR.Service/mes/wms/IService/IInventoryService.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ZR.Service.mes.wms.IService +{ + internal interface IInventoryService + { + } +} diff --git a/ZR.Service/mes/wms/IService/IInventorySettlementDetailService.cs b/ZR.Service/mes/wms/IService/IInventorySettlementDetailService.cs new file mode 100644 index 00000000..59a7490d --- /dev/null +++ b/ZR.Service/mes/wms/IService/IInventorySettlementDetailService.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ZR.Service.mes.wms.IService +{ + internal interface IInventorySettlementDetailService + { + } +} diff --git a/ZR.Service/mes/wms/IService/IInventorySettlementService.cs b/ZR.Service/mes/wms/IService/IInventorySettlementService.cs new file mode 100644 index 00000000..e62eda63 --- /dev/null +++ b/ZR.Service/mes/wms/IService/IInventorySettlementService.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ZR.Service.mes.wms.IService +{ + internal interface IInventorySettlementService + { + } +} diff --git a/ZR.Service/mes/wms/IService/IItemService.cs b/ZR.Service/mes/wms/IService/IItemService.cs new file mode 100644 index 00000000..c3eb046a --- /dev/null +++ b/ZR.Service/mes/wms/IService/IItemService.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ZR.Service.mes.wms.IService +{ + internal interface IItemService + { + } +} diff --git a/ZR.Service/mes/wms/IService/IItemTypeService.cs b/ZR.Service/mes/wms/IService/IItemTypeService.cs new file mode 100644 index 00000000..7817c314 --- /dev/null +++ b/ZR.Service/mes/wms/IService/IItemTypeService.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ZR.Service.mes.wms.IService +{ + internal interface IItemTypeService + { + } +} diff --git a/ZR.Service/mes/wms/IService/IRackService.cs b/ZR.Service/mes/wms/IService/IRackService.cs new file mode 100644 index 00000000..51c8cffe --- /dev/null +++ b/ZR.Service/mes/wms/IService/IRackService.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ZR.Service.mes.wms.IService +{ + internal interface IRackService + { + } +} diff --git a/ZR.Service/mes/wms/IService/IReceiptOrderDetailService.cs b/ZR.Service/mes/wms/IService/IReceiptOrderDetailService.cs new file mode 100644 index 00000000..0804ce43 --- /dev/null +++ b/ZR.Service/mes/wms/IService/IReceiptOrderDetailService.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ZR.Service.mes.wms.IService +{ + internal interface IReceiptOrderDetailService + { + } +} diff --git a/ZR.Service/mes/wms/IService/IReceiptOrderService.cs b/ZR.Service/mes/wms/IService/IReceiptOrderService.cs new file mode 100644 index 00000000..7bf8222b --- /dev/null +++ b/ZR.Service/mes/wms/IService/IReceiptOrderService.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ZR.Service.mes.wms.IService +{ + internal interface IReceiptOrderService + { + } +} diff --git a/ZR.Service/mes/wms/IService/IShipmentOrderDetailService.cs b/ZR.Service/mes/wms/IService/IShipmentOrderDetailService.cs new file mode 100644 index 00000000..4795a6f2 --- /dev/null +++ b/ZR.Service/mes/wms/IService/IShipmentOrderDetailService.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ZR.Service.mes.wms.IService +{ + internal interface IShipmentOrderDetailService + { + } +} diff --git a/ZR.Service/mes/wms/IService/IShipmentOrderService.cs b/ZR.Service/mes/wms/IService/IShipmentOrderService.cs new file mode 100644 index 00000000..f8b2ca05 --- /dev/null +++ b/ZR.Service/mes/wms/IService/IShipmentOrderService.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ZR.Service.mes.wms.IService +{ + internal interface IShipmentOrderService + { + } +} diff --git a/ZR.Service/mes/wms/IService/ISupplierService.cs b/ZR.Service/mes/wms/IService/ISupplierService.cs new file mode 100644 index 00000000..491b6c5d --- /dev/null +++ b/ZR.Service/mes/wms/IService/ISupplierService.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ZR.Service.mes.wms.IService +{ + internal interface ISupplierService + { + } +} diff --git a/ZR.Service/mes/wms/IService/ISupplierTransactionService.cs b/ZR.Service/mes/wms/IService/ISupplierTransactionService.cs new file mode 100644 index 00000000..830c0ed6 --- /dev/null +++ b/ZR.Service/mes/wms/IService/ISupplierTransactionService.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ZR.Service.mes.wms.IService +{ + internal interface ISupplierTransactionService + { + } +} diff --git a/ZR.Service/mes/wms/IService/IWarehouseService.cs b/ZR.Service/mes/wms/IService/IWarehouseService.cs new file mode 100644 index 00000000..b8f977cc --- /dev/null +++ b/ZR.Service/mes/wms/IService/IWarehouseService.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ZR.Service.mes.wms.IService +{ + internal interface IWarehouseService + { + } +} diff --git a/ZR.Service/mes/wms/IService/IWaveForReceiptService.cs b/ZR.Service/mes/wms/IService/IWaveForReceiptService.cs new file mode 100644 index 00000000..f8bf2c41 --- /dev/null +++ b/ZR.Service/mes/wms/IService/IWaveForReceiptService.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ZR.Service.mes.wms.IService +{ + internal interface IWaveForReceiptService + { + } +} diff --git a/ZR.Service/mes/wms/IService/IWaveService.cs b/ZR.Service/mes/wms/IService/IWaveService.cs new file mode 100644 index 00000000..fce35ce7 --- /dev/null +++ b/ZR.Service/mes/wms/IService/IWaveService.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ZR.Service.mes.wms.IService +{ + internal interface IWaveService + { + } +}