Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

hutongqing

2025-01-15 2f096bb964073739415fe169dc05435c41841d22

Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/18a53365-4699-4a05-a22d-52202ffc28c5.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/read.lock

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskStatusEnum.cs

@@ -109,7 +109,7 @@
        /// <summary>
        /// æå‡æœºæ‰§è¡Œä¸­
        /// </summary>
        [Description("堆垛机待执行")]
        [Description("提升机执行中")]
        HT_Executing = 110,
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/fda87ddb-3aec-4e38-98c3-9b80d5e108a6.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/read.lock

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskStatusEnum.cs

@@ -17,40 +17,99 @@
        /// </summary>
        [Description("新建")]
        New = 100,

        /// <summary>
        /// å †åž›æœºå¾…执行
        /// </summary>
        [Description("堆垛机待执行")]
        SC_Execute= 200,
        SC_Execute = 200,

        /// <summary>
        /// å †åž›æœºæ‰§è¡Œä¸­
        /// </summary>
        [Description("堆垛机执行中")]
        SC_Executing = 210,

        /// <summary>
        /// å †åž›æœºå®Œæˆ
        /// </summary>
        [Description("堆垛机完成")]
        SC_Finish = 220,

        /// <summary>
        /// è¾“送线待执行
        /// </summary>
        [Description("输送线待执行")]
        Line_Execute = 400,

        /// <summary>
        /// è¾“送线执行中
        /// </summary>
        [Description("输送线执行中")]
        Line_Executing = 410,

        /// <summary>
        /// è¾“送线完成
        /// </summary>
        [Description("输送线完成")]
        Line_Finish = 420,

        /// <summary>
        /// AGV待执行
        /// </summary>
        [Description("AGV待执行")]
        AGV_Execute = 300,

        /// <summary>
        /// AGV执行中
        /// </summary>
        [Description("AGV执行中")]
        AGV_Executing = 310,

        /// <summary>
        /// AGV待继续执行
        /// </summary>
        [Description("AGV待继续执行")]
        AGV_WaitToExecute = 320,
        /// <summary>
        /// AGV放货中
        /// </summary>
        [Description("AGV放货中")]
        AGV_Puting = 325,

        /// <summary>
        /// AGV完成
        /// </summary>
        [Description("AGV完成")]
        AGV_Finish = 330,

        /// <summary>
        /// ä»»åŠ¡å®Œæˆ
        /// </summary>
        [Description("任务完成")]
        Finish = 900,

        /// <summary>
        /// ä»»åŠ¡æŒ‚èµ·
        /// </summary>
        [Description("任务挂起")]
        Pending = 970,

        /// <summary>
        /// ä»»åŠ¡å–消
        /// </summary>
        [Description("任务取消")]
        Cancel = 980,

        /// <summary>
        /// ä»»åŠ¡å¼‚常
        /// </summary>
        [Description("任务异常")]
        Exception = 990,
        /// <summary>
        /// æå‡æœºæ‰§è¡Œä¸­
        /// </summary>
        [Description("提升机执行中")]
        HT_Executing = 110,
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_External/ERPService/InvokeERPService.cs

@@ -112,19 +112,21 @@
        /// </summary>
        /// <param name="outboundModel"></param>
        /// <returns></returns>
        public string InvokeOutboundOrderApi(ERPOutboundModel outboundModel)
        {
            Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
            ERPBaseModel<ERPOutboundModel> model = new ERPBaseModel<ERPOutboundModel>()
            {
                Data = outboundModel,
                Desc = "材料出库",
                Type = "toBomMaterialOutTC",
                SecurityCode = "TeChuang"
            };
            string request = JsonConvert.SerializeObject(model, settings);
            string response = HttpHelper.Post(apiInfo.ApiAddress, request);
            return response;
        }
        #region å¼ƒç”¨
        //public string InvokeOutboundOrderApi(ERPOutboundModel outboundModel)
        //{
        //    Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
        //    ERPBaseModel<ERPOutboundModel> model = new ERPBaseModel<ERPOutboundModel>()
        //    {
        //        Data = outboundModel,
        //        Desc = "材料出库",
        //        Type = "toBomMaterialOutTC",
        //        SecurityCode = "TeChuang"
        //    };
        //    string request = JsonConvert.SerializeObject(model, settings);
        //    string response = HttpHelper.Post(apiInfo.ApiAddress, request);
        //    return response;
        //}
        #endregion
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_External/IERPService/IInvokeERPService.cs

@@ -38,7 +38,7 @@
        /// </summary>
        /// <param name="outboundModel"></param>
        /// <returns></returns>
        string InvokeOutboundOrderApi(ERPOutboundModel outboundModel);
        //string InvokeOutboundOrderApi(ERPOutboundModel outboundModel);
        string InvokeOutStandardsApi(ERPIssueModel issueModel);
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/ERPCheckModel.cs

@@ -34,7 +34,7 @@
        /// <summary>
        /// å·¥åŽ‚代号
        /// </summary>
        public string PlantsId { get; set; } = "HA020";
        public string PlantsId { get; set; } = "HA02";

        /// <summary>
        /// æ”¶è´§å•å·

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/ERPInboundModel.cs

@@ -44,7 +44,7 @@
        /// <summary>
        /// å·¥åŽ‚代号
        /// </summary>
        public string PlantsId { get; set; } = "HA020";
        public string PlantsId { get; set; } = "HA02";

        /// <summary>
        /// å…¥åº“日期

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs

@@ -125,12 +125,29 @@
        /// <summary>
        /// æŽ¨é€ERP出库
        /// </summary>
        /// <param name="erpOutOrder"></param>
        /// <returns></returns>
        [HttpPost, Route("InvokeOutStandardsApi"), AllowAnonymous]
        public string InvokeOutStandardsApi([FromBody] ERPIssueModel issueModel)
        {
            return _invokeERPService.InvokeOutStandardsApi(issueModel);
        }
        /// <summary>
        /// æŽ¨é€ERP收货
        /// </summary>
        /// <returns></returns>
        [HttpPost, Route("InvokeMatReceiveApi"), AllowAnonymous]
        public string InvokeMatReceiveApi([FromBody]ERPReceiveModel receiveModel)
        {
            return _invokeERPService.InvokeMatReceiveApi(receiveModel);
        }
        /// <summary>
        /// æŽ¨é€ERP入库
        /// </summary>
        /// <returns></returns>
        [HttpPost, Route("InvokeInboundOrderApi"), AllowAnonymous]
        public string InvokeInboundOrderApi([FromBody]ERPInboundModel inboundModel)
        {
            return _invokeERPService.InvokeInboundOrderApi(inboundModel);
        }
    }
}

 ´úÂë¹ÜÀí/»´°²PDA/common/config.js

@@ -1,5 +1,5 @@
let config = {
    baseUrl: 'http://localhost:9293',
    baseUrl: 'http://10.30.4.92:9283',
    urls: [
        'http://10.30.4.92:9283',
        'http://10.30.4.92:9283'

 ´úÂë¹ÜÀí/»´°²PDA/pages/stash/receiveorderoutbound.vue

@@ -8,7 +8,7 @@
                    <uni-forms-item :label="label" style="margin-top: -20px;"></uni-forms-item>
                    <!-- <uni-forms-item label="单据类型：生产领料单" style="margin-top: -20px;"></uni-forms-item> -->
                    <uni-forms-item label="内箱码：" style="margin-top: -20px;">
                        <uni-easyinput type="text" placeholder="请扫描内箱码" ref='midInput' :focus="focus"
                        <uni-easyinput type="text" placeholder="请扫描内箱码" ref='midInput' :focus="!focus"
                            v-model="innerCode" @input="innercodeInput" />
                    </uni-forms-item>
                    <uni-forms-item :label="PurchaseOrderNo" style="margin-top: -20px;"></uni-forms-item>
@@ -192,7 +192,7 @@
                remaindQty: "实际数量：",
                tagFocus: true,
                numberFocus: false,
                focus: true,
                focus: false,
                tag: "",
                number: "",
                tagmatCode: "物料编码：",
@@ -488,7 +488,8 @@
                    var innerCode = this.innerCode;
                    setTimeout(() => {
                        this.innerCode = "";
                    }, 10);
                        this.focus=false;
                    }, 1);

                    this.$u.post('/api/MaterielInfo/CodeAnalysis?serNum=' + innerCode, {}).then((res) => {
                        if (res.status) {