From 2f096bb964073739415fe169dc05435c41841d22 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期三, 15 一月 2025 15:43:53 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/fda87ddb-3aec-4e38-98c3-9b80d5e108a6.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskStatusEnum.cs | 61 ++++++++++++++++++++
代码管理/淮安PDA/common/config.js | 2
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/read.lock | 0
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/18a53365-4699-4a05-a22d-52202ffc28c5.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs | 19 ++++++
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_External/IERPService/IInvokeERPService.cs | 2
代码管理/淮安PDA/pages/stash/receiveorderoutbound.vue | 7 +-
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskStatusEnum.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_External/ERPService/InvokeERPService.cs | 30 +++++----
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/ERPCheckModel.cs | 2
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/read.lock | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/ERPInboundModel.cs | 2
13 files changed, 103 insertions(+), 24 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/18a53365-4699-4a05-a22d-52202ffc28c5.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/18a53365-4699-4a05-a22d-52202ffc28c5.vsidx"
new file mode 100644
index 0000000..3810953
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/18a53365-4699-4a05-a22d-52202ffc28c5.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/read.lock" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/read.lock"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/read.lock"
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskStatusEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskStatusEnum.cs"
index 5c870c7..43f74db 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskStatusEnum.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskStatusEnum.cs"
@@ -109,7 +109,7 @@
/// <summary>
/// 鎻愬崌鏈烘墽琛屼腑
/// </summary>
- [Description("鍫嗗灈鏈哄緟鎵ц")]
+ [Description("鎻愬崌鏈烘墽琛屼腑")]
HT_Executing = 110,
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/fda87ddb-3aec-4e38-98c3-9b80d5e108a6.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/fda87ddb-3aec-4e38-98c3-9b80d5e108a6.vsidx"
new file mode 100644
index 0000000..85a4f21
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/fda87ddb-3aec-4e38-98c3-9b80d5e108a6.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/read.lock" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/read.lock"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/read.lock"
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskStatusEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskStatusEnum.cs"
index 8a7a89c..fdea881 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskStatusEnum.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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,
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/ERPService/InvokeERPService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/ERPService/InvokeERPService.cs"
index b2b161f..59750dd 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/ERPService/InvokeERPService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/IERPService/IInvokeERPService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/IERPService/IInvokeERPService.cs"
index 1db5a1e..c8ff954 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/IERPService/IInvokeERPService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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);
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/ERPCheckModel.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/ERPCheckModel.cs"
index 415d4a3..017bb4b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/ERPCheckModel.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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>
/// 鏀惰揣鍗曞彿
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/ERPInboundModel.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/ERPInboundModel.cs"
index 6b2edb0..7f324d1 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/ERPInboundModel.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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>
/// 鍏ュ簱鏃ユ湡
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs"
index 535d556..405fe83 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs"
@@ -125,12 +125,29 @@
/// <summary>
/// 鎺ㄩ�丒RP鍑哄簱
/// </summary>
- /// <param name="erpOutOrder"></param>
/// <returns></returns>
[HttpPost, Route("InvokeOutStandardsApi"), AllowAnonymous]
public string InvokeOutStandardsApi([FromBody] ERPIssueModel issueModel)
{
return _invokeERPService.InvokeOutStandardsApi(issueModel);
}
+ /// <summary>
+ /// 鎺ㄩ�丒RP鏀惰揣
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("InvokeMatReceiveApi"), AllowAnonymous]
+ public string InvokeMatReceiveApi([FromBody]ERPReceiveModel receiveModel)
+ {
+ return _invokeERPService.InvokeMatReceiveApi(receiveModel);
+ }
+ /// <summary>
+ /// 鎺ㄩ�丒RP鍏ュ簱
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("InvokeInboundOrderApi"), AllowAnonymous]
+ public string InvokeInboundOrderApi([FromBody]ERPInboundModel inboundModel)
+ {
+ return _invokeERPService.InvokeInboundOrderApi(inboundModel);
+ }
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/common/config.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/common/config.js"
index ee92f58..0e01f92 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/common/config.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/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'
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/receiveorderoutbound.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/receiveorderoutbound.vue"
index f77f363..8e03ce0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/receiveorderoutbound.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/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) {
--
Gitblit v1.9.3