From 121c888a6b574b4464452cd3189f359b828b19b4 Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Fri, 29 Mar 2024 09:13:17 +0800 Subject: [PATCH] WMS:AGV:init --- .../Controllers/mes/wms/AreaController.cs | 83 ----------- .../Controllers/mes/wms/RackController.cs | 83 ----------- .../Controllers/mes/wms/WmAGVController.cs | 65 +++++++++ ZR.Model/MES/wms/AgvConfig.cs | 62 ++++++++ ZR.Model/MES/wms/AgvLocation.cs | 60 ++++++++ ZR.Model/MES/wms/AgvTask.cs | 85 +++++++++++ ZR.Model/MES/wms/Dto/AGVtaskDto.cs | 72 ++++++++++ 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 --------- 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 -- ZR.Service/mes/wms/IService/IWmAGVService.cs | 18 +++ .../mes/wms/IService/IWmCustomService.cs | 1 - ZR.Service/mes/wms/WmAGVService.cs | 56 ++++++++ 88 files changed, 418 insertions(+), 3733 deletions(-) delete mode 100644 ZR.Admin.WebApi/Controllers/mes/wms/AreaController.cs delete mode 100644 ZR.Admin.WebApi/Controllers/mes/wms/RackController.cs create mode 100644 ZR.Admin.WebApi/Controllers/mes/wms/WmAGVController.cs create mode 100644 ZR.Model/MES/wms/AgvConfig.cs create mode 100644 ZR.Model/MES/wms/AgvLocation.cs create mode 100644 ZR.Model/MES/wms/AgvTask.cs create mode 100644 ZR.Model/MES/wms/Dto/AGVtaskDto.cs delete mode 100644 ZR.Model/MES/wms/POJO/DTO/Pageable.cs delete mode 100644 ZR.Model/MES/wms/POJO/VO/BaseAudit.cs delete mode 100644 ZR.Model/MES/wms/POJO/VO/InventoryCheckDetailVO.cs delete mode 100644 ZR.Model/MES/wms/POJO/VO/ItemVO.cs delete mode 100644 ZR.Model/MES/wms/POJO/VO/form/InventoryCheckFrom.cs delete mode 100644 ZR.Model/MES/wms/POJO/query/AreaQuery.cs delete mode 100644 ZR.Model/MES/wms/POJO/query/CarrierQuery.cs delete mode 100644 ZR.Model/MES/wms/POJO/query/CustomerQuery.cs delete mode 100644 ZR.Model/MES/wms/POJO/query/CustomerTransactionQuery.cs delete mode 100644 ZR.Model/MES/wms/POJO/query/DeliveryQuery.cs delete mode 100644 ZR.Model/MES/wms/POJO/query/InventoryCheckDetailQuery.cs delete mode 100644 ZR.Model/MES/wms/POJO/query/InventoryCheckQuery.cs delete mode 100644 ZR.Model/MES/wms/POJO/query/InventoryHistoryQuery.cs delete mode 100644 ZR.Model/MES/wms/POJO/query/InventoryMovementDetailQuery.cs delete mode 100644 ZR.Model/MES/wms/POJO/query/InventoryMovementQuery.cs delete mode 100644 ZR.Model/MES/wms/POJO/query/InventoryQuery.cs delete mode 100644 ZR.Model/MES/wms/POJO/query/InventorySettlementDetailQuery.cs delete mode 100644 ZR.Model/MES/wms/POJO/query/InventorySettlementQuery.cs delete mode 100644 ZR.Model/MES/wms/POJO/query/ItemQuery.cs delete mode 100644 ZR.Model/MES/wms/POJO/query/ItemTypeQuery.cs delete mode 100644 ZR.Model/MES/wms/POJO/query/RackQuery.cs delete mode 100644 ZR.Model/MES/wms/POJO/query/ReceiptOrderDetailQuery.cs delete mode 100644 ZR.Model/MES/wms/POJO/query/ReceiptOrderQuery.cs delete mode 100644 ZR.Model/MES/wms/POJO/query/ShipmentOrderDetailQuery.cs delete mode 100644 ZR.Model/MES/wms/POJO/query/ShipmentOrderQuery.cs delete mode 100644 ZR.Model/MES/wms/POJO/query/SupplierQuery.cs delete mode 100644 ZR.Model/MES/wms/POJO/query/SupplierTransactionQuery.cs delete mode 100644 ZR.Model/MES/wms/POJO/query/WarehouseQuery.cs delete mode 100644 ZR.Model/MES/wms/POJO/query/WaveQuery.cs delete mode 100644 ZR.Model/MES/wms/WmsArea.cs delete mode 100644 ZR.Model/MES/wms/WmsCarrier.cs delete mode 100644 ZR.Model/MES/wms/WmsCustomer.cs delete mode 100644 ZR.Model/MES/wms/WmsCustomerTransaction.cs delete mode 100644 ZR.Model/MES/wms/WmsDelivery.cs delete mode 100644 ZR.Model/MES/wms/WmsInventory.cs delete mode 100644 ZR.Model/MES/wms/WmsInventoryCheck.cs delete mode 100644 ZR.Model/MES/wms/WmsInventoryCheckDetail.cs delete mode 100644 ZR.Model/MES/wms/WmsInventoryHistory.cs delete mode 100644 ZR.Model/MES/wms/WmsInventoryMovement.cs delete mode 100644 ZR.Model/MES/wms/WmsInventoryMovementDetail.cs delete mode 100644 ZR.Model/MES/wms/WmsInventorySettlement.cs delete mode 100644 ZR.Model/MES/wms/WmsInventorySettlementDetail.cs delete mode 100644 ZR.Model/MES/wms/WmsItem.cs delete mode 100644 ZR.Model/MES/wms/WmsItemType.cs delete mode 100644 ZR.Model/MES/wms/WmsRack.cs delete mode 100644 ZR.Model/MES/wms/WmsReceiptOrder.cs delete mode 100644 ZR.Model/MES/wms/WmsReceiptOrderDetail.cs delete mode 100644 ZR.Model/MES/wms/WmsShipmentOrder.cs delete mode 100644 ZR.Model/MES/wms/WmsShipmentOrderDetail.cs delete mode 100644 ZR.Model/MES/wms/WmsSupplier.cs delete mode 100644 ZR.Model/MES/wms/WmsSupplierTransaction.cs delete mode 100644 ZR.Model/MES/wms/WmsWarehouse.cs delete mode 100644 ZR.Model/MES/wms/WmsWave.cs delete mode 100644 ZR.Service/mes/wms/IService/IAreaService.cs delete mode 100644 ZR.Service/mes/wms/IService/ICarrierService.cs delete mode 100644 ZR.Service/mes/wms/IService/ICustomerService.cs delete mode 100644 ZR.Service/mes/wms/IService/ICustomerTransactionService.cs delete mode 100644 ZR.Service/mes/wms/IService/IDeliveryService.cs delete mode 100644 ZR.Service/mes/wms/IService/IInventoryCheckDetailService.cs delete mode 100644 ZR.Service/mes/wms/IService/IInventoryCheckService.cs delete mode 100644 ZR.Service/mes/wms/IService/IInventoryHistoryService.cs delete mode 100644 ZR.Service/mes/wms/IService/IInventoryMovementDetailService.cs delete mode 100644 ZR.Service/mes/wms/IService/IInventoryMovementService.cs delete mode 100644 ZR.Service/mes/wms/IService/IInventoryService.cs delete mode 100644 ZR.Service/mes/wms/IService/IInventorySettlementDetailService.cs delete mode 100644 ZR.Service/mes/wms/IService/IInventorySettlementService.cs delete mode 100644 ZR.Service/mes/wms/IService/IItemService.cs delete mode 100644 ZR.Service/mes/wms/IService/IItemTypeService.cs delete mode 100644 ZR.Service/mes/wms/IService/IRackService.cs delete mode 100644 ZR.Service/mes/wms/IService/IReceiptOrderDetailService.cs delete mode 100644 ZR.Service/mes/wms/IService/IReceiptOrderService.cs delete mode 100644 ZR.Service/mes/wms/IService/IShipmentOrderDetailService.cs delete mode 100644 ZR.Service/mes/wms/IService/IShipmentOrderService.cs delete mode 100644 ZR.Service/mes/wms/IService/ISupplierService.cs delete mode 100644 ZR.Service/mes/wms/IService/ISupplierTransactionService.cs delete mode 100644 ZR.Service/mes/wms/IService/IWarehouseService.cs delete mode 100644 ZR.Service/mes/wms/IService/IWaveForReceiptService.cs delete mode 100644 ZR.Service/mes/wms/IService/IWaveService.cs create mode 100644 ZR.Service/mes/wms/IService/IWmAGVService.cs create mode 100644 ZR.Service/mes/wms/WmAGVService.cs diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/AreaController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/AreaController.cs deleted file mode 100644 index 9ab0717d..00000000 --- a/ZR.Admin.WebApi/Controllers/mes/wms/AreaController.cs +++ /dev/null @@ -1,83 +0,0 @@ -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 deleted file mode 100644 index fcbbb6ad..00000000 --- a/ZR.Admin.WebApi/Controllers/mes/wms/RackController.cs +++ /dev/null @@ -1,83 +0,0 @@ -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.Admin.WebApi/Controllers/mes/wms/WmAGVController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmAGVController.cs new file mode 100644 index 00000000..fcb4f05e --- /dev/null +++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmAGVController.cs @@ -0,0 +1,65 @@ +using Microsoft.AspNetCore.Mvc; +using ZR.Admin.WebApi.Extensions; +using ZR.Admin.WebApi.Filters; +using ZR.Model.MES.wms; +using ZR.Model.MES.wms.Dto; +using ZR.Service.Business.IBusinessService; +using ZR.Service.mes.wms; +using ZR.Service.mes.wms.IService; + + +namespace ZR.Admin.WebApi.Controllers +{ + /// + /// agv 相关接口 + /// + + [Route("/mes/wm/agv")] + public class WmAGVController : BaseController + { + private readonly IWmAGVService _WmAGVService; + public WmAGVController(IWmAGVService wmAGVService) + { + _WmAGVService = wmAGVService; + } + + + /// + /// 1. 获取工单 + /// + /// + /// + + [HttpGet("get_workorder_list")] + public IActionResult QueryWmAGV_list([FromQuery] QueryAGVparam parm) + { + if(parm == null) + { + return SUCCESS(null); + } + var response = _WmAGVService.GetList(parm); + return SUCCESS(response); + } + + /// + /// 2.获取当前工单下的所有AGV小车任务 + /// + /// + /// + [HttpGet("GetTask")] + public IActionResult QueryAGVTask(string workorder_id) + { + if(string.IsNullOrEmpty(workorder_id)) + { + return SUCCESS(null); + } + + var response= _WmAGVService.QueryAGVTask(workorder_id); + return SUCCESS(response); + } + + + + + } +} diff --git a/ZR.Model/MES/wms/AgvConfig.cs b/ZR.Model/MES/wms/AgvConfig.cs new file mode 100644 index 00000000..25bb10a8 --- /dev/null +++ b/ZR.Model/MES/wms/AgvConfig.cs @@ -0,0 +1,62 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using SqlSugar; + +namespace ZR.Model.MES.wms +{ + /// + /// AGV配置 + /// + [SugarTable("agv_config")] + public class AgvConfig + { + /// + /// Id + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// agv名称 + /// + [SugarColumn(ColumnName = "agv_name")] + public string AgvName { get; set; } + + /// + /// agv编号 + /// + [SugarColumn(ColumnName = "agv_code")] + public string AgvCode { get; set; } + + /// + /// 功能 + /// + public string Function { get; set; } + + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "cREATED_BY")] + public string CreatedBy { get; set; } + + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "cREATED_TIME")] + public DateTime? CreatedTime { get; set; } + + /// + /// 更新人 + /// + [SugarColumn(ColumnName = "uPDATED_BY")] + public string UpdatedBy { get; set; } + + /// + /// 更新时间 + /// + [SugarColumn(ColumnName = "uPDATED_TIME")] + public DateTime? UpdatedTime { get; set; } + + } +} \ No newline at end of file diff --git a/ZR.Model/MES/wms/AgvLocation.cs b/ZR.Model/MES/wms/AgvLocation.cs new file mode 100644 index 00000000..70596d53 --- /dev/null +++ b/ZR.Model/MES/wms/AgvLocation.cs @@ -0,0 +1,60 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using SqlSugar; + +namespace ZR.Model.MES.wms +{ + /// + /// agv位置表 + /// + [SugarTable("agv_location")] + public class AgvLocation + { + /// + /// Id + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 区域 + /// + public string Area { get; set; } + + /// + /// 类型（0: 起点，1：终点） + /// + public int? Type { get; set; } + + /// + /// 坐标 + /// + public string Coordinate { get; set; } + + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "cREATED_BY")] + public string CreatedBy { get; set; } + + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "cREATED_TIME")] + public DateTime? CreatedTime { get; set; } + + /// + /// 更新人 + /// + [SugarColumn(ColumnName = "uPDATED_BY")] + public string UpdatedBy { get; set; } + + /// + /// 更新时间 + /// + [SugarColumn(ColumnName = "uPDATED_TIME")] + public DateTime? UpdatedTime { get; set; } + + } +} \ No newline at end of file diff --git a/ZR.Model/MES/wms/AgvTask.cs b/ZR.Model/MES/wms/AgvTask.cs new file mode 100644 index 00000000..d5008bcc --- /dev/null +++ b/ZR.Model/MES/wms/AgvTask.cs @@ -0,0 +1,85 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using SqlSugar; + +namespace ZR.Model.MES.wms +{ + /// + /// agv任务 + /// + [SugarTable("agv_task")] + public class AgvTask + { + /// + /// 主键 雪花 + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = false)] + public string Id { get; set; } + + /// + /// 工单id + /// + [SugarColumn(ColumnName = "fk_workorder_id")] + public string FkWorkorderId { get; set; } + + /// + /// 序号（一个工单下的序号） + /// + public int? Sort { get; set; } + + /// + /// 上料起点 + /// + [SugarColumn(ColumnName = "go_start_point")] + public string GoStartPoint { get; set; } + + /// + /// 上料终点 + /// + [SugarColumn(ColumnName = "go_end_point")] + public string GoEndPoint { get; set; } + + /// + /// 数量 + /// + public int? Number { get; set; } + + /// + /// 返回起点 + /// + [SugarColumn(ColumnName = "back_start_point")] + public string BackStartPoint { get; set; } + + /// + /// 返回终点 + /// + [SugarColumn(ColumnName = "back_end_point")] + public string BackEndPoint { get; set; } + + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "cREATED_BY")] + public string CreatedBy { get; set; } + + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "cREATED_TIME")] + public DateTime? CreatedTime { get; set; } + + /// + /// 更新人 + /// + [SugarColumn(ColumnName = "uPDATED_BY")] + public string UpdatedBy { get; set; } + + /// + /// 更新时间 + /// + [SugarColumn(ColumnName = "uPDATED_TIME")] + public DateTime? UpdatedTime { get; set; } + + } +} \ No newline at end of file diff --git a/ZR.Model/MES/wms/Dto/AGVtaskDto.cs b/ZR.Model/MES/wms/Dto/AGVtaskDto.cs new file mode 100644 index 00000000..e6b5bd69 --- /dev/null +++ b/ZR.Model/MES/wms/Dto/AGVtaskDto.cs @@ -0,0 +1,72 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ZR.Model.MES.wms.Dto +{ + public class AGVtaskDto + { + + + } + /// + /// 查询参数 + /// + public class QueryAGVparam + { + public int year { get; set; } + public int week { get; set; } + public int day { get; set; } + public int status { get; set; } + } + /// + /// 工单 + /// + public class AGVWorkorderDto + { + /// + /// 工单id + /// + public string Id { get; set; } + + /// + /// 毛坯号 + /// + public string BlankNumber { get; set; } + + /// + /// 产品描述 + /// + public string ProductDescription { get; set; } + + /// + /// 颜色 + /// + public string Colour { get; set; } + + /// + /// 规格 + /// + public string Specifications { get; set; } + + /// + /// 编码号 + /// + public int CodeNumber { get; set; } + + /// + /// 上件总数 + /// + public int PreviousNumber { get; set; } + + /// + /// 未上件数 + /// + public int NoPreviousNumber { get; set; } + + + + } +} diff --git a/ZR.Model/MES/wms/POJO/DTO/Pageable.cs b/ZR.Model/MES/wms/POJO/DTO/Pageable.cs deleted file mode 100644 index dd937485..00000000 --- a/ZR.Model/MES/wms/POJO/DTO/Pageable.cs +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index d9f1e70e..00000000 --- a/ZR.Model/MES/wms/POJO/VO/BaseAudit.cs +++ /dev/null @@ -1,27 +0,0 @@ -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 deleted file mode 100644 index fc63334e..00000000 --- a/ZR.Model/MES/wms/POJO/VO/InventoryCheckDetailVO.cs +++ /dev/null @@ -1,34 +0,0 @@ -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 deleted file mode 100644 index 2d14772c..00000000 --- a/ZR.Model/MES/wms/POJO/VO/ItemVO.cs +++ /dev/null @@ -1,49 +0,0 @@ -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 deleted file mode 100644 index 8e35bd81..00000000 --- a/ZR.Model/MES/wms/POJO/VO/form/InventoryCheckFrom.cs +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index b3afbf4e..00000000 --- a/ZR.Model/MES/wms/POJO/query/AreaQuery.cs +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index d08a48ef..00000000 --- a/ZR.Model/MES/wms/POJO/query/CarrierQuery.cs +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index 3e043195..00000000 --- a/ZR.Model/MES/wms/POJO/query/CustomerQuery.cs +++ /dev/null @@ -1,38 +0,0 @@ -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 deleted file mode 100644 index 7eae747c..00000000 --- a/ZR.Model/MES/wms/POJO/query/CustomerTransactionQuery.cs +++ /dev/null @@ -1,35 +0,0 @@ -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 deleted file mode 100644 index ff93f742..00000000 --- a/ZR.Model/MES/wms/POJO/query/DeliveryQuery.cs +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index 0fa5b692..00000000 --- a/ZR.Model/MES/wms/POJO/query/InventoryCheckDetailQuery.cs +++ /dev/null @@ -1,27 +0,0 @@ -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 deleted file mode 100644 index 66681b47..00000000 --- a/ZR.Model/MES/wms/POJO/query/InventoryCheckQuery.cs +++ /dev/null @@ -1,39 +0,0 @@ -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 deleted file mode 100644 index 248cbb1d..00000000 --- a/ZR.Model/MES/wms/POJO/query/InventoryHistoryQuery.cs +++ /dev/null @@ -1,23 +0,0 @@ -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 deleted file mode 100644 index e42bf85a..00000000 --- a/ZR.Model/MES/wms/POJO/query/InventoryMovementDetailQuery.cs +++ /dev/null @@ -1,39 +0,0 @@ -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 deleted file mode 100644 index 82be023b..00000000 --- a/ZR.Model/MES/wms/POJO/query/InventoryMovementQuery.cs +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index e7868c36..00000000 --- a/ZR.Model/MES/wms/POJO/query/InventoryQuery.cs +++ /dev/null @@ -1,26 +0,0 @@ -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 deleted file mode 100644 index f242f824..00000000 --- a/ZR.Model/MES/wms/POJO/query/InventorySettlementDetailQuery.cs +++ /dev/null @@ -1,64 +0,0 @@ -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 deleted file mode 100644 index 4d179017..00000000 --- a/ZR.Model/MES/wms/POJO/query/InventorySettlementQuery.cs +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 0f25ef23..00000000 --- a/ZR.Model/MES/wms/POJO/query/ItemQuery.cs +++ /dev/null @@ -1,36 +0,0 @@ -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 deleted file mode 100644 index 369e80c7..00000000 --- a/ZR.Model/MES/wms/POJO/query/ItemTypeQuery.cs +++ /dev/null @@ -1,21 +0,0 @@ -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 deleted file mode 100644 index 0d360daa..00000000 --- a/ZR.Model/MES/wms/POJO/query/RackQuery.cs +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index 42d85782..00000000 --- a/ZR.Model/MES/wms/POJO/query/ReceiptOrderDetailQuery.cs +++ /dev/null @@ -1,30 +0,0 @@ -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 deleted file mode 100644 index 94a963cb..00000000 --- a/ZR.Model/MES/wms/POJO/query/ReceiptOrderQuery.cs +++ /dev/null @@ -1,21 +0,0 @@ -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 deleted file mode 100644 index 57912d4d..00000000 --- a/ZR.Model/MES/wms/POJO/query/ShipmentOrderDetailQuery.cs +++ /dev/null @@ -1,21 +0,0 @@ -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 deleted file mode 100644 index dda3bd87..00000000 --- a/ZR.Model/MES/wms/POJO/query/ShipmentOrderQuery.cs +++ /dev/null @@ -1,21 +0,0 @@ -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 deleted file mode 100644 index 4564f909..00000000 --- a/ZR.Model/MES/wms/POJO/query/SupplierQuery.cs +++ /dev/null @@ -1,30 +0,0 @@ -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 deleted file mode 100644 index dbe0b061..00000000 --- a/ZR.Model/MES/wms/POJO/query/SupplierTransactionQuery.cs +++ /dev/null @@ -1,35 +0,0 @@ -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 deleted file mode 100644 index 5411d517..00000000 --- a/ZR.Model/MES/wms/POJO/query/WarehouseQuery.cs +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 39f4167b..00000000 --- a/ZR.Model/MES/wms/POJO/query/WaveQuery.cs +++ /dev/null @@ -1,14 +0,0 @@ -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 deleted file mode 100644 index 9f9011eb..00000000 --- a/ZR.Model/MES/wms/WmsArea.cs +++ /dev/null @@ -1,65 +0,0 @@ -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 deleted file mode 100644 index 34b591b3..00000000 --- a/ZR.Model/MES/wms/WmsCarrier.cs +++ /dev/null @@ -1,93 +0,0 @@ -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 deleted file mode 100644 index ee1e4e33..00000000 --- a/ZR.Model/MES/wms/WmsCustomer.cs +++ /dev/null @@ -1,109 +0,0 @@ -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 deleted file mode 100644 index 880ffab4..00000000 --- a/ZR.Model/MES/wms/WmsCustomerTransaction.cs +++ /dev/null @@ -1,76 +0,0 @@ -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 deleted file mode 100644 index ea41f087..00000000 --- a/ZR.Model/MES/wms/WmsDelivery.cs +++ /dev/null @@ -1,72 +0,0 @@ -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 deleted file mode 100644 index c522fdf4..00000000 --- a/ZR.Model/MES/wms/WmsInventory.cs +++ /dev/null @@ -1,77 +0,0 @@ -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 deleted file mode 100644 index b387f12a..00000000 --- a/ZR.Model/MES/wms/WmsInventoryCheck.cs +++ /dev/null @@ -1,108 +0,0 @@ -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 deleted file mode 100644 index dcee8b97..00000000 --- a/ZR.Model/MES/wms/WmsInventoryCheckDetail.cs +++ /dev/null @@ -1,87 +0,0 @@ -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 deleted file mode 100644 index a158d754..00000000 --- a/ZR.Model/MES/wms/WmsInventoryHistory.cs +++ /dev/null @@ -1,87 +0,0 @@ -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 deleted file mode 100644 index 27c6bbfb..00000000 --- a/ZR.Model/MES/wms/WmsInventoryMovement.cs +++ /dev/null @@ -1,87 +0,0 @@ -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 deleted file mode 100644 index 59a322f8..00000000 --- a/ZR.Model/MES/wms/WmsInventoryMovementDetail.cs +++ /dev/null @@ -1,107 +0,0 @@ -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 deleted file mode 100644 index d3e0a17f..00000000 --- a/ZR.Model/MES/wms/WmsInventorySettlement.cs +++ /dev/null @@ -1,78 +0,0 @@ -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 deleted file mode 100644 index d77eaa52..00000000 --- a/ZR.Model/MES/wms/WmsInventorySettlementDetail.cs +++ /dev/null @@ -1,132 +0,0 @@ -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 deleted file mode 100644 index 3e00c82b..00000000 --- a/ZR.Model/MES/wms/WmsItem.cs +++ /dev/null @@ -1,117 +0,0 @@ -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 deleted file mode 100644 index 94d3c7bc..00000000 --- a/ZR.Model/MES/wms/WmsItemType.cs +++ /dev/null @@ -1,77 +0,0 @@ -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 deleted file mode 100644 index 26bc4605..00000000 --- a/ZR.Model/MES/wms/WmsRack.cs +++ /dev/null @@ -1,72 +0,0 @@ -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 deleted file mode 100644 index e27ad0f6..00000000 --- a/ZR.Model/MES/wms/WmsReceiptOrder.cs +++ /dev/null @@ -1,87 +0,0 @@ -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 deleted file mode 100644 index ce3b42f4..00000000 --- a/ZR.Model/MES/wms/WmsReceiptOrderDetail.cs +++ /dev/null @@ -1,97 +0,0 @@ -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 deleted file mode 100644 index 676547bd..00000000 --- a/ZR.Model/MES/wms/WmsShipmentOrder.cs +++ /dev/null @@ -1,102 +0,0 @@ -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 deleted file mode 100644 index e662265e..00000000 --- a/ZR.Model/MES/wms/WmsShipmentOrderDetail.cs +++ /dev/null @@ -1,97 +0,0 @@ -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 deleted file mode 100644 index b9bb393a..00000000 --- a/ZR.Model/MES/wms/WmsSupplier.cs +++ /dev/null @@ -1,108 +0,0 @@ -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 deleted file mode 100644 index 8f6681a5..00000000 --- a/ZR.Model/MES/wms/WmsSupplierTransaction.cs +++ /dev/null @@ -1,79 +0,0 @@ -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 deleted file mode 100644 index 7ba27a65..00000000 --- a/ZR.Model/MES/wms/WmsWarehouse.cs +++ /dev/null @@ -1,62 +0,0 @@ -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 deleted file mode 100644 index a87aa990..00000000 --- a/ZR.Model/MES/wms/WmsWave.cs +++ /dev/null @@ -1,68 +0,0 @@ -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/wms/IService/IAreaService.cs b/ZR.Service/mes/wms/IService/IAreaService.cs deleted file mode 100644 index 1c02efea..00000000 --- a/ZR.Service/mes/wms/IService/IAreaService.cs +++ /dev/null @@ -1,60 +0,0 @@ -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 deleted file mode 100644 index f9ea1ec6..00000000 --- a/ZR.Service/mes/wms/IService/ICarrierService.cs +++ /dev/null @@ -1,58 +0,0 @@ -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 deleted file mode 100644 index 1fd18c58..00000000 --- a/ZR.Service/mes/wms/IService/ICustomerService.cs +++ /dev/null @@ -1,58 +0,0 @@ -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 deleted file mode 100644 index b5dd4568..00000000 --- a/ZR.Service/mes/wms/IService/ICustomerTransactionService.cs +++ /dev/null @@ -1,58 +0,0 @@ -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 deleted file mode 100644 index 3b5203a5..00000000 --- a/ZR.Service/mes/wms/IService/IDeliveryService.cs +++ /dev/null @@ -1,59 +0,0 @@ -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 deleted file mode 100644 index a6f3a1d0..00000000 --- a/ZR.Service/mes/wms/IService/IInventoryCheckDetailService.cs +++ /dev/null @@ -1,63 +0,0 @@ -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 deleted file mode 100644 index 11b72910..00000000 --- a/ZR.Service/mes/wms/IService/IInventoryCheckService.cs +++ /dev/null @@ -1,68 +0,0 @@ -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 deleted file mode 100644 index ebd52a38..00000000 --- a/ZR.Service/mes/wms/IService/IInventoryHistoryService.cs +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index ea29d5c8..00000000 --- a/ZR.Service/mes/wms/IService/IInventoryMovementDetailService.cs +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 4c0d7508..00000000 --- a/ZR.Service/mes/wms/IService/IInventoryMovementService.cs +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 795cfcaf..00000000 --- a/ZR.Service/mes/wms/IService/IInventoryService.cs +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 59a7490d..00000000 --- a/ZR.Service/mes/wms/IService/IInventorySettlementDetailService.cs +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index e62eda63..00000000 --- a/ZR.Service/mes/wms/IService/IInventorySettlementService.cs +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index c3eb046a..00000000 --- a/ZR.Service/mes/wms/IService/IItemService.cs +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 7817c314..00000000 --- a/ZR.Service/mes/wms/IService/IItemTypeService.cs +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 51c8cffe..00000000 --- a/ZR.Service/mes/wms/IService/IRackService.cs +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 0804ce43..00000000 --- a/ZR.Service/mes/wms/IService/IReceiptOrderDetailService.cs +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 7bf8222b..00000000 --- a/ZR.Service/mes/wms/IService/IReceiptOrderService.cs +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 4795a6f2..00000000 --- a/ZR.Service/mes/wms/IService/IShipmentOrderDetailService.cs +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index f8b2ca05..00000000 --- a/ZR.Service/mes/wms/IService/IShipmentOrderService.cs +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 491b6c5d..00000000 --- a/ZR.Service/mes/wms/IService/ISupplierService.cs +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 830c0ed6..00000000 --- a/ZR.Service/mes/wms/IService/ISupplierTransactionService.cs +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index b8f977cc..00000000 --- a/ZR.Service/mes/wms/IService/IWarehouseService.cs +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index f8bf2c41..00000000 --- a/ZR.Service/mes/wms/IService/IWaveForReceiptService.cs +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index fce35ce7..00000000 --- a/ZR.Service/mes/wms/IService/IWaveService.cs +++ /dev/null @@ -1,12 +0,0 @@ -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 - { - } -} diff --git a/ZR.Service/mes/wms/IService/IWmAGVService.cs b/ZR.Service/mes/wms/IService/IWmAGVService.cs new file mode 100644 index 00000000..836effa8 --- /dev/null +++ b/ZR.Service/mes/wms/IService/IWmAGVService.cs @@ -0,0 +1,18 @@ +using System; +using ZR.Model; + +using System.Collections.Generic; +using ZR.Model.MES.wms; +using ZR.Model.MES.wms.Dto; +namespace ZR.Service.mes.wms.IService +{ + public interface IWmAGVService + { + + List GetList(QueryAGVparam param); + + + List QueryAGVTask(string workorder_id); + + } +} diff --git a/ZR.Service/mes/wms/IService/IWmCustomService.cs b/ZR.Service/mes/wms/IService/IWmCustomService.cs index af900888..775dd726 100644 --- a/ZR.Service/mes/wms/IService/IWmCustomService.cs +++ b/ZR.Service/mes/wms/IService/IWmCustomService.cs @@ -1,6 +1,5 @@ using System; using ZR.Model; -using ZR.Model.Dto; using System.Collections.Generic; using ZR.Model.MES.wms; diff --git a/ZR.Service/mes/wms/WmAGVService.cs b/ZR.Service/mes/wms/WmAGVService.cs new file mode 100644 index 00000000..4527833f --- /dev/null +++ b/ZR.Service/mes/wms/WmAGVService.cs @@ -0,0 +1,56 @@ +using System; +using SqlSugar; +using Infrastructure.Attribute; +using Infrastructure.Extensions; +using ZR.Model; + +using ZR.Repository; +using ZR.Service.Business.IBusinessService; +using System.Linq; +using ZR.Model.MES.wms; +using ZR.Model.MES.wms.Dto; +using ZR.Service.mes.wms.IService; +using ZR.Model.MES.pro; +using Mapster; + +namespace ZR.Service.Business +{ + /// + /// 盘点记录Service业务层处理 + /// + [AppService(ServiceType = typeof(IWmAGVService), ServiceLifetime = LifeTime.Transient)] + public class WmAGVService : BaseService, IWmAGVService + { + /// + /// 1.获取工单列表 + /// + /// + /// + public List GetList(QueryAGVparam param) + { + List aGVWorkorderDtos = new List(); + var predicate = Expressionable.Create() + .AndIF(param.year > 0, it => it.Year == param.year) + .AndIF(param.week > 0, it => it.Week == param.week) + .AndIF(param.day > 0, it => it.Date == param.day); + + var response = Context.Queryable() + .Where(predicate.ToExpression()).ToList(); + foreach (var item in response) + { + aGVWorkorderDtos.Add(item.Adapt()); + } + return aGVWorkorderDtos; + } + /// + /// 2.获取当前工单下的所有AGV小车任务 + /// + /// + /// + /// + public List QueryAGVTask(string workorder_id) + { + return Context.Queryable().Where(it => it.FkWorkorderId == workorder_id).OrderByDescending(it=>it.Sort).ToList(); + } + } +}