已删除14个文件
已修改47个文件
已添加16个文件
| | |
| | | let day = String(date.getDate()).padStart(2, "0"); |
| | | return year + "-" + month + "-" + day; |
| | | }, |
| | | // æ°å¢æ¹æ³ï¼å è½½ç©æç¼å·æ°æ® |
| | | async loadMaterielCodes(option) { |
| | | try { |
| | | option.loading = true; |
| | | const { page, pageSize, keyword } = option.pagination; |
| | | const res = await this.http.post("/api/PurchaseOrderDetail/GetPurchaseOrderDetailMaterielCode", { |
| | | warehouseId: this.editFormFields.warehouseId, |
| | | keyword, |
| | | page, |
| | | pageSize |
| | | }, true); |
| | | |
| | | if (res.status) { |
| | | option.pagination.total = res.total || res.data.length; |
| | | const newData = res.data.map(item => ({ key: item, value: item })); |
| | | option.data = page === 1 ? newData : [...option.data, ...newData]; |
| | | } |
| | | } catch (error) { |
| | | this.$error("æ°æ®å 载失败"); |
| | | } finally { |
| | | option.loading = false; |
| | | } |
| | | }, |
| | | //ä¸é¢è¿äºæ¹æ³å¯ä»¥ä¿çä¹å¯ä»¥å é¤ |
| | | onInit() { //æ¡æ¶åå§åé
ç½®åï¼ |
| | | this.$nextTick(() => { |
| | | let warehouseIdOption = this.getOption("warehouseId"); |
| | | let materielCodeOption = this.getOption("materielCode"); |
| | | let purchaseOrderNoOption = this.getOption("purchaseOrderNo"); |
| | | let materielQueryOption = this.getOption("materielQuery"); |
| | | warehouseIdOption.onChange=(val,option)=>{ |
| | | this.editFormFields.materielCode = ""; |
| | | materielCodeOption.data = []; |
| | |
| | | this.http.post("/api/PurchaseOrderDetail/GetPurchaseOrderDetailMaterielCode?warehouseId=" + val, {}, true).then( |
| | | source => { |
| | | if (!source.status) return this.$error(source.message); |
| | | this.$nextTick(() => { |
| | | |
| | | for (let i = 0; i < source.data.length; i++) { |
| | | materielCodeOption.data.push({ key: source.data[i], value: source.data[i] }) |
| | | } |
| | | this.refresh(); |
| | | }) |
| | | }) |
| | | } |
| | | materielCodeOption.onChange = (val, option) => { |
| | |
| | | this.http.post("/api/PurchaseOrderDetail/GetPurchaseOrderNos?materielCode=" + val, {}, true).then( |
| | | source => { |
| | | if (!source.status) return this.$error(source.message); |
| | | this.$nextTick(() => { |
| | | for (let i = 0; i < source.data.length; i++) { |
| | | purchaseOrderNoOption.data.push({ key: source.data[i], value: source.data[i] }) |
| | | } |
| | | this.refresh(); |
| | | }); |
| | | }) |
| | | } |
| | | }); |
| | | |
| | | this.columns.push({ |
| | | field: 'æä½', |
| | |
| | | warehouseId: "", |
| | | purchaseOrderNo: "", |
| | | materielCode: "", |
| | | materielQuery:"", |
| | | productionDate: "", |
| | | effectiveDate: "", |
| | | }); |
| | |
| | | }, |
| | | ], |
| | | [ |
| | | { |
| | | title: "æç´¢ç©æ", |
| | | field: "materielQuery", |
| | | type: "string", |
| | | required: true, |
| | | }, |
| | | ], |
| | | [ |
| | | |
| | | { |
| | | title: "ç©æç¼ç ", |
| | | field: "materielCode", |
| | |
| | | align: "left", |
| | | }, |
| | | { |
| | | field: "materielCode", |
| | | field: "materielName", |
| | | title: "ç©æåç§°", |
| | | type: "string", |
| | | width: 100, |
| | | align: "left", |
| | | bind: { key: "MaterielNames", data: [] }, |
| | | }, |
| | | { |
| | | field: "warehouseId", |
| | |
| | | /// </summary> |
| | | [Description("çç¹åå·ç¼ç è§å")] |
| | | PDCodeRule, |
| | | /// <summary> |
| | | /// æåå
¥åºåå·ç¼ç è§å |
| | | /// </summary> |
| | | [Description("æåå
¥åºåå·ç¼ç è§å")] |
| | | ProInCodeRule, |
| | | } |
| | | } |
¶Ô±ÈÐÂÎļþ |
| | |
| | | using System; |
| | | using System.Collections.Generic; |
| | | using System.Linq; |
| | | using System.Text; |
| | | using System.Threading.Tasks; |
| | | |
| | | namespace WIDESEA_DTO.MES |
| | | { |
| | | /// <summary> |
| | | /// MESå
å
å
¥åº |
| | | /// </summary> |
| | | public class MesBagInfoModel |
| | | { |
| | | /// <summary> |
| | | /// è¶æ¡ç |
| | | /// </summary> |
| | | public string BatchNo { get; set; } |
| | | /// <summary> |
| | | /// ä»ä½ |
| | | /// </summary> |
| | | public string WarehouseCode { get; set; } |
| | | /// <summary> |
| | | /// æç®±å
¥åº |
| | | /// </summary> |
| | | public int UnPackStock { get; set; } |
| | | /// <summary> |
| | | /// å
å
ä¿¡æ¯ |
| | | /// </summary> |
| | | public List<MESBagDetail> BagDetails { get; set; } |
| | | } |
| | | /// <summary> |
| | | /// å
å
ä¿¡æ¯ |
| | | /// </summary> |
| | | public class MESBagDetail |
| | | { |
| | | /// <summary> |
| | | /// å
å
å· |
| | | /// </summary> |
| | | public string BagNo { get; set; } |
| | | /// <summary> |
| | | /// 产åç¼ç |
| | | /// </summary> |
| | | public string ProductCode { get; set; } |
| | | /// <summary> |
| | | /// çæ¬ |
| | | /// </summary> |
| | | public string ProductVersion { get; set; } |
| | | /// <summary> |
| | | /// å
è£
SETæ°é |
| | | /// </summary> |
| | | public float SETQty { get; set; } |
| | | /// <summary> |
| | | /// åæ ¼PCSæ° |
| | | /// </summary> |
| | | public float OKPCSQTY { get; set; } |
| | | /// <summary> |
| | | /// 卿 |
| | | /// </summary> |
| | | public string DateCode { get; set; } |
| | | /// <summary> |
| | | /// Xæ° |
| | | /// </summary> |
| | | public float XQty { get; set; } |
| | | /// <summary> |
| | | /// Xä½ |
| | | /// </summary> |
| | | public string XSite { get; set; } |
| | | /// <summary> |
| | | /// ERPå·¥å |
| | | /// </summary> |
| | | public string ERPOrder { get; set; } |
| | | /// <summary> |
| | | /// éå®è®¢å |
| | | /// </summary> |
| | | public string SaleOrder { get; set; } |
| | | /// <summary> |
| | | /// 客æ·åå§å¨æ |
| | | /// </summary> |
| | | public string CustomDateCode { get; set; } |
| | | /// <summary> |
| | | /// å
å
éé |
| | | /// </summary> |
| | | public float Weight { get; set; } |
| | | /// <summary> |
| | | /// å·¥ä½ä¸å¿ |
| | | /// </summary> |
| | | public string WorkCenter { get; set; } |
| | | /// <summary> |
| | | /// å
è£
æ¶é´ |
| | | /// </summary> |
| | | public DateTime PackingDate { get; set; } |
| | | |
| | | } |
| | | } |
| | |
| | | /// <summary> |
| | | /// |
| | | /// </summary> |
| | | public DateTime DataTime { get; set; } |
| | | public string DataTime { get; set; } |
| | | /// <summary> |
| | | /// ç©æç¼ç |
| | | /// </summary> |
| | |
| | | BSucc = true; |
| | | StrCode = "0000"; |
| | | StrMsg = message == null ? "æ§è¡æå" : message; |
| | | DataTime= DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); |
| | | return this; |
| | | } |
| | | |
| | |
| | | BSucc = false; |
| | | StrCode = "404"; |
| | | StrMsg = message == null ? "æ§è¡å¤±è´¥" : message; |
| | | DataTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); |
| | | return this; |
| | | } |
| | | public ContentMes Content { get; set; } |
| | |
| | | /// <summary> |
| | | /// |
| | | /// </summary> |
| | | public List<ERPItemlist> Itemlist { get; set; } |
| | | public List<MaintainIssuelist> Itemlist { get; set; } |
| | | } |
| | | public class ERPItemlist |
| | | public class MaintainIssuelist |
| | | { |
| | | /// <summary> |
| | | /// åææç»è¡å· |
| | |
| | | /// <summary> |
| | | /// |
| | | /// </summary> |
| | | public List<ERPIqcItem> IqcItem { get; set; } |
| | | public List<ProductCheckItem> IqcItem { get; set; } |
| | | |
| | | } |
| | | public class ERPIqcItem |
| | | public class ProductCheckItem |
| | | { |
| | | /// <summary> |
| | | /// 缺é·ä»£ç |
| | |
| | | /// </summary> |
| | | public string Remark { get; set; } |
| | | |
| | | public List<ERPDataItem> DataItem { get; set; } |
| | | public List<ScrapSheetItem> DataItem { get; set; } |
| | | } |
| | | public class ERPDataItemSheet |
| | | public class ScrapSheetItem |
| | | { |
| | | /// <summary> |
| | | /// ç产ç¼ç |
| | |
| | | /// <summary> |
| | | /// |
| | | /// </summary> |
| | | public List<ERPDataItem> DataItem { get; set; } |
| | | public List<StockCheckItem> DataItem { get; set; } |
| | | } |
| | | public class ERPDataItem { |
| | | public class StockCheckItem |
| | | { |
| | | /// <summary> |
| | | /// å¨ä½ä»£å· |
| | | /// </summary> |
| | |
| | | IPurchaseOrderRepository PurchaseOrderRepository { get; } |
| | | IReturnOrderRepository ReturnOrderRepository { get; } |
| | | IReturnOrderDetailRepository ReturnOrderDetailRepository { get; } |
| | | IMesProInOrderRepository MesProInOrderRepository { get; } |
| | | IMesProInOrderDetailRepository MesProInOrderDetailRepository { get; } |
| | | } |
| | | } |
| | |
| | | using System.Text; |
| | | using System.Threading.Tasks; |
| | | using WIDESEA_Core.BaseRepository; |
| | | using WIDESEA_Model.Models.Inbound; |
| | | using WIDESEA_Model.Models; |
| | | |
| | | namespace WIDESEA_IInboundRepository |
| | | { |
| | |
| | | using System.Text; |
| | | using System.Threading.Tasks; |
| | | using WIDESEA_Core.BaseRepository; |
| | | using WIDESEA_Model.Models.Inbound; |
| | | using WIDESEA_Model.Models.Outbound; |
| | | using WIDESEA_Model.Models; |
| | | |
| | | namespace WIDESEA_IInboundRepository |
| | | { |
¶Ô±ÈÐÂÎļþ |
| | |
| | | using System; |
| | | using System.Collections.Generic; |
| | | using System.Linq; |
| | | using System.Text; |
| | | using System.Threading.Tasks; |
| | | using WIDESEA_Core.BaseRepository; |
| | | using WIDESEA_Model.Models; |
| | | |
| | | namespace WIDESEA_IInboundRepository |
| | | { |
| | | public interface IMesProInOrderDetailRepository : IRepository<Dt_MesProInOrderDetail> |
| | | { |
| | | } |
| | | } |
¶Ô±ÈÐÂÎļþ |
| | |
| | | using System; |
| | | using System.Collections.Generic; |
| | | using System.Linq; |
| | | using System.Text; |
| | | using System.Threading.Tasks; |
| | | using WIDESEA_Core.BaseRepository; |
| | | using WIDESEA_Model.Models; |
| | | |
| | | namespace WIDESEA_IInboundRepository |
| | | { |
| | | public interface IMesProInOrderRepository : IRepository<Dt_MesProInOrder> |
| | | { |
| | | |
| | | } |
| | | } |
| | |
| | | using System.Text; |
| | | using System.Threading.Tasks; |
| | | using WIDESEA_Core.BaseServices; |
| | | using WIDESEA_Model.Models.Inbound; |
| | | using WIDESEA_Model.Models; |
| | | |
| | | namespace WIDESEA_IInboundService |
| | | { |
| | |
| | | using System.Threading.Tasks; |
| | | using WIDESEA_Core.BaseServices; |
| | | using WIDESEA_Model.Models; |
| | | using WIDESEA_Model.Models.Inbound; |
| | | |
| | | namespace WIDESEA_IInboundService |
| | | { |
¶Ô±ÈÐÂÎļþ |
| | |
| | | using System; |
| | | using System.Collections.Generic; |
| | | using System.Linq; |
| | | using System.Text; |
| | | using System.Threading.Tasks; |
| | | using WIDESEA_Core.BaseServices; |
| | | using WIDESEA_IInboundRepository; |
| | | using WIDESEA_Model.Models; |
| | | |
| | | namespace WIDESEA_IInboundService |
| | | { |
| | | public interface IMesProInOrderDetailService : IService<Dt_MesProInOrderDetail> |
| | | { |
| | | IMesProInOrderDetailRepository Repository { get; } |
| | | } |
| | | } |
¶Ô±ÈÐÂÎļþ |
| | |
| | | using System; |
| | | using System.Collections.Generic; |
| | | using System.Linq; |
| | | using System.Text; |
| | | using System.Threading.Tasks; |
| | | using WIDESEA_Core.BaseServices; |
| | | using WIDESEA_Core; |
| | | using WIDESEA_DTO.ERP; |
| | | using WIDESEA_IInboundRepository; |
| | | using WIDESEA_Model.Models; |
| | | using WIDESEA_DTO.MES; |
| | | |
| | | namespace WIDESEA_IInboundService |
| | | { |
| | | public interface IMesProInOrderService : IService<Dt_MesProInOrder> |
| | | { |
| | | IMesProInOrderRepository Repository { get; } |
| | | } |
| | | } |
| | |
| | | using System.Threading.Tasks; |
| | | using WIDESEA_Core.BaseRepository; |
| | | using WIDESEA_Model.Models; |
| | | using WIDESEA_Model.Models.Outbound; |
| | | |
| | | namespace WIDESEA_IOutboundRepository |
| | | { |
| | |
| | | using System.Threading.Tasks; |
| | | using WIDESEA_Core.BaseRepository; |
| | | using WIDESEA_Model.Models; |
| | | using WIDESEA_Model.Models.Outbound; |
| | | |
| | | namespace WIDESEA_IOutboundRepository |
| | | { |
| | |
| | | using System.Threading.Tasks; |
| | | using WIDESEA_Core.BaseRepository; |
| | | using WIDESEA_Model.Models; |
| | | using WIDESEA_Model.Models.Outbound; |
| | | |
| | | namespace WIDESEA_IOutboundRepository |
| | | { |
| | |
| | | using System.Threading.Tasks; |
| | | using WIDESEA_Core.BaseServices; |
| | | using WIDESEA_IOutboundRepository; |
| | | using WIDESEA_Model.Models.Outbound; |
| | | using WIDESEA_Model.Models; |
| | | |
| | | namespace WIDESEA_IOutboundService |
| | | { |
| | |
| | | using Microsoft.AspNetCore.Hosting.Server; |
| | | using WIDESEA_Core.BaseServices; |
| | | using WIDESEA_Model.Models; |
| | | using WIDESEA_Model.Models.Outbound; |
| | | |
| | | namespace WIDESEA_IOutboundService |
| | | { |
| | |
| | | using WIDESEA_Core.BaseServices; |
| | | using WIDESEA_IOutboundRepository; |
| | | using WIDESEA_Model.Models; |
| | | using WIDESEA_Model.Models.Outbound; |
| | | |
| | | namespace WIDESEA_IOutboundService |
| | | { |
| | |
| | | using WIDESEA_Core.Enums; |
| | | using WIDESEA_IOutboundRepository; |
| | | using WIDESEA_Model.Models; |
| | | using WIDESEA_Model.Models.Outbound; |
| | | |
| | | namespace WIDESEA_IOutboundService |
| | | { |
| | |
| | | |
| | | |
| | | WebResponseContent GeneratePKOutboundTask(int orderDetailId, List<StockSelectViewDTO> stockSelectViews); |
| | | /// <summary> |
| | | /// MESæåå
¥åºåæ¥æ¶ |
| | | /// </summary> |
| | | /// <returns></returns> |
| | | MesResponseContent BagInfoSync(MesBagInfoModel bagInfoModel); |
| | | } |
| | | } |
| | |
| | | public IPurchaseOrderRepository PurchaseOrderRepository { get; } |
| | | public IReturnOrderRepository ReturnOrderRepository { get; } |
| | | public IReturnOrderDetailRepository ReturnOrderDetailRepository { get; } |
| | | public IMesProInOrderRepository MesProInOrderRepository { get; } |
| | | public IMesProInOrderDetailRepository MesProInOrderDetailRepository { get; } |
| | | |
| | | public InboundRepository(IInboundOrderDetailRepository inboundOrderDetailRepository, IInboundOrderRepository inboundOrderRepository, IReceiveOrderDetailRepository receiveOrderDetailRepository, IReceiveOrderRepository receiveOrderRepository, IPurchaseOrderDetailRepository purchaseOrderDetailRepository, IPurchaseOrderRepository purchaseOrderRepository, IReturnOrderRepository returnOrderRepository, IReturnOrderDetailRepository returnOrderDetailRepository) |
| | | public InboundRepository(IInboundOrderDetailRepository inboundOrderDetailRepository, IInboundOrderRepository inboundOrderRepository, IReceiveOrderDetailRepository receiveOrderDetailRepository, IReceiveOrderRepository receiveOrderRepository, IPurchaseOrderDetailRepository purchaseOrderDetailRepository, IPurchaseOrderRepository purchaseOrderRepository, IReturnOrderRepository returnOrderRepository, IReturnOrderDetailRepository returnOrderDetailRepository, IMesProInOrderRepository mesProInOrderRepository, IMesProInOrderDetailRepository mesProInOrderDetailRepository) |
| | | { |
| | | InboundOrderDetailRepository = inboundOrderDetailRepository; |
| | | InboundOrderRepository = inboundOrderRepository; |
| | |
| | | PurchaseOrderRepository = purchaseOrderRepository; |
| | | ReturnOrderRepository = returnOrderRepository; |
| | | ReturnOrderDetailRepository = returnOrderDetailRepository; |
| | | MesProInOrderRepository = mesProInOrderRepository; |
| | | MesProInOrderDetailRepository = mesProInOrderDetailRepository; |
| | | } |
| | | } |
| | | } |
| | |
| | | using System.Threading.Tasks; |
| | | using WIDESEA_Core.BaseRepository; |
| | | using WIDESEA_IInboundRepository; |
| | | using WIDESEA_Model.Models.Inbound; |
| | | using WIDESEA_Model.Models; |
| | | |
| | | namespace WIDESEA_InboundRepository |
| | | { |
| | |
| | | using System.Threading.Tasks; |
| | | using WIDESEA_Core.BaseRepository; |
| | | using WIDESEA_IInboundRepository; |
| | | using WIDESEA_Model.Models.Inbound; |
| | | using WIDESEA_Model.Models.Outbound; |
| | | using WIDESEA_Model.Models; |
| | | |
| | | namespace WIDESEA_InboundRepository |
| | | { |
¶Ô±ÈÐÂÎļþ |
| | |
| | | using System; |
| | | using System.Collections.Generic; |
| | | using System.Linq; |
| | | using System.Text; |
| | | using System.Threading.Tasks; |
| | | using WIDESEA_Core.BaseRepository; |
| | | using WIDESEA_IInboundRepository; |
| | | using WIDESEA_Model.Models; |
| | | |
| | | namespace WIDESEA_InboundRepository |
| | | { |
| | | public class MesProInOrderDetailRepository : RepositoryBase<Dt_MesProInOrderDetail>, IMesProInOrderDetailRepository |
| | | { |
| | | public MesProInOrderDetailRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage) |
| | | { |
| | | } |
| | | } |
| | | } |
¶Ô±ÈÐÂÎļþ |
| | |
| | | using System; |
| | | using System.Collections.Generic; |
| | | using System.Linq; |
| | | using System.Text; |
| | | using System.Threading.Tasks; |
| | | using WIDESEA_Core.BaseRepository; |
| | | using WIDESEA_IInboundRepository; |
| | | using WIDESEA_Model.Models; |
| | | |
| | | namespace WIDESEA_InboundRepository |
| | | { |
| | | public class MesProInOrderRepository : RepositoryBase<Dt_MesProInOrder>, IMesProInOrderRepository |
| | | { |
| | | public MesProInOrderRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage) |
| | | { |
| | | } |
| | | } |
| | | } |
| | |
| | | using WIDESEA_IOutboundService; |
| | | using WIDESEA_IRecordService; |
| | | using WIDESEA_IStockService; |
| | | using WIDESEA_Model.Models.Inbound; |
| | | using WIDESEA_Model.Models; |
| | | |
| | | namespace WIDESEA_InboundService |
| | | { |
| | |
| | | using WIDESEA_IOutboundService; |
| | | using WIDESEA_IRecordService; |
| | | using WIDESEA_IStockService; |
| | | using WIDESEA_Model.Models.Inbound; |
| | | using WIDESEA_Model.Models.Outbound; |
| | | using WIDESEA_Model.Models; |
| | | |
| | | namespace WIDESEA_InboundService |
| | | { |
¶Ô±ÈÐÂÎļþ |
| | |
| | | using System; |
| | | using System.Collections.Generic; |
| | | using System.Linq; |
| | | using System.Text; |
| | | using System.Threading.Tasks; |
| | | using WIDESEA_Core.BaseRepository; |
| | | using WIDESEA_Core.BaseServices; |
| | | using WIDESEA_IInboundRepository; |
| | | using WIDESEA_IInboundService; |
| | | using WIDESEA_Model.Models; |
| | | |
| | | namespace WIDESEA_InboundService |
| | | { |
| | | public class MesProInOrderDetailService : ServiceBase<Dt_MesProInOrderDetail, IMesProInOrderDetailRepository>, IMesProInOrderDetailService |
| | | { |
| | | public IMesProInOrderDetailRepository Repository => BaseDal; |
| | | private readonly IUnitOfWorkManage _unitOfWorkManage; |
| | | public MesProInOrderDetailService(IMesProInOrderDetailRepository BaseDal, IUnitOfWorkManage unitOfWorkManag) : base(BaseDal) |
| | | { |
| | | _unitOfWorkManage = unitOfWorkManag; |
| | | } |
| | | } |
| | | } |
¶Ô±ÈÐÂÎļþ |
| | |
| | | using System; |
| | | using System.Collections.Generic; |
| | | using System.Linq; |
| | | using System.Text; |
| | | using System.Threading.Tasks; |
| | | using WIDESEA_Core; |
| | | using WIDESEA_Core.BaseRepository; |
| | | using WIDESEA_Core.BaseServices; |
| | | using WIDESEA_DTO.MES; |
| | | using WIDESEA_IBasicRepository; |
| | | using WIDESEA_IInboundRepository; |
| | | using WIDESEA_IInboundService; |
| | | using WIDESEA_IOutboundService; |
| | | using WIDESEA_Model.Models; |
| | | |
| | | namespace WIDESEA_InboundService |
| | | { |
| | | public class MesProInOrderService : ServiceBase<Dt_MesProInOrder, IMesProInOrderRepository>, IMesProInOrderService |
| | | { |
| | | public IMesProInOrderRepository Repository => BaseDal; |
| | | private readonly IUnitOfWorkManage _unitOfWorkManage; |
| | | public MesProInOrderService(IMesProInOrderRepository BaseDal, IUnitOfWorkManage unitOfWorkManag) : base(BaseDal) |
| | | { |
| | | _unitOfWorkManage = unitOfWorkManag; |
| | | } |
| | | |
| | | } |
| | | } |
| | |
| | | [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "ç©æç¼å·")] |
| | | public string MaterielCode { get; set; } |
| | | |
| | | |
| | | /// <summary> |
| | | /// ç©æåç§° |
| | | /// </summary> |
| | | [SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "ç©æåç§°")] |
| | | public string MaterielName { get; set; } |
| | | |
| | | /// <summary> |
| | | /// ä»åºä¸»é® |
| | | /// </summary> |
| | |
| | | using WIDESEA_Core.CodeConfigEnum; |
| | | using WIDESEA_Core.DB.Models; |
| | | |
| | | namespace WIDESEA_Model.Models.Inbound |
| | | namespace WIDESEA_Model.Models |
| | | { |
| | | /// <summary> |
| | | /// PPå
¥åºå |
| | |
| | | using System.Text; |
| | | using System.Threading.Tasks; |
| | | using SqlSugar; |
| | | using WIDESEA_Core.Attributes; |
| | | using WIDESEA_Core.DB.Models; |
| | | |
| | | namespace WIDESEA_Model.Models.Inbound |
| | | namespace WIDESEA_Model.Models |
| | | { |
| | | /// <summary> |
| | | /// PPå
¥åºåæç» |
| | | /// </summary> |
| | | [SugarTable(nameof(Dt_MesPPBackInboundOrderDetail), "PPå
¥åºåæç»")] |
| | | [SugarTable(nameof(Dt_MesPPBackInboundOrderDetail), "PPå
¥åºåæç»"), ModelValidate] |
| | | public class Dt_MesPPBackInboundOrderDetail : BaseEntity |
| | | { |
| | | /// <summary> |
¶Ô±ÈÐÂÎļþ |
| | |
| | | using SqlSugar; |
| | | using System; |
| | | using System.Collections.Generic; |
| | | using System.Linq; |
| | | using System.Text; |
| | | using System.Threading.Tasks; |
| | | using WIDESEA_Core.Attributes; |
| | | using WIDESEA_Core.CodeConfigEnum; |
| | | using WIDESEA_Core.DB.Models; |
| | | |
| | | namespace WIDESEA_Model.Models |
| | | { |
| | | /// <summary> |
| | | /// MESæåå
¥åºå |
| | | /// </summary> |
| | | [SugarTable(nameof(Dt_MesProInOrder), "MESæåå
¥åºå")] |
| | | public class Dt_MesProInOrder : BaseEntity |
| | | { |
| | | /// <summary> |
| | | /// ä¸»é® |
| | | /// </summary> |
| | | [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "主é®")] |
| | | public int Id { get; set; } |
| | | /// <summary> |
| | | /// ä»åºä¸»é® |
| | | /// </summary> |
| | | [SugarColumn(IsNullable = false, ColumnDescription = "ä»åºä¸»é®")] |
| | | public int WarehouseId { get; set; } |
| | | /// <summary> |
| | | /// å
¥åºåæ®ç¼å· |
| | | /// </summary> |
| | | [CodeRule(RuleCodeEnum.ProInCodeRule)] |
| | | [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "å
¥åºåæ®ç¼å·")] |
| | | public string ProInOrderNo { get; set; } |
| | | /// <summary> |
| | | /// è¶æ¡ç |
| | | /// </summary> |
| | | [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "è¶æ¡ç ")] |
| | | public string BatchNo { get; set; } |
| | | /// <summary> |
| | | /// æåå
¥åºåç¶æ |
| | | /// </summary> |
| | | [SugarColumn(IsNullable = false, ColumnDescription = "æåå
¥åºåç¶æ")] |
| | | public int MesProStatus { get; set; } |
| | | /// <summary> |
| | | /// æç®±å
¥åº |
| | | /// </summary> |
| | | [SugarColumn(IsNullable = false, ColumnDescription = "æ¯å¦æç®±å
¥åº")] |
| | | public int UnPackStock { get; set; } |
| | | /// <summary> |
| | | /// 夿³¨ |
| | | /// </summary> |
| | | [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "夿³¨")] |
| | | public string Remark { get; set; } |
| | | /// <summary> |
| | | /// æåå
¥åºåæç» |
| | | /// </summary> |
| | | [Navigate(NavigateType.OneToMany, nameof(Dt_MesProInOrderDetail.OrderId), nameof(Id))] |
| | | public List<Dt_MesProInOrderDetail> Details { get; set; } |
| | | } |
| | | } |
¶Ô±ÈÐÂÎļþ |
| | |
| | | using SqlSugar; |
| | | using System; |
| | | using System.Collections.Generic; |
| | | using System.Linq; |
| | | using System.Text; |
| | | using System.Threading.Tasks; |
| | | using WIDESEA_Core.Attributes; |
| | | using WIDESEA_Core.DB.Models; |
| | | |
| | | namespace WIDESEA_Model.Models |
| | | { |
| | | /// <summary> |
| | | /// MESæåå
¥åºåæç» |
| | | /// </summary> |
| | | [SugarTable(nameof(Dt_MesProInOrderDetail), "MESæåå
¥åºåæç»"), ModelValidate] |
| | | public class Dt_MesProInOrderDetail : BaseEntity |
| | | { |
| | | /// <summary> |
| | | /// ä¸»é® |
| | | /// </summary> |
| | | [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "主é®")] |
| | | public int Id { get; set; } |
| | | |
| | | /// <summary> |
| | | /// æåå
¥åºåä¸»é® |
| | | /// </summary> |
| | | [SugarColumn(IsNullable = false, ColumnDescription = "æåå
¥åºå主é®")] |
| | | public int OrderId { get; set; } |
| | | /// <summary> |
| | | /// å
å
å· |
| | | /// </summary> |
| | | [SugarColumn(IsNullable = false,Length =50, ColumnDescription = "å
å
å·")] |
| | | public string BagNo { get; set; } |
| | | /// <summary> |
| | | /// 产åç¼ç |
| | | /// </summary> |
| | | [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "产åç¼ç ")] |
| | | public string ProductCode { get; set; } |
| | | /// <summary> |
| | | /// çæ¬ |
| | | /// </summary> |
| | | [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "çæ¬")] |
| | | public string ProductVersion { get; set; } |
| | | /// <summary> |
| | | /// å
è£
SETæ°é |
| | | /// </summary> |
| | | [SugarColumn(IsNullable = false, ColumnDescription = "å
è£
SETæ°é")] |
| | | public float SETQty { get; set; } |
| | | /// <summary> |
| | | /// åæ ¼PCSæ° |
| | | /// </summary> |
| | | [SugarColumn(IsNullable = false, ColumnDescription = "åæ ¼PCSæ°")] |
| | | public float OKPCSQTY { get; set; } |
| | | /// <summary> |
| | | /// 䏿¶æ°é |
| | | /// </summary> |
| | | [SugarColumn(IsNullable = false, ColumnDescription = "䏿¶æ°é")] |
| | | public float OverInQuantity { get; set; } |
| | | /// <summary> |
| | | /// 卿 |
| | | /// </summary> |
| | | [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "卿")] |
| | | public string DateCode { get; set; } |
| | | /// <summary> |
| | | /// Xæ° |
| | | /// </summary> |
| | | [SugarColumn(IsNullable = false, ColumnDescription = "Xæ°")] |
| | | public float XQty { get; set; } |
| | | /// <summary> |
| | | /// Xä½ |
| | | /// </summary> |
| | | [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "Xä½")] |
| | | public string XSite { get; set; } |
| | | /// <summary> |
| | | /// ERPå·¥å |
| | | /// </summary> |
| | | [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "ERPå·¥å")] |
| | | public string ERPOrder { get; set; } |
| | | /// <summary> |
| | | /// éå®è®¢å |
| | | /// </summary> |
| | | [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "éå®è®¢å")] |
| | | public string SaleOrder { get; set; } |
| | | /// <summary> |
| | | /// 客æ·åå§å¨æ |
| | | /// </summary> |
| | | [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "客æ·åå§å¨æ")] |
| | | public string CustomDateCode { get; set; } |
| | | /// <summary> |
| | | /// å
å
éé |
| | | /// </summary> |
| | | [SugarColumn(IsNullable = false, ColumnDescription = "å
å
éé")] |
| | | public float Weight { get; set; } |
| | | /// <summary> |
| | | /// å·¥ä½ä¸å¿ |
| | | /// </summary> |
| | | [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "å·¥ä½ä¸å¿")] |
| | | public string WorkCenter { get; set; } |
| | | /// <summary> |
| | | /// å
è£
æ¶é´ |
| | | /// </summary> |
| | | [SugarColumn(IsNullable = true, ColumnDescription = "å
è£
æ¶é´")] |
| | | public DateTime PackingDate { get; set; } |
| | | /// <summary> |
| | | /// 夿³¨ |
| | | /// </summary> |
| | | [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "夿³¨")] |
| | | public string Remark { get; set; } |
| | | } |
| | | } |
| | |
| | | using WIDESEA_Core.CodeConfigEnum; |
| | | using WIDESEA_Core.DB.Models; |
| | | |
| | | namespace WIDESEA_Model.Models.Outbound |
| | | namespace WIDESEA_Model.Models |
| | | { |
| | | /// <summary> |
| | | /// PPä»å°å·MESåºåºå |
| | |
| | | using WIDESEA_Core.Attributes; |
| | | using WIDESEA_Core.CodeConfigEnum; |
| | | using WIDESEA_Core.DB.Models; |
| | | using WIDESEA_Model.Models.Outbound; |
| | | using WIDESEA_Model.Models; |
| | | |
| | | namespace WIDESEA_Model.Models |
| | | { |
| | |
| | | using SqlSugar; |
| | | using WIDESEA_Core.DB.Models; |
| | | |
| | | namespace WIDESEA_Model.Models.Outbound |
| | | namespace WIDESEA_Model.Models |
| | | { |
| | | /// <summary> |
| | | /// PPä»å¤§å·MESåºåºåæç» |
| | |
| | | using WIDESEA_Core.BaseRepository; |
| | | using WIDESEA_IOutboundRepository; |
| | | using WIDESEA_Model.Models; |
| | | using WIDESEA_Model.Models.Outbound; |
| | | |
| | | namespace WIDESEA_OutboundRepository |
| | | { |
| | |
| | | using WIDESEA_Core.BaseRepository; |
| | | using WIDESEA_IOutboundRepository; |
| | | using WIDESEA_Model.Models; |
| | | using WIDESEA_Model.Models.Outbound; |
| | | |
| | | namespace WIDESEA_OutboundRepository |
| | | { |
| | |
| | | using WIDESEA_Core.BaseRepository; |
| | | using WIDESEA_IOutboundRepository; |
| | | using WIDESEA_Model.Models; |
| | | using WIDESEA_Model.Models.Outbound; |
| | | |
| | | namespace WIDESEA_OutboundRepository |
| | | { |
| | |
| | | using WIDESEA_IRecordService; |
| | | using WIDESEA_IStockService; |
| | | using WIDESEA_Model.Models; |
| | | using WIDESEA_Model.Models.Outbound; |
| | | using WIDESEA_OutboundRepository; |
| | | |
| | | namespace WIDESEA_OutboundService |
| | |
| | | using WIDESEA_IRecordService; |
| | | using WIDESEA_IStockService; |
| | | using WIDESEA_Model.Models; |
| | | using WIDESEA_Model.Models.Outbound; |
| | | using WIDESEA_OutboundRepository; |
| | | |
| | | namespace WIDESEA_OutboundService |
| | |
| | | using WIDESEA_IRecordService; |
| | | using WIDESEA_IStockService; |
| | | using WIDESEA_Model.Models; |
| | | using WIDESEA_Model.Models.Outbound; |
| | | using WIDESEA_OutboundRepository; |
| | | |
| | | namespace WIDESEA_OutboundService |
| | |
| | | using WIDESEA_IRecordService; |
| | | using WIDESEA_IStockService; |
| | | using WIDESEA_Model.Models; |
| | | using WIDESEA_Model.Models.Outbound; |
| | | using WIDESEA_OutboundRepository; |
| | | |
| | | namespace WIDESEA_OutboundService |
| | |
| | | using WIDESEA_IRecordService; |
| | | using WIDESEA_IStockService; |
| | | using WIDESEA_Model.Models; |
| | | using WIDESEA_Model.Models.Outbound; |
| | | |
| | | namespace WIDESEA_IOutboundService |
| | | { |
| | |
| | | using WIDESEA_ITaskInfoService; |
| | | using WIDESEA_Model.Models; |
| | | using WIDESEA_Common.OrderEnum; |
| | | using WIDESEA_Model.Models.Outbound; |
| | | using System.Diagnostics.Metrics; |
| | | using System.Reflection.Metadata; |
| | | using WIDESEA_Model.Models.Inbound; |
| | | using WIDESEA_DTO.Task; |
| | | |
| | | namespace WIDESEA_TaskInfoService |
| | |
| | | content.BSucc = true; |
| | | content.StrCode = "0000"; |
| | | content.StrMsg = "æ§è¡æå"; |
| | | content.DataTime = DateTime.Now; |
| | | content.MaterialCode = stock.MaterielCode; |
| | | content.Quantity = stock.StockQuantity; |
| | | content.Unit = stock.Unit; |
| | |
| | | return MesResponseContent.Instance.Error(ex.Message); |
| | | } |
| | | } |
| | | /// <summary> |
| | | /// MESæåå
¥åºåæ¥æ¶ |
| | | /// </summary> |
| | | /// <returns></returns> |
| | | public MesResponseContent BagInfoSync(MesBagInfoModel bagInfoModel) |
| | | { |
| | | MesResponseContent content = new MesResponseContent(); |
| | | try |
| | | { |
| | | Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x=>x.WarehouseCode==bagInfoModel.WarehouseCode); |
| | | if (warehouse==null) |
| | | { |
| | | return content.Error("æªæ¾å°ä»åºä¿¡æ¯"); |
| | | } |
| | | List<Dt_MesProInOrderDetail> mesProInOrderDetails = new List<Dt_MesProInOrderDetail>(); |
| | | foreach (var item in bagInfoModel.BagDetails) |
| | | { |
| | | mesProInOrderDetails.Add(_mapper.Map<Dt_MesProInOrderDetail>(item)); |
| | | } |
| | | mesProInOrderDetails.ForEach(x => |
| | | { |
| | | x.OverInQuantity = 0; |
| | | }); |
| | | Dt_MesProInOrder mesProInOrder = new Dt_MesProInOrder() |
| | | { |
| | | WarehouseId = warehouse.WarehouseId, |
| | | BatchNo = bagInfoModel.BatchNo, |
| | | MesProStatus = InOrderStatusEnum.æªå¼å§.ObjToInt(), |
| | | UnPackStock=bagInfoModel.UnPackStock, |
| | | Details= mesProInOrderDetails |
| | | }; |
| | | Db.InsertNav(mesProInOrder).Include(x=>x.Details).ExecuteCommand(); |
| | | return content.OK("æ¥æ¶æå"); |
| | | } |
| | | catch (Exception ex) |
| | | { |
| | | content.Error(ex.Message); |
| | | } |
| | | return content; |
| | | } |
| | | |
| | | } |
| | | } |
| | |
| | | using WIDESEA_ITaskInfoRepository; |
| | | using WIDESEA_ITaskInfoService; |
| | | using WIDESEA_Model.Models; |
| | | using WIDESEA_Model.Models.Outbound; |
| | | using WIDESEA_TaskInfoRepository; |
| | | |
| | | namespace WIDESEA_TaskInfoService |
| | |
| | | using Microsoft.AspNetCore.Mvc; |
| | | using WIDESEA_Core.BaseController; |
| | | using WIDESEA_IOutboundService; |
| | | using WIDESEA_Model.Models.Outbound; |
| | | using WIDESEA_Model.Models; |
| | | |
| | | namespace WIDESEA_WMSServer.Controllers.Inbound |
| | | { |
¶Ô±ÈÐÂÎļþ |
| | |
| | | using Microsoft.AspNetCore.Mvc; |
| | | using WIDESEA_Core.BaseController; |
| | | using WIDESEA_IInboundService; |
| | | using WIDESEA_Model.Models; |
| | | |
| | | namespace WIDESEA_WMSServer.Controllers.Inbound |
| | | { |
| | | /// <summary> |
| | | /// Mesæåå
¥åº |
| | | /// </summary> |
| | | [Route("api/MesProInOrder")] |
| | | [ApiController] |
| | | public class MesProInOrderController : ApiBaseController<IMesProInOrderService, Dt_MesProInOrder> |
| | | { |
| | | public MesProInOrderController(IMesProInOrderService service) : base(service) |
| | | { |
| | | } |
| | | } |
| | | } |
¶Ô±ÈÐÂÎļþ |
| | |
| | | using Microsoft.AspNetCore.Mvc; |
| | | using WIDESEA_Core.BaseController; |
| | | using WIDESEA_IInboundService; |
| | | using WIDESEA_Model.Models; |
| | | |
| | | namespace WIDESEA_WMSServer.Controllers.Inbound |
| | | { |
| | | /// <summary> |
| | | /// Mesæåå
¥åºæç» |
| | | /// </summary> |
| | | [Route("api/MesProInOrderDetail")] |
| | | [ApiController] |
| | | public class MesProInOrderDetailController : ApiBaseController<IMesProInOrderDetailService, Dt_MesProInOrderDetail> |
| | | { |
| | | public MesProInOrderDetailController(IMesProInOrderDetailService service) : base(service) |
| | | { |
| | | } |
| | | } |
| | | } |
| | |
| | | { |
| | | return _taskService.UploadMesMaterialLotaAcept(model); |
| | | } |
| | | |
| | | /// <summary> |
| | | /// PPåºåæ¥è¯¢ |
| | | /// </summary> |
| | | /// <param name="model"></param> |
| | | /// <returns></returns> |
| | | [HttpPost, Route("BagInfoSync"), AllowAnonymous] |
| | | public MesResponseContent BagInfoSync([FromBody] Root<MesBagInfoModel> model) |
| | | { |
| | | return _taskService.BagInfoSync(model.Content); |
| | | } |
| | | } |
| | | } |
| | |
| | | using WIDESEA_DTO.Outbound; |
| | | using WIDESEA_IOutboundService; |
| | | using WIDESEA_Model.Models; |
| | | using WIDESEA_Model.Models.Outbound; |
| | | |
| | | namespace WIDESEA_WMSServer.Controllers.Outbound |
| | | { |
| | |
| | | using WIDESEA_DTO.Outbound; |
| | | using WIDESEA_IOutboundService; |
| | | using WIDESEA_Model.Models; |
| | | using WIDESEA_Model.Models.Outbound; |
| | | |
| | | namespace WIDESEA_WMSServer.Controllers.Outbound |
| | | { |
| | |
| | | using WIDESEA_Core.BaseController; |
| | | using WIDESEA_IOutboundService; |
| | | using WIDESEA_Model.Models; |
| | | using WIDESEA_Model.Models.Outbound; |
| | | |
| | | namespace WIDESEA_WMSServer.Controllers.Outbound |
| | | { |