From 91b610a8cf7ad7a4e52486d3ff904df229873b23 Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期五, 11 四月 2025 14:31:05 +0800
Subject: [PATCH] 1
---
代码管理/NEWCode/WIDESEAWCS_PDA/pages/叫料/负极叫料.vue | 71 +++++++++++------------------------
代码管理/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs | 8 ++--
2 files changed, 26 insertions(+), 53 deletions(-)
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 6abbbb0..9693c0d 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"
@@ -36,6 +36,8 @@
<u-gap height="10"></u-gap>
<!-- 杈撳叆妗嗭紝浣跨敤 v-model 缁戝畾杈撳叆鍊� -->
<uni-easyinput v-model="inputValue" placeholder="璇疯緭鍏ュ彨鏂欑殑鐑樼儰璁惧" />
+ <u-gap height="10"></u-gap>
+ <uni-easyinput type="number" v-model="numberValue" placeholder="璇疯緭鍏ュ彨鏂欐暟閲�" />
</view>
</u-modal>
<!-- 浣跨敤 uni-popup 缁勪欢锛岃缃负瀵硅瘽妗嗙被鍨� -->
@@ -47,6 +49,8 @@
<view class="popup-content">{{ content }}</view>
<!-- 杈撳叆妗嗭紝浣跨敤 v-model 缁戝畾杈撳叆鍊� -->
<uni-easyinput v-model="inputValue" placeholder="璇疯緭鍏ュ唴瀹�" />
+ <u-gap height="10"></u-gap>
+ <uni-easyinput type="number" v-model="numberValue" placeholder="璇疯緭鍏ュ彨鏂欐暟閲�" />
<!-- 鎸夐挳缁� -->
<view class="button-group">
<!-- 鍏抽棴鎸夐挳 -->
@@ -79,7 +83,9 @@
content: '娆㈣繋浣跨敤 uni-popup!',
msgType: 'success',
value: '',
- inputValue: ''
+ inputValue: '',
+ numberValue: '',
+ currentAvailableQuantity: 0
};
},
onLoad() {
@@ -137,38 +143,45 @@
console.log(this.$refs);
// this.$refs.popup.open();
this.Modalshow = true;
- this.content = `宸ュ崟锛�${orderNo}\n鍨嬪彿锛�${productCode}\n鍙彨鏁伴噺锛�${number}\n璇风‘璁ゆ槸鍚﹀彨浠诲姟(榛樿4涓�)`;
+ this.content = `宸ュ崟锛�${orderNo}\n鍨嬪彿锛�${productCode}\n鍙彨鏁伴噺锛�${number}\n璇风‘璁ゆ槸鍚﹀彨浠诲姟`;
+ this.currentAvailableQuantity = number;
+ // this.numberValue = number > 4 ? 4 : number; // 璁剧疆榛樿鍊间负4鎴栧彲鐢ㄦ暟閲�
},
confirmInput() {
this.$t.message.loading();
// 鎻愬彇杈撳叆妗嗙殑鍊�
const inputValue = this.inputValue;
+ const numberValue = parseInt(this.numberValue);
// 鎻愬彇宸ュ崟缂栧彿
const orderNo = this.content.match(/宸ュ崟锛�(.*)\n/)[1];
// 鎻愬彇鍨嬪彿
const productCode = this.content.match(/鍨嬪彿锛�(.*)\n/)[1];
- // 鎻愬彇鍙彨鏁伴噺
- const availableQuantity = this.content.match(/鍙彨鏁伴噺锛�(.*)\n/)[1];
+
if (inputValue == "") {
this.$t.message.toast('璇疯緭鍏ョ儤鐑よ澶�');
return;
}
- if (availableQuantity <= 0) {
- this.$t.message.toast('鍙彨鏁伴噺涓�0锛屾棤娉曞彨浠诲姟');
+ if (numberValue <= 0) {
+ this.$t.message.toast('鍙枡鏁伴噺蹇呴』澶т簬0');
return;
}
+ if (numberValue > this.currentAvailableQuantity) {
+ this.$t.message.toast('鍙枡鏁伴噺涓嶈兘瓒呰繃鍙彨鏁伴噺');
+ return;
+ }
+
let formDataParam = {
dTaskId: this.generateUUID(),
productCode: productCode,
orderNo: orderNo,
taskNo:2,
- number: availableQuantity > 4 ? 4 : availableQuantity,
+ number: numberValue,
inputValue: inputValue,
DTaskId: this.generateUUID(),
ProductCode: productCode,
OrderNo: orderNo,
- Number: availableQuantity > 4 ? 4 : availableQuantity,
+ Number: numberValue,
InputValue: inputValue,
TaskType: "璐熸瀬"
// ...鍏朵粬闇�瑕佷紶閫掔殑鍙傛暟
@@ -275,44 +288,4 @@
.uni-ellipsis-1 {
overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-
- .popup-container {
- padding: 20px;
- text-align: center;
- }
-
- .popup-content {
- margin-bottom: 15px;
- font-size: 16px;
- }
-
- .custom-button {
- border: none;
- border-radius: 5px;
- font-size: 14px;
- cursor: pointer;
- transition: all 0.3s ease;
- box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
- }
-
- .confirm-button:hover {
- background-color: #0056b3;
- }
-
- .slot-content {
- font-size: 28rpx;
- color: $u-content-color;
- padding-left: 30rpx;
- }
-</style>
\ No newline at end of file
+ white-space
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
index 6d62fda..33541af 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
@@ -52,9 +52,9 @@
}
public Task Execute(IJobExecutionContext context)
-
-
-
+
+
+
{
try
{
@@ -115,7 +115,7 @@
string taskType = request.Value.Contains("ZJXL") ? "姝ｆ瀬" : "璐熸瀬";
// 鏌ヨ鏄惁瀛樺湪宸茬敓鎴愮殑鏂颁换鍔�
- var task = _taskRepository.QueryFirst(x => x.SourceAddress == fromAdd && x.TaskState == (int)TaskInStatusEnum.InNew);
+ var task = _taskRepository.QueryFirst(x => x.SourceAddress == fromAdd);//&& x.TaskState == (int)TaskInStatusEnum.InNew
if (task != null)
{
ConsoleHelper.WriteInfoLine($"{nameof(CommonConveyorLineJob)}: {taskType}{requestType},浠诲姟宸茬敓鎴愬瓨鍦紝绋嶅悗閲嶈瘯......");
--
Gitblit v1.9.3