ICM-WCS/wcs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.界面调整

Browse Source 
2.按货架、物料、批次排序
3.物料绑定那里 货架未送走无法进行第二轮的呼叫
This commit is contained in:
hehaibing-1996
2025-03-05 18:49:45 +08:00
parent cc62a28ee7
commit cbde6165c2
5 changed files with 44 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PDA/PDA/pages/productionLineCallOut/productionLineCallOut.vue
View File

@ -723,7 +723,7 @@
}
.scroll-view {
height: 73.7vh;
height: 71vh;
}
.popup-content {

8
PDA/PDA/pages/queryBindList/queryBindList.vue
View File

@ -14,6 +14,10 @@
<label>物料名称：</label>
<text>{{fixedInfo.matName}}</text>
</view>
<view class="info-item">
<label>物料批次：</label>
<text>{{fixedInfo.matBatch}}</text>
</view>
<view class="info-item">
<label>物料规格：</label>
<text>{{fixedInfo.matSpec}}</text>
@ -132,6 +136,7 @@
matCode: '示例名称',
matName: '这是一段示例描述',
matSpec: '',
matBatch:'',
matQty: 0,
};
const popup = ref(null);
@ -141,6 +146,7 @@
fixedInfo.infoId = info.id;
fixedInfo.matCode = info.matCode;
fixedInfo.matName = info.matName;
fixedInfo.matBatch = info.matBatch;
fixedInfo.matSpec = info.matSpec;
fixedInfo.matQty = info.matQty;
@ -661,7 +667,7 @@
}
.button-group button {
margin-top: 20rpx;
margin-top: 25rpx;
padding: 10rpx 10rpx;
border: none;
border-radius: 5px;

26
PDA/PDA/unpackage/dist/dev/app-plus/app-service.js vendored
View File

@ -2816,6 +2816,7 @@ if (uni.restoreGlobal) {
matCode: "示例名称",
matName: "这是一段示例描述",
matSpec: "",
matBatch: "",
matQty: 0
};
const popup = vue.ref(null);
@ -2824,6 +2825,7 @@ if (uni.restoreGlobal) {
fixedInfo.infoId = info.id;
fixedInfo.matCode = info.matCode;
fixedInfo.matName = info.matName;
fixedInfo.matBatch = info.matBatch;
fixedInfo.matSpec = info.matSpec;
fixedInfo.matQty = info.matQty;
inputValue.value = info.matQty;
@ -2912,7 +2914,7 @@ if (uni.restoreGlobal) {
});
};
const deleteData = () => {
formatAppLog("log", "at pages/queryBindList/queryBindList.vue:245", "123");
formatAppLog("log", "at pages/queryBindList/queryBindList.vue:251", "123");
var serverIPAndPort = getServerIPAndPort();
uni.request({
url: "http://" + serverIPAndPort + "/matDetailCurrenInfo/deleteMatDetailCurrentInfo",
@ -2999,10 +3001,10 @@ if (uni.restoreGlobal) {
this.userName = getConfig("userName", "admin");
const self = this;
recive(function(res) {
formatAppLog("log", "at pages/queryBindList/queryBindList.vue:342", "Success:" + res.data);
formatAppLog("log", "at pages/queryBindList/queryBindList.vue:348", "Success:" + res.data);
self.analysisScanCode(res.data);
}, function(err) {
formatAppLog("log", "at pages/queryBindList/queryBindList.vue:345", "Error:", JSON.stringify(err));
formatAppLog("log", "at pages/queryBindList/queryBindList.vue:351", "Error:", JSON.stringify(err));
});
},
methods: {
@ -3010,11 +3012,11 @@ if (uni.restoreGlobal) {
cameraScanCode() {
uni.scanCode({
success: (res) => {
formatAppLog("log", "at pages/queryBindList/queryBindList.vue:353", "扫码结果:", res.result);
formatAppLog("log", "at pages/queryBindList/queryBindList.vue:359", "扫码结果:", res.result);
this.analysisScanCode(res.result);
},
fail: (err) => {
formatAppLog("error", "at pages/queryBindList/queryBindList.vue:357", "扫码失败:", err);
formatAppLog("error", "at pages/queryBindList/queryBindList.vue:363", "扫码失败:", err);
}
});
},
@ -3085,7 +3087,7 @@ if (uni.restoreGlobal) {
this.clear();
},
complete: (event) => {
formatAppLog("log", "at pages/queryBindList/queryBindList.vue:452", "请求完成", event);
formatAppLog("log", "at pages/queryBindList/queryBindList.vue:458", "请求完成", event);
}
});
},
@ -3160,7 +3162,7 @@ if (uni.restoreGlobal) {
this.clear();
},
complete: (event) => {
formatAppLog("log", "at pages/queryBindList/queryBindList.vue:537", "请求完成", event);
formatAppLog("log", "at pages/queryBindList/queryBindList.vue:543", "请求完成", event);
}
});
},
@ -3230,6 +3232,16 @@ if (uni.restoreGlobal) {
/* TEXT */
)
]),
vue.createElementVNode("view", { class: "info-item" }, [
vue.createElementVNode("label", null, "物料批次："),
vue.createElementVNode(
"text",
null,
vue.toDisplayString($setup.fixedInfo.matBatch),
1
/* TEXT */
)
]),
vue.createElementVNode("view", { class: "info-item" }, [
vue.createElementVNode("label", null, "物料规格："),
vue.createElementVNode(

15
WCS.BLL/Services/Service/PDAMatBindService.cs
View File

@ -51,8 +51,8 @@ namespace WCS.BLL.Services.Service
//获取当前工位的货架
var shelf = await DbHelp.db.Queryable<ShelfInfo>()
.Where(t => t.CurrentLocationId == endLocation.Id && t.TransStatus == TransStatusEnum.静止
|| t.DestinationLocationId == endLocation.Id && t.TransStatus == TransStatusEnum.运输中)//解决产线人员 呼叫后货架未到的时候绑定的问题
.Where(t => (t.CurrentLocationId == endLocation.Id)
|| (t.DestinationLocationId == endLocation.Id && t.TransStatus == TransStatusEnum.运输中))//解决产线人员 呼叫后货架未到的时候绑定的问题
.Where(t => t.IsEnable == true)
.FirstAsync();
if (shelf != null)
@ -67,7 +67,7 @@ namespace WCS.BLL.Services.Service
};
}
//运输中
else
else if(shelf.TransStatus == TransStatusEnum.运输中 && shelf.DestinationLocationId == endLocation.Id)
{
return new ResponseCommon()
{
@ -76,6 +76,15 @@ namespace WCS.BLL.Services.Service
Data = null,
};
}
else if (shelf.TransStatus == TransStatusEnum.运输中 && shelf.CurrentLocationId == endLocation.Id)
{
return new ResponseCommon()
{
Code = 205,
Message = $"当前货架【{shelf.ShelfCode}】未从工位拉走！\r\n等待拉走后进行绑定!",
Data = null,
};
}
}
#endregion

7
WCS.WebApi/Controllers/PDAProductionLineCallInController.cs
View File

@ -170,6 +170,9 @@ namespace WCS.WebApi.Controllers
//货架状态是静止的 代表这个货架没有被呼叫走哦
.LeftJoin<LocationInfo>((mci, si, li) => (si.TransStatus == TransStatusEnum.静止 && si.CurrentLocationId == li.Id))
.WhereIF(!string.IsNullOrEmpty(request.MatCodeCondition), (mci, si, li) => mci.MatCode.Contains(request.MatCodeCondition) || mci.MatName.Contains(request.MatCodeCondition))
.OrderBy((mci, si, li) => mci.ShelfCode)//排序规则
.OrderBy((mci, si, li) => mci.MatCode)
.OrderBy((mci, si, li) => mci.MatBatch)
.Select((mci, si, li) => new MatDetailCurrentInfoModel()
{
Id = mci.Id,
@ -197,8 +200,8 @@ namespace WCS.WebApi.Controllers
//分页
var totalCount = await recordsQueryable.CountAsync();
var records = await recordsQueryable
.OrderByDescending(mci => mci.Id)
.Skip((1 - 1) * 300).Take(300)
.Skip(0).Take(300)
.ToListAsync();
return new PageQueryResponse<MatDetailCurrentInfoModel>()
{