ERP接口代码更新，WCS代码优化，出入库分配优化

wangxinhui

4 天以前 a0a0df2e824b6fe7e5a3c0afce78127fecf84fc9

 ÏîÄ¿´úÂë/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs

@@ -15,12 +15,8 @@
using WIDESEA_External.Model;
using WIDESEA_IBasicRepository;
using WIDESEA_IBasicService;
using WIDESEA_IInboundRepository;
using WIDESEA_IInboundService;
using WIDESEA_InboundService;
using WIDESEA_IOutboundService;
using WIDESEA_Model.Models;
using static WIDESEA_DTO.ErpResponseContent;

namespace WIDESEA_WMSServer.Controllers.ERP
{
@@ -32,309 +28,159 @@
    public class ErpController : ControllerBase
    {
        private readonly IBasicService _basicService;
        private readonly IOutboundService _outboundService;
        private readonly IInboundService _inboundService;
        private readonly IInvokeERPService _invokeERPService;
        private readonly IReturnOrderService _returnOrderService;
        private readonly IInboundService _inboundService;

        public ErpController(IBasicService basicService, IOutboundService outboundService, IInboundService inboundService,
            IInvokeERPService invokeERPService, IReturnOrderService returnOrderService)
        public ErpController(IBasicService basicService,IInvokeERPService invokeERPService, IInboundService inboundService)
        {
            _basicService = basicService;
            _outboundService = outboundService;
            _inboundService = inboundService;
            _invokeERPService = invokeERPService;
            _returnOrderService = returnOrderService;
            _inboundService = inboundService;
        }
        /// <summary>
        /// æ·»åŠ äºŒæœŸç‰©æ–™
        /// </summary>
        /// <returns></returns>
        [HttpPost, Route("ReceiveMaterial"), AllowAnonymous]

        public WebResponseContent ReceiveMaterial([FromBody] ERPRoot<ERPMaterialDTO> eRPRoot)
        {
            return _basicService.MaterielInfoService.ReceiveMaterial(eRPRoot.Content);
        }

        /// <summary>
        /// æŽ¥æ”¶ERP采购单信息
        /// æ·»åŠ äºŒæœŸä¾›åº”商
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost, Route("ReceivePurchaseOrder"), AllowAnonymous, MethodParamsValidate]
        public ErpResponseContent ReceivePurchaseOrder([FromBody] Root<PurchaseOrderModel> model)
        [HttpPost, Route("ReceiveSupplier"), AllowAnonymous]

        public WebResponseContent ReceiveSupplier([FromBody] ERPRoot<ERPSupplierDTO> eRPRoot)
        {
            WebResponseContent content = _inboundService.PurchaseOrderService.ReceivePurchaseOrder(model.Content);
            if (content.Status) return Instance.OK();
            else return Instance.Error(content.Message);
            return _basicService.SupplierInfoService.ReceiveSupplier(eRPRoot.Content);
        }

        /// <summary>
        /// æŽ¥æ”¶ERP仓库员工和质检员工数据
        /// æ·»åŠ äºŒæœŸå®¢æˆ·
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost, Route("ReceiveUser"), AllowAnonymous, MethodParamsValidate]
        public ErpResponseContent ReceiveUser([FromBody] Root<UserInfoDTO> model)
        [HttpPost, Route("ReceiveCustomer"), AllowAnonymous]

        public WebResponseContent ReceiveCustomer([FromBody] ERPRoot<ERPCustomerDTO> eRPRoot)
        {
            WebResponseContent content = _basicService.UserInfoService.ReceiveUser(model.Content);
            if (content.Status) return Instance.OK();
            else return Instance.Error(content.Message);
            return _basicService.CustomerInfoService.ReceiveCustomer(eRPRoot.Content);
        }

        /// <summary>
        /// æŽ¥æ”¶ERP供应商信息
        /// æ·»åŠ äºŒæœŸå‘˜å·¥
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost, Route("ReceiveSupplier"), AllowAnonymous, MethodParamsValidate]
        public ErpResponseContent ReceiveSupplier([FromBody] Root<SupplierDTO> model)
        [HttpPost, Route("ReceiveStaff"), AllowAnonymous]

        public WebResponseContent ReceiveStaff([FromBody] ERPRoot<ERPUserInfoDTO> eRPRoot)
        {
            WebResponseContent content = _basicService.SupplierInfoService.ReceiveSupplier(model.Content);
            if (content.Status) return Instance.OK();
            else return Instance.Error(content.Message);
            return _basicService.UserInfoService.ReceiveStaff(eRPRoot.Content);
        }

        /// <summary>
        /// æŽ¥æ”¶ERP物料信息
        /// æ·»åŠ äºŒæœŸé‡‡è´­å…¥åº“信息
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost, Route("ReceiveMaterial"), AllowAnonymous, MethodParamsValidate]
        public ErpResponseContent ReceiveMaterial([FromBody] Root<MaterielInfoDTO> model)
        [HttpPost, Route("PurchaseInboundInfo"), AllowAnonymous]

        public WebResponseContent PurchaseInboundInfo([FromBody] ERPRoot<ERPPurchaseOrderDTO> eRPRoot)
        {
            WebResponseContent content = _basicService.MaterielInfoService.ReceiveMaterial(model.Content);
            if (content.Status) return Instance.OK();
            else return Instance.Error(content.Message);
            return _inboundService.PurchaseOrderService.ReceivePurchaseOrder(eRPRoot.Content);
        }
        /// <summary>
        /// æ·»åŠ äºŒæœŸé‡‡è´­é€€è´§ä¿¡æ¯
        /// </summary>
        /// <returns></returns>
        [HttpPost, Route("PurchaseReturn"), AllowAnonymous]

        public WebResponseContent PurchaseReturn([FromBody] ERPRoot<ERPReturnOrderDTO> eRPRoot)
        {
            return _inboundService.PurchaseOrderService.ReceivePurchaseReturn(eRPRoot.Content);
        }
        /// <summary>
        /// æ·»åŠ äºŒæœŸé”€å”®å‡ºåº“信息
        /// </summary>
        /// <returns></returns>
        [HttpPost, Route("ProDeliveryOrder"), AllowAnonymous]

        public WebResponseContent ProDeliveryOrder([FromBody] ERPRoot<ERPProDeliveryDTO> eRPRoot)
        {
            return _inboundService.PurchaseOrderService.ReceiveProDeliveryOrder(eRPRoot.Content);
        }

        /// <summary>
        /// æŽ¥æ”¶ERP客户信息
        /// æ·»åŠ éžç”Ÿäº§é¢†æ–™ä¿¡æ¯
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost, Route("ReceiveCustomer"), AllowAnonymous, MethodParamsValidate]
        public ErpResponseContent ReceiveCustomer([FromBody] Root<CustomerInfoDTO> model)
        [HttpPost, Route("ReceiveOut"), AllowAnonymous]

        public WebResponseContent ReceiveOut([FromBody] ERPRoot<ERPPickOutOrderDTO> eRPRoot)
        {
            WebResponseContent content = _basicService.CustomerInfoService.ReceiveCustomer(model.Content);
            if (content.Status) return Instance.OK();
            else return Instance.Error(content.Message);
            return _inboundService.PurchaseOrderService.ReceiveOutOrder(eRPRoot.Content);
        }

        /// <summary>
        /// æŽ¥æ”¶ERP出库单信息
        /// </summary>
        /// <param name="erpOutOrder"></param>
        /// <returns></returns>
        [HttpPost, Route("ReceiveOutOrder"), AllowAnonymous, MethodParamsValidate]
        public ErpResponseContent ReceiveOutOrder([FromBody] Root<ErpOutOrderDTO> erpOutOrder)
        {
            WebResponseContent content = _outboundService.OutboundOrderService.ReceiveOutOrder(erpOutOrder.Content);
            if (content.Status) return Instance.OK();
            else return Instance.Error(content.Message);
        }
        /// <summary>
        /// æŽ¥æ”¶ERP成品出库单信息(订单出库/寄售出库)
        /// æ·»åŠ éžé‡‡è´­ç”Ÿäº§å…¥åº“单信息
        /// </summary>
        /// <returns></returns>
        [HttpPost, Route("ProductDeliveryOrder"), AllowAnonymous, MethodParamsValidate]
        public async Task<ErpResponseContent> ProductDeliveryOrder([FromBody] Root<ErpProOutOrderDTO> erpProOutOrder)
        [HttpPost, Route("ReceiveInbound"), AllowAnonymous]

        public WebResponseContent ReceiveInbound([FromBody] ERPRoot<ERPInboundOrderDTO> eRPRoot)
        {
            var content = await _outboundService.ProOutOrderService.ProductDeliveryOrder(erpProOutOrder.Content);
            if (content.Status) return Instance.OK();
            else return Instance.Error(content.Message);
            return _inboundService.InboundOrderService.ReceiveInbound(eRPRoot.Content);
        }


        /// <summary>
        /// æˆå“å¯„售转入/调拨入库
        /// </summary>
        /// <param name="root"></param>
        /// <returns></returns>
        [HttpPost, Route("ProductWarehousingOrder"), AllowAnonymous, MethodParamsValidate]
        public ErpResponseContent ProductWarehousingOrder([FromBody] Root<ErpProductWarehousingOrderDTO> root)
        {
            WebResponseContent content = _inboundService.ErpProInOrderService.ProductWarehousingOrder(root.Content);
            if (content.Status) return Instance.OK();
            else return Instance.Error(content.Message);
        }
        /// <summary>
        /// æˆå“è°ƒæ‹¨å‡ºï¼ˆç ”发）
        /// </summary>
        /// <param name="root"></param>
        /// <returns></returns>
        [HttpPost, Route("ProductTransferOrder"), AllowAnonymous, MethodParamsValidate]
        public ErpResponseContent ProductTransferOrder([FromBody] Root<ErpProductTransferOrderDTO> root)
        {
            WebResponseContent content = _outboundService.ErpProTransferOrderService.ProductTransferOrder(root.Content);
            if (content.Status) return Instance.OK();
            else return Instance.Error(content.Message);
        }
        /// <summary>
        /// æˆå“æŠ¥åºŸå‡ºåº“单接收
        /// </summary>
        /// <param name="root"></param>
        /// <returns></returns>
        [HttpPost, Route("ProductScrappedOrder"), AllowAnonymous, MethodParamsValidate]
        public ErpResponseContent ProductScrappedOrder([FromBody] Root<ErpProductScrappedOrderDTO> root)
        {
            return Instance.OK();
        }
        /// <summary>
        /// æˆå“é¢†æ–™å‡ºåº“单接收
        /// </summary>
        /// <param name="root"></param>
        /// <returns></returns>
        [HttpPost, Route("ProductOutOrder"), AllowAnonymous, MethodParamsValidate]
        public ErpResponseContent ProductOutOrder([FromBody] Root<ErpProOutLingOrder> root)
        {
            return Instance.OK();
        }
        /// <summary>
        /// é”€å”®æŒ‡æ´¾å•æŽ¥æ”¶
        /// </summary>
        [HttpPost, Route("ProductSpecifyVer"), AllowAnonymous, MethodParamsValidate]
        public async Task<ErpResponseContent> ProductSpecifyVerAsync([FromBody] Root<ErpProductSpecifyVerDTO> root)
        {
            var content = await _outboundService.ProOutOrderService.ProductSpecifyVer(root.Content);
            if (content.Status) return Instance.OK();
            else return Instance.Error(content.Message);
        }
        /// <summary>
        /// æŽ¥æ”¶ERP退料单信息
        /// </summary>
        [HttpPost, Route("ReturnOrder"), AllowAnonymous, MethodParamsValidate]
        public ErpResponseContent ReturnOrder([FromBody] Root<ErpReturnOrderDTO> model)
        {
            WebResponseContent content = _returnOrderService.ReturnOrder(model.Content);
            if (content.Status) return Instance.OK();
            else return Instance.Error(content.Message);
        }
        /// <summary>
        /// å…¶ä»–入库单接收(调拔入仓,客供回收,物料销售退货)
        /// æ·»åŠ é”€å”®é€€è´§ä¿¡æ¯
        /// </summary>
        /// <returns></returns>
        [HttpPost, Route("ReceiveWarehousingOrder"), AllowAnonymous, MethodParamsValidate]
        public ErpResponseContent ReceiveWarehousingOrder([FromBody] Root<ErpInOrderDTO> model)
        [HttpPost, Route("ProDeliveryBack"), AllowAnonymous]

        public WebResponseContent ProDeliveryBack([FromBody] ERPRoot<ERPProDeliverBackDTO> eRPRoot)
        {
            WebResponseContent content = _inboundService.InbounOrderService.ReceiveWarehousingOrder(model.Content);
            if (content.Status) return Instance.OK();
            else return Instance.Error(content.Message);
            return _inboundService.PurchaseOrderService.ReceiveProDeliveryBackOrder(eRPRoot.Content);
        }

        /// <summary>
        /// æŽ¨é€ERP出库
        /// ERP上传采购信息
        /// </summary>
        /// <returns></returns>
        [HttpPost, Route("InvokeOutStandardsApi"), AllowAnonymous]
        public string InvokeOutStandardsApi([FromBody] ERPIssueModel issueModel)
        [HttpPost, Route("ERPPurchaseUp"), AllowAnonymous]
        public string ERPPurchaseUp([FromBody] ERPPurchaseUpModel eRPPurchaseUpModel)
        {
            return _invokeERPService.InvokeOutStandardsApi(issueModel);
            return _invokeERPService.ERPPurchaseUp(eRPPurchaseUpModel);
        }
        /// <summary>
        /// æŽ¨é€ERP收货
        /// ERP成品销售出库上传信息
        /// </summary>
        /// <returns></returns>
        [HttpPost, Route("InvokeMatReceiveApi"), AllowAnonymous]
        public string InvokeMatReceiveApi([FromBody]ERPReceiveModel receiveModel)
        [HttpPost, Route("ERPProOutUp"), AllowAnonymous]
        public string ERPProOutUp([FromBody] ERPProOutUpModel eRPProOutUpModel)
        {
            return _invokeERPService.InvokeMatReceiveApi(receiveModel);
            return _invokeERPService.ERPProOutUp(eRPProOutUpModel);
        }
        /// <summary>
        /// æŽ¨é€ERP来料IQC质检
        /// ERP上传成品入库信息
        /// </summary>
        /// <returns></returns>
        [HttpPost, Route("InvokeCheckOrderApi"), AllowAnonymous]
        public string InvokeCheckOrderApi(ERPCheckModel checkModel)
        [HttpPost, Route("ERPProInUp"), AllowAnonymous]
        public string ERPProInUp([FromBody] ERPProInUpModel eRPProInUpModel)
        {
            return _invokeERPService.InvokeCheckOrderApi(checkModel);
            return _invokeERPService.ERPProInUp(eRPProInUpModel);
        }
        /// <summary>
        /// æŽ¨é€ERP入库
        /// ERP上传半-成品入库信息
        /// </summary>
        /// <returns></returns>
        [HttpPost, Route("InvokeInboundOrderApi"), AllowAnonymous]
        public string InvokeInboundOrderApi([FromBody]ERPInboundModel inboundModel)
        [HttpPost, Route("ERPSemiProInUp"), AllowAnonymous]
        public string ERPSemiProInUp([FromBody] ERPProInUpModel eRPProInUpModel)
        {
            return _invokeERPService.InvokeInboundOrderApi(inboundModel);
        }
        /// <summary>
        /// æŽ¨é€ERP退料上报
        /// </summary>
        [HttpPost, Route("InvokeReturnApi"), AllowAnonymous]
        public string InvokeReturnApi([FromBody] ERPReturnModel returnModel)
        {
            return _invokeERPService.InvokeReturnApi(returnModel);
        }
        /// <summary>
        /// ERP盘赢/亏上报接口调用
        /// </summary>
        [HttpPost, Route("InvokeTakeStockApi"), AllowAnonymous]
        public string InvokeTakeStockApi([FromBody] ERPTakeStockModel takeModel)
        {
            return _invokeERPService.InvokeTakeStockApi(takeModel);
        }
        /// <summary>
        /// ERP成品入库上报接口调用
        /// </summary>
        /// <returns></returns>
        [HttpPost, Route("InvokeProInApi"), AllowAnonymous]
        public string InvokeProInApi([FromBody] ERPProInboundModel inboundModel)
        {
            return _invokeERPService.InvokeProInApi(inboundModel);
        }
        /// <summary>
        /// ERP成品出库上报接口调用
        /// </summary>
        [HttpPost, Route("InvokeProOutApi"), AllowAnonymous]
        public string InvokeProOutApi([FromBody] ERPProOutOrderModel outOrderModel)
        {
            return _invokeERPService.InvokeProOutApi(outOrderModel);
        }
        /// <summary>
        /// æˆå“ä»“检报废出库推送ERP
        /// </summary>
        /// <param name="checkModel"></param>
        /// <returns></returns>
        [HttpPost, Route("InvokeProCheckApi"), AllowAnonymous]
        public string InvokeProCheckApi([FromBody] ERPProductCheckModel checkModel)
        {
            return _invokeERPService.InvokeProCheckApi(checkModel);
        }
        /// <summary>
        /// æˆå“è¶…周期报废推送ERp
        /// </summary>
        /// <param name="sheetModel"></param>
        /// <returns></returns>
        [HttpPost, Route("InvokeProScrapSheetApi"), AllowAnonymous]
        public string InvokeProScrapSheetApi([FromBody] ERPScrapSheetModel sheetModel)
        {
            return _invokeERPService.InvokeProScrapSheetApi(sheetModel);
        }
        /// <summary>
        /// æˆå“ç›˜ç‚¹ç›˜èµ¢/盘亏
        /// </summary>
        /// <param name="stockCheckModel"></param>
        /// <returns></returns>
        [HttpPost, Route("InvokeProStockCheckApi"), AllowAnonymous]
        public string InvokeProStockCheckApi([FromBody] ERPProStockCheckModel stockCheckModel)
        {
            return _invokeERPService.InvokeProStockCheckApi(stockCheckModel);
        }
        /// <summary>
        /// æŸ¥è¯¢é”€å”®ERP客户
        /// </summary>
        /// <returns></returns>
        [HttpPost, Route("InvokeProSaleCustomer"), AllowAnonymous]
        public string InvokeProSaleCustomer(string saleOrder)
        {
            return _invokeERPService.InvokeProSaleCustomer(saleOrder);
        }
        /// <summary>
        /// æŸ¥è¯¢é”€å”®ERP客户
        /// </summary>
        /// <returns></returns>
        [HttpPost, Route("InvokeOutProErpSync"), AllowAnonymous]
        public string InvokeOutProErpSync(string outProOrderNo)
        {
            return _invokeERPService.InvokeOutProErpSync(outProOrderNo);
        }
        /// <summary>
        /// ERP成品入库产品型号面积查询
        /// </summary>
        /// <returns></returns>
        [HttpPost, Route("InvokeProInErpStatic"), AllowAnonymous]
        public string InvokeProInErpStatic(string partNum, string partNumWithRev)
        {
            return _invokeERPService.InvokeProInErpStatic(partNum, partNumWithRev);
            return _invokeERPService.ERPSemiProInUp(eRPProInUpModel);
        }
    }
}