From 9f61c92fe6864d536a0e3a6e041cbd788dcec752 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 12 12月 2024 11:02:16 +0800
Subject: [PATCH] 222
---
LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue | 35 ++++++++---
LA24030_LuLiPackageLine_Pda/api/putIn/artificial.js | 7 ++
LA24030_LuLiPackageLine_Pda/pages/untie/untie.vue | 32 ++++++++--
LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/orderpiece.vue | 35 ++++++++---
LA24030_LuLiPackageLine_Pda/pages/login/login.vue | 4
CC/iWareCC_ASRS/ThreadService/03_BZ12(机器人码包工位)/2、DataProcess_BZ12_IssueTask.cs | 1
LA24030_LuLiPackageLine_Pda/pages.json | 4
CC/iWareCC_ASRS/ThreadService/02_BZ39工位（补板后工位）/Inbound/2、DataProcess_BZ39_IssueInboundTask.cs | 1
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs | 44 ++++++++++++--
CC/iWareCC_ASRS/ThreadService/02_BZ39工位（补板后工位）/Outbound/2、DataProcess_RobotBuffer_IssueOutboundTask.cs | 1
CC/iWareCC_ASRS/ThreadService/04_BZ21（搬运整垛机器人）/2、DataProcess_BZ21_IssueTask.cs | 1
11 files changed, 127 insertions(+), 38 deletions(-)
diff --git "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/2\343\200\201DataProcess_BZ39_IssueInboundTask.cs" "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/2\343\200\201DataProcess_BZ39_IssueInboundTask.cs"
index 7a51d5e..ef9933b 100644
--- "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/2\343\200\201DataProcess_BZ39_IssueInboundTask.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/2\343\200\201DataProcess_BZ39_IssueInboundTask.cs"
@@ -86,6 +86,7 @@
}
doTask.TaskStatus = (int)TaskStatusEnum.宸蹭笅鍙�;
+ doTask.IssueTime = DateTime.Now;
wmsDB.SaveChanges();
}
diff --git "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Outbound/2\343\200\201DataProcess_RobotBuffer_IssueOutboundTask.cs" "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Outbound/2\343\200\201DataProcess_RobotBuffer_IssueOutboundTask.cs"
index cc02891..cca89f1 100644
--- "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Outbound/2\343\200\201DataProcess_RobotBuffer_IssueOutboundTask.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Outbound/2\343\200\201DataProcess_RobotBuffer_IssueOutboundTask.cs"
@@ -140,6 +140,7 @@
}
doTask.TaskStatus = (int)TaskStatusEnum.宸蹭笅鍙�;
+ doTask.IssueTime = DateTime.Now;
wmsDB.SaveChanges();
}
diff --git "a/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/2\343\200\201DataProcess_BZ12_IssueTask.cs" "b/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/2\343\200\201DataProcess_BZ12_IssueTask.cs"
index 51f3d3b..84b59f0 100644
--- "a/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/2\343\200\201DataProcess_BZ12_IssueTask.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/2\343\200\201DataProcess_BZ12_IssueTask.cs"
@@ -111,6 +111,7 @@
}
task.TaskStatus = (int)TaskStatusEnum.宸蹭笅鍙�;
+ task.IssueTime = DateTime.Now;
wmsDB.SaveChanges();
}
diff --git "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/2\343\200\201DataProcess_BZ21_IssueTask.cs" "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/2\343\200\201DataProcess_BZ21_IssueTask.cs"
index f95185b..6977b66 100644
--- "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/2\343\200\201DataProcess_BZ21_IssueTask.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/2\343\200\201DataProcess_BZ21_IssueTask.cs"
@@ -104,6 +104,7 @@
}
task.TaskStatus = (int)TaskStatusEnum.宸蹭笅鍙�;
+ task.IssueTime = DateTime.Now;
wmsDB.SaveChanges();
}
diff --git a/LA24030_LuLiPackageLine_Pda/api/putIn/artificial.js b/LA24030_LuLiPackageLine_Pda/api/putIn/artificial.js
index 1958638..c48c0a4 100644
--- a/LA24030_LuLiPackageLine_Pda/api/putIn/artificial.js
+++ b/LA24030_LuLiPackageLine_Pda/api/putIn/artificial.js
@@ -216,6 +216,13 @@
data: data
})
}
+export function querySingleUpiByUpi(data){
+ return request({
+ url: `/api/WmsCommonnQuery/QuerySingleUpiByUpi`,
+ method: 'post',
+ data: data
+ })
+}
export function getenumDataList(data){
return request({
diff --git a/LA24030_LuLiPackageLine_Pda/pages.json b/LA24030_LuLiPackageLine_Pda/pages.json
index ec4292a..c917ac5 100644
--- a/LA24030_LuLiPackageLine_Pda/pages.json
+++ b/LA24030_LuLiPackageLine_Pda/pages.json
@@ -116,7 +116,7 @@
}, {
"path": "pages/artificial/artificial",
"style": {
- "navigationBarTitleText": "鍏ュ簱",
+ "navigationBarTitleText": "鏉夸欢鏌ョ湅",
"enablePullDownRefresh": false
}
},{
@@ -214,7 +214,7 @@
}, {
"path": "pages/takeMaterial/orderpiece/orderpiece",
"style": {
- "navigationBarTitleText": "閫佽揣鍗曟敹璐�",
+ "navigationBarTitleText": "NG澶勭悊",
"enablePullDownRefresh": false
}
diff --git a/LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue b/LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue
index 42f2329..3c526fe 100644
--- a/LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue
+++ b/LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue
@@ -93,6 +93,13 @@
</text>
</u-col>
</u-row>
+ <u-row>
+ <u-col span="12">
+ <text class="color_80 padding_left25rpx">
+ <text class="color_80"> 娆″簭锛歿{ item.shelf }} </text>
+ </text>
+ </u-col>
+ </u-row>
<u-row>
<u-col span="12">
<text class="color_80 padding_left25rpx">
@@ -129,13 +136,13 @@
</text>
</u-col>
</u-row>
- <u-row>
- <u-col span="12">
- <text class="color_80 padding_left25rpx">
- <text class="color_80"> 娆″簭锛歿{ item.shelf }} </text>
- </text>
- </u-col>
- </u-row>
+ <u-row>
+ <u-col span="12">
+ <text class="color_80 padding_left25rpx">
+ 鏍囪锛歿{ getUpiFlagEnumName(item.upiFlag) }}
+ </text>
+ </u-col>
+ </u-row>
<u-row>
<u-col span="12">
<text class="color_80 padding_left25rpx">
@@ -301,7 +308,7 @@
import ButtonModal from "../../components/buttonModal.vue";
import ModalCode from "../../components/ModalCode.vue";
import {
- getBhbMaterialList,
+ querySingleUpiByUpi,
getenumDataList,
} from "../../api/putIn/artificial.js";
export default {
@@ -336,6 +343,7 @@
kwbhAllowed: false,
enumList: [],
areaCodeEnum: [],
+ upiFlagEnum: [],
};
},
components: {
@@ -353,6 +361,11 @@
}).then((res) => {
this.areaCodeEnum = res.result || [];
});
+ getenumDataList({
+ EnumName: "UpiFlagEnum",
+ }).then((res) => {
+ this.upiFlagEnum = res.result || [];
+ });
},
onLoad() {
this.operator = JSON.parse(uni.getStorageSync("userInfo")).name;
@@ -368,6 +381,10 @@
const name = this.areaCodeEnum.find((item) => item.value === value);
return name ? name.name : "";
},
+ getUpiFlagEnumName(value) {
+ const name = this.upiFlagEnum.find((item) => item.value === value);
+ return name ? name.name : "";
+ },
// 濡傛灉鎵撳紑涓�涓殑鏃跺�欙紝涓嶉渶瑕佸叧闂叾浠栵紝鍒欐棤闇�瀹炵幇鏈柟娉�
open(index) {
// 鍏堝皢姝ｅ湪琚搷浣滅殑swipeAction鏍囪涓烘墦寮�鐘舵�侊紝鍚﹀垯鐢变簬props鐨勭壒鎬ч檺鍒讹紝
@@ -401,7 +418,7 @@
});
return;
}
- getBhbMaterialList({
+ querySingleUpiByUpi({
packageCode: this.warehouse.packageCode,
upi: this.warehouse.upi,
}).then((res) => {
diff --git a/LA24030_LuLiPackageLine_Pda/pages/login/login.vue b/LA24030_LuLiPackageLine_Pda/pages/login/login.vue
index b74ee60..dcc301e 100644
--- a/LA24030_LuLiPackageLine_Pda/pages/login/login.vue
+++ b/LA24030_LuLiPackageLine_Pda/pages/login/login.vue
@@ -5,11 +5,11 @@
</view>
<view class="width height50">
<view class="text_align_center fontSize56rpx ">
- 鏍囧噯鍖栧師鏉愭枡搴�
+
</view>
<view class="text_align_center margin_bottom18 "
style="font-size: 40rpx;color: #9fa09f;padding: 25rpx 0 0;">
- 鈥旀櫤鑳戒粨鍌ㄧ郴缁熲��
+ 鈥旈瞾涓藉灞呭寘瑁呯嚎鈥�
</view>
<!-- <tki-barcode :loadMake="false" :opations="opations" :onval="true" format="code128" :val="val" ref="barcode"
@result="barresult" /> -->
diff --git a/LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/orderpiece.vue b/LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/orderpiece.vue
index 343dd8a..81f043e 100644
--- a/LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/orderpiece.vue
+++ b/LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/orderpiece.vue
@@ -93,6 +93,13 @@
</text>
</u-col>
</u-row>
+ <u-row>
+ <u-col span="12">
+ <text class="color_80 padding_left25rpx">
+ <text class="color_80"> 娆″簭锛歿{ item.shelf }} </text>
+ </text>
+ </u-col>
+ </u-row>
<u-row>
<u-col span="12">
<text class="color_80 padding_left25rpx">
@@ -129,13 +136,13 @@
</text>
</u-col>
</u-row>
- <u-row>
- <u-col span="12">
- <text class="color_80 padding_left25rpx">
- <text class="color_80"> 娆″簭锛歿{ item.shelf }} </text>
- </text>
- </u-col>
- </u-row>
+ <u-row>
+ <u-col span="12">
+ <text class="color_80 padding_left25rpx">
+ 鏍囪锛歿{ getUpiFlagEnumName(item.upiFlag) }}
+ </text>
+ </u-col>
+ </u-row>
<u-row>
<u-col span="12">
<text class="color_80 padding_left25rpx">
@@ -304,7 +311,7 @@
import {
WmsOperationTaskSetNG,
WmsOperationTaskCancelNG,
- getBhbMaterialList,
+ querySingleUpiByUpi,
getenumDataList,
} from "@/api/putIn/artificial.js";
@@ -340,6 +347,7 @@
kwbhAllowed: false,
enumList: [],
areaCodeEnum: [],
+ upiFlagEnum: [],
};
},
components: {
@@ -357,6 +365,11 @@
}).then((res) => {
this.areaCodeEnum = res.result || [];
});
+ getenumDataList({
+ EnumName: "UpiFlagEnum",
+ }).then((res) => {
+ this.upiFlagEnum = res.result || [];
+ });
},
onLoad() {
this.operator = JSON.parse(uni.getStorageSync("userInfo")).name;
@@ -367,6 +380,10 @@
const name = this.enumList.find((item) => item.value === value);
return name ? name.name : "";
},
+ getUpiFlagEnumName(value) {
+ const name = this.upiFlagEnum.find((item) => item.value === value);
+ return name ? name.name : "";
+ },
getAreaCodeEnumName(value) {
const name = this.areaCodeEnum.find((item) => item.value === value);
return name ? name.name : "";
@@ -381,7 +398,7 @@
});
return;
}
- getBhbMaterialList({
+ querySingleUpiByUpi({
upi: this.warehouse.upi,
}).then((res) => {
const result = res.result;
diff --git a/LA24030_LuLiPackageLine_Pda/pages/untie/untie.vue b/LA24030_LuLiPackageLine_Pda/pages/untie/untie.vue
index 2f92f0e..38fb9ea 100644
--- a/LA24030_LuLiPackageLine_Pda/pages/untie/untie.vue
+++ b/LA24030_LuLiPackageLine_Pda/pages/untie/untie.vue
@@ -94,6 +94,13 @@
</text>
</u-col>
</u-row>
+ <u-row>
+ <u-col span="12">
+ <text class="color_80 padding_left25rpx">
+ <text class="color_80"> 娆″簭锛歿{ item.shelf }} </text>
+ </text>
+ </u-col>
+ </u-row>
<u-row>
<u-col span="12">
<text class="color_80 padding_left25rpx">
@@ -130,13 +137,13 @@
</text>
</u-col>
</u-row>
- <u-row>
- <u-col span="12">
- <text class="color_80 padding_left25rpx">
- <text class="color_80"> 娆″簭锛歿{ item.shelf }} </text>
- </text>
- </u-col>
- </u-row>
+ <u-row>
+ <u-col span="12">
+ <text class="color_80 padding_left25rpx">
+ 鏍囪锛歿{ getUpiFlagEnumName(item.upiFlag) }}
+ </text>
+ </u-col>
+ </u-row>
<u-row>
<u-col span="12">
<text class="color_80 padding_left25rpx">
@@ -346,6 +353,7 @@
kwbhAllowed: false,
enumList: [],
areaCodeEnum: [],
+ upiFlagEnum: [],
};
},
components: {
@@ -364,7 +372,11 @@
}).then((res) => {
this.areaCodeEnum = res.result || [];
});
-
+ getenumDataList({
+ EnumName: "UpiFlagEnum",
+ }).then((res) => {
+ this.upiFlagEnum = res.result || [];
+ });
},
onLoad() {
this.operator = JSON.parse(uni.getStorageSync("userInfo")).name;
@@ -380,6 +392,10 @@
const name = this.areaCodeEnum.find((item) => item.value === value);
return name ? name.name : "";
},
+ getUpiFlagEnumName(value) {
+ const name = this.upiFlagEnum.find((item) => item.value === value);
+ return name ? name.name : "";
+ },
// 濡傛灉鎵撳紑涓�涓殑鏃跺�欙紝涓嶉渶瑕佸叧闂叾浠栵紝鍒欐棤闇�瀹炵幇鏈柟娉�
open(index) {
// 鍏堝皢姝ｅ湪琚搷浣滅殑swipeAction鏍囪涓烘墦寮�鐘舵�侊紝鍚﹀垯鐢变簬props鐨勭壒鎬ч檺鍒讹紝
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs
index 37a2e8c..c77a4e3 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs
@@ -687,7 +687,7 @@
throw Oops.Oh("鍙傛暟涓嶈兘涓虹┖");
}
- var singleUpi = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.UPI == input.Upi).FirstAsync();
+ var singleUpi = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.UPI == input.Upi || x.PackageCode == input.Upi).FirstAsync();
if (singleUpi == null)
{
throw Oops.Oh($"娌℃湁鎵惧埌閮ㄤ欢鏉＄爜{input.Upi}鐨勬暟鎹�");
@@ -700,7 +700,35 @@
}
var upiList = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.PackageCode == singleUpi.PackageCode).ToListAsync();
+ upiList = upiList.OrderBy(x => x.Shelf).ToList();
+ return upiList;
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁鏌愪釜Upi锛屾煡璇㈡澘浠舵暟鎹�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "QuerySingleUpiByUpi")]
+ [Description("WmsCommonnQuery/QuerySingleUpiByUpi")]
+ public async Task<List<Mes_BatchOrderUPI_New>> QuerySingleUpiByUpi(QueryUpiListByUpiInput input)
+ {
+ if (input == null || input.Upi == null)
+ {
+ throw Oops.Oh("鍙傛暟涓嶈兘涓虹┖");
+ }
+
+ var singleUpi = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.UPI == input.Upi).FirstAsync();
+ if (singleUpi == null)
+ {
+ throw Oops.Oh($"娌℃湁鎵惧埌閮ㄤ欢鏉＄爜{input.Upi}鐨勬暟鎹�");
+ }
+
+ List<Mes_BatchOrderUPI_New> upiList = new List<Mes_BatchOrderUPI_New>();
+ upiList.Add(singleUpi);
return upiList;
}
@@ -783,10 +811,10 @@
{
Time = 12 - i,
InWare = recordsOfDay
- // .Where(x => x.OrderType == OrderTypeEnum.涓婃灦鍗�)
+ // .Where(x => x.OrderType == OrderTypeEnum.涓婃灦鍗�)
.ToList().Count(),
OutWare = recordsOfDay
- // .Where(x => x.OrderType == OrderTypeEnum.涓嬫灦鍗�)
+ // .Where(x => x.OrderType == OrderTypeEnum.涓嬫灦鍗�)
.ToList().Count(),
StockNum = 0,
AveStockNum = 0,
@@ -803,8 +831,8 @@
DateTime all_startDate = GetStartOfWeek(currentDate).AddDays(-7 * 11);
DateTime all_endDate = GetEndOfWeek(currentDate);
var all_recordsOfDay = await _mesOrderGatherRep.AsQueryable().Where(r => r.CreateTime >= all_startDate && r.CreateTime <= all_endDate
- //&& (r.OrderStatus == OrderStatusEnum.宸插畬鎴�)
- //&& (r.OrderType == OrderTypeEnum.涓婃灦鍗� || r.OrderType == OrderTypeEnum.涓嬫灦鍗�)
+ //&& (r.OrderStatus == OrderStatusEnum.宸插畬鎴�)
+ //&& (r.OrderType == OrderTypeEnum.涓婃灦鍗� || r.OrderType == OrderTypeEnum.涓嬫灦鍗�)
).ToListAsync();
for (int i = 0; i < 12; i++)
@@ -841,8 +869,8 @@
DateTime all_startDate = currentDate.AddMonths(-11).AddDays(1 - currentDate.Day);
DateTime all_endDate = currentDate.AddMonths(1).AddDays(-1);
var all_recordsOfDay = await _mesOrderGatherRep.AsQueryable().Where(r => r.CreateTime >= all_startDate && r.CreateTime <= all_endDate
- //&& (r.OrderStatus == OrderStatusEnum.宸插畬鎴�)
- //&& (r.OrderType == OrderTypeEnum.涓婃灦鍗� || r.OrderType == OrderTypeEnum.涓嬫灦鍗�)
+ //&& (r.OrderStatus == OrderStatusEnum.宸插畬鎴�)
+ //&& (r.OrderType == OrderTypeEnum.涓婃灦鍗� || r.OrderType == OrderTypeEnum.涓嬫灦鍗�)
).ToListAsync();
for (int i = 0; i < 12; i++)
@@ -890,6 +918,6 @@
{
return startDate.AddDays(6); // 鍥犱负璧峰鏃ユ湡宸茬粡鏄懆涓�锛屾墍浠ョ洿鎺ュ姞6澶╁嵆鍙緱鍒板懆鏃�
}
-
+
}
--
Gitblit v1.9.3