计数:已操作的改个颜色

打印:两个二维码打到一个标签上,显示唯一码内容
货架入库:自动滚到最新数据,添加托盘信息
分解单据:不查找货架库库存
货架出库:添加导出excel
This commit is contained in:
zhougf committed 2024-04-29 16:21:44 +08:00
1 parent eacc0551a2
commit 5b1912ff07
8 files changed
+24558 -58

No files matched your search

@@ -54,38 +54,7 @@
qrcode: '',
num: 1,
clear: false,
template: {
"panels": [
{
"index": 0,
"height": 20,
"width": 30,
"paperHeader": 43.5,
"paperFooter": 56.69,
"printElements": [
{
"options": {
"left": 0,
"top": 2,
"height": 52,
"width": 81,
"title": "",
"field": "uniqueCode",
"testData": "",
"textType": "qrcode",
"barcodeMode": "CODE39"
},
"printElementType": {
"type": "text"
}
}
],
"paperNumberLeft": 55.5,
"paperNumberTop": 34.5,
"paperNumberDisabled": true
}
]
}
template: {"panels":[{"index":0,"height":25,"width":35,"paperHeader":43.5,"paperFooter":70.86614173228347,"printElements":[{"options":{"left":7.5,"top":0,"height":18,"width":86,"field":"code","testData":"A10209612024042800000001","fontFamily":"Microsoft YaHei"},"printElementType":{"type":"text"}},{"options":{"left":50,"top":20,"height":43,"width":48,"title":"123123","field":"batch","testData":"123123","textType":"qrcode"},"printElementType":{"type":"text"}},{"options":{"left":2,"top":20,"height":43,"width":48,"title":"123457","field":"qr","testData":"1231231","textType":"qrcode"},"printElementType":{"type":"text"}}],"paperNumberLeft":69,"paperNumberTop":48,"paperNumberDisabled":true}]}
}
},
methods: {
@@ -168,8 +137,8 @@
"UniqueCode": item.UniqueCode,
"Batch": item.Batch
});
_this.printData.push({ uniqueCode: item.UniqueCode });
_this.printData.push({ uniqueCode: item.Batch });
// _this.printData.push({ uniqueCode: item.UniqueCode });
// _this.printData.push({ uniqueCode: item.Batch });
});
}
@@ -188,9 +157,8 @@
var _this = this;
_this.printData = [];
this.invTable.forEach(function (item) {
_this.printData.push({ uniqueCode: item.UniqueCode });
_this.printData.push({ uniqueCode: item.Batch });
});;
_this.printData.push({ qr: item.UniqueCode,code: item.UniqueCode,batch: item.Batch });
});
// _this.gendCode = "";
hiprint.init();
var hiprintTemplate = new hiprint.PrintTemplate({
@@ -271,6 +271,7 @@ namespace HHWMS.Web.Controllers
if (receiptDetail != null)
{
receiptDetail.Qty = qty;
receiptDetail.Lot = "1";
receiptDetail.UpdateTime = DateTime.Now;
receiptDetail.UpdateBy = Wtm.LoginUserInfo.ITCode;
_unitwork.Update(receiptDetail);
@@ -95,6 +95,7 @@ public class ReceiptShelfInController : BaseController
invList.Add(new Inventory
{
ZoneCode = ZoneCodeEnum.货架库,
ContainerCode = item.BoxCode,
LocationCode = item.BoxCode,
UniqueCode = item.UniqueCode,
MaterialCode = receipt.MaterialCode,
@@ -3,7 +3,8 @@
<el-row id="count" :gutter="20">
<el-col :span="14">
<el-card class="box-card">
<el-table :data="tableData" height="450" border
<el-table :data="tableData" height="450"
border
style="width: 100%">
<el-table-column type="index"
width="50">
@@ -12,7 +13,13 @@
<el-table-column label="编码" align="center" prop="MaterialCode"></el-table-column>
<el-table-column label="规格型号" align="center" prop="MaterialSpec"></el-table-column>
<el-table-column label="批次" align="center" prop="Batch"></el-table-column>
<el-table-column label="数量" align="center" prop="Qty"></el-table-column>
<el-table-column label="数量" align="center" prop="Qty">
<template scope="scope">
<span v-if="scope.row.Lot == '1'" style="color:#37B328">{{ scope.row.Qty }}</span>
<span v-else>{{ scope.row.Qty }}</span>
</template>
</el-table-column>
<el-table-column label="Lot" align="center" prop="Lot" v-if="false"></el-table-column>
</el-table>
</el-card>
</el-col>
@@ -107,6 +114,7 @@ var app = new Vue({
return value.UniqueCode == _this.form.uniqueCode;
});
_this.tableData[isExit].Qty = qty;
_this.tableData[isExit].Lot = "1";
_this.$refs['form'].resetFields();
_this.qtyPlaceholder = "数量";
_this.$refs.uniqueCode.focus();
@@ -21,7 +21,9 @@
</el-col>
</el-row>
<el-table :data="bindingData" stripe max-height="450" border style="width: 100%">
<el-table :data="bindingData"
ref="tableData"
stripe max-height="450" border style="width: 100%">
<el-table-column type="index"
width="50">
</el-table-column>
@@ -170,6 +172,9 @@
bindQty: json.Data.Qty,
boxCode: _this.form.locationCode
});
_this.$nextTick(() => {
_this.$refs.tableData.bodyWrapper.scrollTop = _this.$refs.tableData.bodyWrapper.scrollHeight
})
}
},
error: function (json) {
@@ -3,28 +3,34 @@
<el-row id="shelfinv" :gutter="20">
<el-card class="box-card">
<el-table :data="tableData" max-height="600" border
style="width: 100%"
>
<el-table-column label="位置" align="center" prop="LocationCode"></el-table-column>
<el-table-column label="唯一码" width="220" align="center" prop="UniqueCode"></el-table-column>
<el-table-column label="编码" align="center" prop="MaterialCode"></el-table-column>
<el-table-column label="批次" align="center" prop="Batch"></el-table-column>
<el-table-column label="数量" align="center" prop="Qty"></el-table-column>
</el-table>
<el-table :data="tableData" max-height="600" border
style="width: 100%">
<el-table-column type="index"
width="50">
</el-table-column>
<el-table-column label="位置" align="center" prop="LocationCode"></el-table-column>
<el-table-column label="唯一码" width="220" align="center" prop="UniqueCode"></el-table-column>
<el-table-column label="编码" align="center" prop="MaterialCode"></el-table-column>
<el-table-column label="批次" align="center" prop="Batch"></el-table-column>
<el-table-column label="数量" align="center" prop="Qty"></el-table-column>
</el-table>
<el-row style="float:right">
<el-button type="primary" @@click="print">打印</el-button>
<el-button type="success" @@click="pick">全部拣货</el-button>
<el-button type="primary" @@click="print">打印</el-button>
<el-button @@click="toExcel">导出</el-button>
<el-button type="success" @@click="pick">全部拣货</el-button>
</el-row>
</el-card>
</el-row>
<script src="/lib/xlsx.js"></script>
<script>
Vue.prototype.XLSX = XLSX;
var str = "";
@{
<text>str = @Model.Entity.ID; </text>
<text>str = @Model.Entity.ID; </text>
}
var app = new Vue({
@@ -45,11 +51,34 @@
app.tableData = json.Data;
},
error: function (json) {
alert.log("加载失败");
layer.alert("加载失败");
}
});
},
methods: {
toExcel(){
// element-ui 导出excel
let tableData = [
['序号','位置', '唯一码','编码','批次', '数量']//导出表头
] // 表格表头
this.tableData.forEach ((item,index)=> {
let rowData = []
//导出内容的字段
rowData = [
index+1,
item.LocationCode,
item.UniqueCode,
item.MaterialCode,
item.Batch,
item.Qty,
]
tableData.push(rowData)
})
let ws = this.XLSX.utils.aoa_to_sheet(tableData)
let wb = this.XLSX.utils.book_new()
this.XLSX.utils.book_append_sheet(wb, ws, '货架库存') // 工作簿名称
this.XLSX.writeFile(wb, '货架库存.xlsx') // 保存的文件名
},
pick() {
var _this = this;
@@ -147,4 +176,5 @@
}
}
});
</script>
@@ -43,7 +43,8 @@ namespace HHWMS.Web
foreach (var shipmentDetail in shipmentDetails)
{
var inventorys = _unitwork.Find<Inventory>(x => x.UniqueCode == shipmentDetail.UniqueCode
&& x.TaskStatus == InventoryTaskStatus.无任务).ToList();
&& x.TaskStatus == InventoryTaskStatus.无任务
&& x.ZoneCode != ZoneCodeEnum.货架库).ToList();
if (inventorys.Count <= 0)
{
continue;
@@ -196,7 +197,7 @@ namespace HHWMS.Web
gLoc = _unitwork.Find<Location>(x => string.IsNullOrEmpty(x.ContainerCode)
&& x.Row == location.Row
&& x.Type.Equals(LocationTypeEnum.堆垛机工位)).FirstOrDefault();
if (gLoc != null)
{
// 工位为空,先判断是否有去此工位的任务
File diff suppressed because it is too large. Load diff