From 102502a8dfeeee728db99758c4443b7824bbe232 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期四, 10 四月 2025 14:54:15 +0800
Subject: [PATCH] 合并
---
代码管理/NEWCode/WIDESEAWCS_PDA/yarn.lock | 4 +-
代码管理/NEWCode/WIDESEAWCS_PDA/pages/叫料/负极叫料.vue | 25 ++++++++++++
代码管理/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGVJob/SendTaskAGV.cs | 2
代码管理/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGVJob/UpdateTaskAGV.cs | 2
代码管理/NEWCode/WIDESEAWCS_PDA/pages/叫料/正极叫料.vue | 13 +++---
代码管理/NEWCode/WIDESEAWCS_PDA/package-lock.json | 27 +++++++++++++
代码管理/NEWCode/WIDESEAWCS_PDA/smCrypto.js | 37 ++++++++++++++++++
代码管理/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGVJob/CommonAGVJob.cs | 2
代码管理/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskCZService.cs | 4 +-
代码管理/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json | 2
10 files changed, 102 insertions(+), 16 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/package-lock.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/package-lock.json"
new file mode 100644
index 0000000..be1e88f
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/package-lock.json"
@@ -0,0 +1,27 @@
+{
+ "name": "WIDESEAWCS_PDA",
+ "lockfileVersion": 3,
+ "requires": true,
+ "packages": {
+ "": {
+ "dependencies": {
+ "sm-crypto": "^0.3.12"
+ }
+ },
+ "node_modules/jsbn": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmmirror.com/jsbn/-/jsbn-1.1.0.tgz",
+ "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
+ "license": "MIT"
+ },
+ "node_modules/sm-crypto": {
+ "version": "0.3.12",
+ "resolved": "https://registry.npmmirror.com/sm-crypto/-/sm-crypto-0.3.12.tgz",
+ "integrity": "sha512-272PBzB4PYaBdeGa41TH9ZlMGLPVRmS36Gs4FjmHwXIdihQypAbhhFWZTaa/3de69q2KfMme1M5O2W5+spAdrg==",
+ "license": "MIT",
+ "dependencies": {
+ "jsbn": "^1.1.0"
+ }
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\346\255\243\346\236\201\345\217\253\346\226\231.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\346\255\243\346\236\201\345\217\253\346\226\231.vue"
index c21e3f5..4dcadc0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\346\255\243\346\236\201\345\217\253\346\226\231.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\346\255\243\346\236\201\345\217\253\346\226\231.vue"
@@ -152,12 +152,11 @@
return;
}
let formDataParam = {
- DTaskId: this.generateUUID(),
- ProductCode: productCode,
- OrderNo: orderNo,
- Number: availableQuantity > 4 ? 4 : availableQuantity,
- InputValue: inputValue,
- TaskType: "姝ｆ瀬"
+ dTaskId: this.generateUUID(),
+ productCode: productCode,
+ orderNo: orderNo,
+ number: availableQuantity > 4 ? 4 : availableQuantity,
+ inputValue: inputValue,
// ...鍏朵粬闇�瑕佷紶閫掔殑鍙傛暟
};
this.$u.post('/api/PDA/AddCZTask', formDataParam).then(res => {
@@ -166,7 +165,7 @@
// 浣跨敤鍒涙櫤瀹屾暣鎺ュ彛
this.$u.post(value.CZZJip + '/api/PDA/insertTask', formDataParam).then(res => {
this.$t.message.closeLoading();
- if (res.status) {
+ if (res.code == 200) {
this.$t.message.toast('鍛煎彨鎴愬姛');
this.$refs.popup.close();
// this.submit();
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\350\264\237\346\236\201\345\217\253\346\226\231.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\350\264\237\346\236\201\345\217\253\346\226\231.vue"
index a2fb588..5700a5e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\350\264\237\346\236\201\345\217\253\346\226\231.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\350\264\237\346\236\201\345\217\253\346\226\231.vue"
@@ -92,6 +92,23 @@
}
},
submit(cb) {
+ this.$t.message.loading();
+ let formDataParam = {
+ current: this.current,
+ size: this.size
+ };
+ // 浣跨敤鍒涙櫤瀹屾暣鎺ュ彛
+ this.$u.post('http://192.168.31.240:9090/makerwit/selectKHWareType', null).then(res => {
+ console.log(res);
+ this.$t.message.closeLoading();
+ cb && cb();
+ if (cb != null) this.listData = [];
+ this.listData = [...this.listData, ...res.data];
+ console.log(this.listData);
+ }).catch((err) => {
+ this.$t.message.toast(err.message);
+ });
+ },
uni.getStorage({
key: 'storage_key_ipAddress',
success: (res) => {
@@ -153,6 +170,11 @@
return;
}
let formDataParam = {
+ dTaskId: this.generateUUID(),
+ productCode: productCode,
+ orderNo: orderNo,
+ number: availableQuantity > 4 ? 4 : availableQuantity,
+ inputValue: inputValue,
DTaskId: this.generateUUID(),
ProductCode: productCode,
OrderNo: orderNo,
@@ -168,7 +190,8 @@
// 浣跨敤鍒涙櫤瀹屾暣鎺ュ彛
this.$u.post(value.CZFJiP + '/api/PDA/insertTask', formDataParam).then(res => {
this.$t.message.closeLoading();
- if (res.status) {
+ console.log(formDataParam);
+ if (res.code == 200) {
this.$t.message.toast('鍛煎彨鎴愬姛');
this.$refs.popup.close();
// this.submit();
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/smCrypto.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/smCrypto.js"
new file mode 100644
index 0000000..0a3d444
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/smCrypto.js"
@@ -0,0 +1,37 @@
+/**
+ * Copyright [2022] [https://www.xiaonuo.vip]
+ * Snowy閲囩敤APACHE LICENSE 2.0寮�婧愬崗璁紝鎮ㄥ湪浣跨敤杩囩▼涓紝闇�瑕佹敞鎰忎互涓嬪嚑鐐癸細
+ * 1.璇蜂笉瑕佸垹闄ゅ拰淇敼鏍圭洰褰曚笅鐨凩ICENSE鏂囦欢銆�
+ * 2.璇蜂笉瑕佸垹闄ゅ拰淇敼Snowy婧愮爜澶撮儴鐨勭増鏉冨０鏄庛��
+ * 3.鏈」鐩唬鐮佸彲鍏嶈垂鍟嗕笟浣跨敤锛屽晢涓氫娇鐢ㄨ淇濈暀婧愮爜鍜岀浉鍏虫弿杩版枃浠剁殑椤圭洰鍑哄锛屼綔鑰呭０鏄庣瓑銆�
+ * 4.鍒嗗彂婧愮爜鏃跺�欙紝璇锋敞鏄庤蒋浠跺嚭澶� https://www.xiaonuo.vip
+ * 5.涓嶅彲浜屾鍒嗗彂寮�婧愬弬涓庡悓绫荤珵鍝侊紝濡傛湁鎯虫硶鍙仈绯诲洟闃焫iaonuobase@qq.com鍟嗚鍚堜綔銆�
+ * 6.鑻ユ偍鐨勯」鐩棤娉曟弧瓒充互涓婂嚑鐐癸紝闇�瑕佹洿澶氬姛鑳戒唬鐮侊紝鑾峰彇Snowy鍟嗕笟鎺堟潈璁稿彲锛岃鍦ㄥ畼缃戣喘涔版巿鏉冿紝鍦板潃涓� https://www.xiaonuo.vip
+ */
+/**
+ * 鍔犺В瀵嗙殑宸ュ叿绫�
+ * 浣跨敤锛歨ttps://github.com/JuneAndGreen/sm-crypto
+ *
+ * @author yubaoshan
+ */
+import smCrypto from 'sm-crypto'
+
+const sm2 = smCrypto.sm2
+
+const cipherMode = 0 // 1 - C1C3C2锛�0 - C1C2C3锛岄粯璁や负1
+const publicKey =
+ '04BD62406DF6789B1FBE8C457AECAE6D7C806CDB39316F190519905C24DF395E8952C47798D76ADECF8CA28C935702AFCDD9B17DE77121FA6448F0EDEFBD8365D6'
+
+/**
+ * 鍥藉瘑鍔犺В瀵嗗伐鍏风被
+ */
+export default {
+ // SM2鍔犲瘑
+ doSm2Encrypt(msgString) {
+ return sm2.doEncrypt(msgString, publicKey, cipherMode)
+ },
+ // SM2鏁扮粍鍔犲瘑
+ doSm2ArrayEncrypt(msgString) {
+ return sm2.doEncrypt(msgString, publicKey, cipherMode)
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/yarn.lock" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/yarn.lock"
index d210f3c..09be676 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/yarn.lock"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/yarn.lock"
@@ -4,12 +4,12 @@
jsbn@^1.1.0:
version "1.1.0"
- resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040"
+ resolved "https://registry.npmmirror.com/jsbn/-/jsbn-1.1.0.tgz"
integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==
sm-crypto@^0.3.12:
version "0.3.12"
- resolved "https://registry.yarnpkg.com/sm-crypto/-/sm-crypto-0.3.12.tgz#c23ec52b5f8a23b2fc4e7467f5738a90cee7b0d2"
+ resolved "https://registry.npmmirror.com/sm-crypto/-/sm-crypto-0.3.12.tgz"
integrity sha512-272PBzB4PYaBdeGa41TH9ZlMGLPVRmS36Gs4FjmHwXIdihQypAbhhFWZTaa/3de69q2KfMme1M5O2W5+spAdrg==
dependencies:
jsbn "^1.1.0"
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
index f7ed751..6ea10f4 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
@@ -18,7 +18,7 @@
"DBType": "SqlServer",
//杩炴帴瀛楃涓�
//"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
- "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWCS_GanFengLiYeNew;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWCS_GanFengLiYeNew;User ID=sa;Password=sa123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//璺ㄥ煙
"Cors": {
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskCZService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskCZService.cs"
index edd5122..e252b49 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskCZService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskCZService.cs"
@@ -46,13 +46,13 @@
var taskModel = new DtCZTask()
{
TaskTaskID = dto.DTaskId,
- TaskType = dto.TaskType,
+ //TaskType = dto.TaskType,
TaskEndAddress = dto.InputValue,
TaskStatus = TaskInStatusEnum.InNew.ToString(),
CreateDate = DateTime.Now,
TaskStartDate = DateTime.Now,
TaskEndDate = DateTime.Now.AddDays(1),
- TaskName = dto.TaskType.ToString(),
+ //TaskName = dto.TaskType.ToString(),
TaskNumber = dto.Number,
TaskExecutor = "CZ",
TaskOrderNo = dto.OrderNo,
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGVJob/CommonAGVJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGVJob/CommonAGVJob.cs"
index 7f01a70..764488b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGVJob/CommonAGVJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGVJob/CommonAGVJob.cs"
@@ -2,7 +2,7 @@
using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_QuartzJob;
-namespace WIDESEAWCS_Tasks.AGVJob
+namespace WIDESEAWCS_Tasks
{
[DisallowConcurrentExecution]
public class CommonAGVJob : JobBase, IJob, IDisposable
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGVJob/SendTaskAGV.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGVJob/SendTaskAGV.cs"
index 4ce458e..37cb8f7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGVJob/SendTaskAGV.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGVJob/SendTaskAGV.cs"
@@ -6,7 +6,7 @@
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;
-namespace WIDESEAWCS_Tasks.AGVJob
+namespace WIDESEAWCS_Tasks
{
public class SendTaskAGV
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGVJob/UpdateTaskAGV.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGVJob/UpdateTaskAGV.cs"
index cc58f54..caf0630 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGVJob/UpdateTaskAGV.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGVJob/UpdateTaskAGV.cs"
@@ -4,7 +4,7 @@
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;
-namespace WIDESEAWCS_Tasks.AGVJob
+namespace WIDESEAWCS_Tasks
{
public class UpdateTaskAGV
{
--
Gitblit v1.9.3