From d19f62e48b9653a1c1517fffd6883254714ef0a8 Mon Sep 17 00:00:00 2001 From: zgf Date: Thu, 11 Jan 2024 20:32:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=98=8E=E7=BB=86=E6=8B=86?= =?UTF-8?q?=E5=88=86=20=E9=93=81=E5=BF=83=E5=BA=93=E6=89=93=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Areas/Configs/Views/Print/Index.cshtml | 63 +++- .../Controllers/ReceiptDetail2Controller.cs | 68 ++++- .../Controllers/ReceiptHeader2Controller.cs | 3 +- .../Controllers/ShipmentHeader2Controller.cs | 5 +- .../XWMS/Controllers/XWMSPOHController.cs | 7 +- .../XWMS/Controllers/XWMSSHIPController.cs | 13 +- .../ReceiptDetail2VMs/ReceiptDetail2ListVM.cs | 2 + .../XWMS/Views/ReceiptDetail2/Create.cshtml | 2 - .../XWMS/Views/ReceiptDetail2/Print.cshtml | 285 ++++++++++++++++++ .../XWMS/Views/ReceiptHeader2/Index.cshtml | 2 +- .../Views/ShipmentHeader2/CreateOut.cshtml | 18 +- .../Areas/XWMS/Views/XWMSMFM/Index.cshtml | 12 +- .../Areas/XWMS/Views/XWMSPOH/Index.cshtml | 63 ++-- .../Areas/XWMS/Views/XWMSPTH/Index.cshtml | 5 + .../Areas/XWMS/Views/XWMSSHIP/Index.cshtml | 29 +- .../Areas/XWMS/Views/XWMSSOH/Index.cshtml | 5 + HHWMS.Web/DataContext.cs | 2 + HHWMS.Web/Models/XWMS/ReceiptDetail.cs | 2 +- HHWMS.Web/Models/XWMS/ShipmentDetail.cs | 4 +- HHWMS.Web/Resources/Program.zh.resx | 12 + HHWMS.Web/appsettings.json | 4 +- 21 files changed, 513 insertions(+), 93 deletions(-) create mode 100644 HHWMS.Web/Areas/XWMS/Views/ReceiptDetail2/Print.cshtml diff --git a/HHWMS.Web/Areas/Configs/Views/Print/Index.cshtml b/HHWMS.Web/Areas/Configs/Views/Print/Index.cshtml index 63f4a21..8ca1259 100644 --- a/HHWMS.Web/Areas/Configs/Views/Print/Index.cshtml +++ b/HHWMS.Web/Areas/Configs/Views/Print/Index.cshtml @@ -10,9 +10,16 @@ - - + + + + 20) { + ttt = this.lotList.slice(2); + } else { + ttt = this.lotList; + } + var tt = Array.from(new Set(ttt.map(JSON.stringify))).map(JSON.parse); + window.localStorage.setItem("lot", JSON.stringify(tt)); + this.lotList = JSON.parse(window.localStorage.getItem("lot")); + + _this.gendCode = _this.lot + '--' + _this.px; var pxName = ""; _this.pxList.forEach(function (item) { if (item.value == _this.px) pxName = item.label; }) - _this.printData.push({ - px: pxName, - lot: _this.lot, - qrcode: _this.gendCode - }); + // 设置参数方式 var qrcode = new QRCode(document.getElementById('qrcode'), { text: _this.gendCode, @@ -205,7 +232,21 @@ }, print() { var _this = this; - // _this.gendCode = ""; + _this.printData = []; + _this.pxList.forEach(function (item) { + if (item.value == _this.px) + pxName = item.label; + }) + var n = _this.num; + while (n > 0) { + _this.printData.push({ + px: pxName, + lot: _this.lot, + qrcode: _this.lot + '--' + _this.px + }); + n--; + } + hiprint.init(); var hiprintTemplate = new hiprint.PrintTemplate({ template: this.template @@ -216,7 +257,7 @@ //清空 _this.qrcode = ''; _this.num = 1; - } + }, } }); diff --git a/HHWMS.Web/Areas/XWMS/Controllers/ReceiptDetail2Controller.cs b/HHWMS.Web/Areas/XWMS/Controllers/ReceiptDetail2Controller.cs index 6b789d3..317dd4d 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/ReceiptDetail2Controller.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/ReceiptDetail2Controller.cs @@ -7,6 +7,7 @@ using WalkingTec.Mvvm.Core.Extensions; using HHWMS.Web; using HHWMS.Web.Models; using System.Linq; +using System.Collections.Generic; namespace HHWMS.Web.Controllers { @@ -137,7 +138,7 @@ namespace HHWMS.Web.Controllers } else { - return FFResult().CloseDialog().RefreshGridRow(vm.Entity.ID); + return FFResult().CloseDialog().RefreshGridRow((long)vm.Entity.ID); } } } @@ -192,7 +193,7 @@ namespace HHWMS.Web.Controllers { if (!ModelState.IsValid || !vm.DoBatchEdit()) { - return PartialView("BatchEdit",vm); + return PartialView("BatchEdit", vm); } else { @@ -216,7 +217,7 @@ namespace HHWMS.Web.Controllers { if (!ModelState.IsValid || !vm.DoBatchDelete()) { - return PartialView("BatchDelete",vm); + return PartialView("BatchDelete", vm); } else { @@ -226,7 +227,7 @@ namespace HHWMS.Web.Controllers #endregion #region Import - [ActionDescription("Sys.Import")] + [ActionDescription("Sys.Import")] public ActionResult Import() { var vm = Wtm.CreateVM(); @@ -258,9 +259,64 @@ namespace HHWMS.Web.Controllers #endregion [ActionDescription("Sys.Print")] - public ActionResult Print() + [FixConnection(CsName = "hangyong")] + public ActionResult Print(string id) { - return Ok(); + var dc = Wtm.CreateDC(cskey: "hangyong"); + Wtm.DC = dc; + var vm = Wtm.CreateVM(id); + return PartialView(vm); + } + + [ActionDescription("Sys.SearchDetail")] + [FixConnection(CsName = "hangyong")] + public ActionResult SearchDetail(int id) + { + var dc = Wtm.CreateDC(cskey: "hangyong"); + Wtm.DC = dc; + var data = dc.Set().Where(x => x.ID == id); + return JsonMore(data); + } + + [ActionDescription("Sys.ChaiDetail")] + [FixConnection(CsName = "hangyong")] + public ActionResult ChaiDetail(List data) + { + var dc = Wtm.CreateDC(cskey: "hangyong"); + Wtm.DC = dc; + var _unit = new UnitWork(Wtm); + + using (var tran = dc.BeginTransaction()) + { + try + { + var receipt = _unit.FindSingle(x => + x.MaterialCode == data.FirstOrDefault().MaterialCode + && x.Batch == data.FirstOrDefault().Batch); + if (receipt != null) + { + receipt.Qty = data.FirstOrDefault().Qty; + _unit.Update(receipt); + + var ll = new List(); + foreach (var item in data.Skip(1)) + { + var re = receipt; + re.ID = null; + re.Qty = item.Qty; + ll.Add(re); + } + _unit.BatchAdd(ll.ToArray()); + tran.Commit(); + } + } + catch (Exception ex) + { + tran.Rollback(); + return JsonMore(null, 500, ex.Message); + } + } + return JsonMore(null); } } } diff --git a/HHWMS.Web/Areas/XWMS/Controllers/ReceiptHeader2Controller.cs b/HHWMS.Web/Areas/XWMS/Controllers/ReceiptHeader2Controller.cs index 6b1b702..2a3da03 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/ReceiptHeader2Controller.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/ReceiptHeader2Controller.cs @@ -248,7 +248,7 @@ namespace HHWMS.Web.Controllers #endregion [HttpPost] - [ActionDescription("Sys.Create")] + [ActionDescription("Sys.Create3")] [FixConnection(CsName = "hangyong")] public ActionResult CreateDetail3(string px,string pxName, string lot, int num) { @@ -277,6 +277,7 @@ namespace HHWMS.Web.Controllers detail.WarehouseId = receipt.WarehouseId; detail.ReceiptId = receipt.ID; detail.ReceiptCode = receipt.Code; + detail.MaterialCode = lot; detail.MaterialName = pxName; detail.Lot = lot; detail.Project = $"{lot}--{px}"; diff --git a/HHWMS.Web/Areas/XWMS/Controllers/ShipmentHeader2Controller.cs b/HHWMS.Web/Areas/XWMS/Controllers/ShipmentHeader2Controller.cs index e18660a..b42f7a8 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/ShipmentHeader2Controller.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/ShipmentHeader2Controller.cs @@ -404,6 +404,7 @@ namespace HHWMS.Web.Controllers return JsonMore(null); } } + [ActionDescription("Sys.CheckInv")] [FixConnection(CsName = "hangyong")] public ActionResult CheckInv(string id) @@ -411,6 +412,7 @@ namespace HHWMS.Web.Controllers var vm = Wtm.CreateVM(id); return PartialView(vm); } + [ActionDescription("Sys.CheckInv")] [FixConnection(CsName = "hangyong")] public ActionResult CheckInvData(string str) @@ -427,11 +429,10 @@ namespace HHWMS.Web.Controllers var WmsQty = _unitwork.Find(x => x.MaterialCode == ship.MaterialCode - && x.Batch == ship.Batch && x.WarehouseId == int.Parse(warehouseId) ).Sum(x => x.Qty); - var sql = @"select * from QREQ3.XWMSSTOHYB where 1=1"; + var sql = @"select * from QRE.XWMSSTOHYB where 1=1"; sql += $" and LOC_0 = '{loc}' and ITMREF_0 = '{ship.MaterialCode}'"; // and LOT_0 = '{ship.Batch}' var data = OracleHelper.GetDataSet(sql).Tables[0]; diff --git a/HHWMS.Web/Areas/XWMS/Controllers/XWMSPOHController.cs b/HHWMS.Web/Areas/XWMS/Controllers/XWMSPOHController.cs index 3c9f3c9..7639ca8 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/XWMSPOHController.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/XWMSPOHController.cs @@ -14,7 +14,6 @@ namespace HHWMS.Web.Controllers; [Area("xwms")] [ActionDescription("采购订单")] -[Public] public class XWMSPOHController : BaseController { public XWMSPOHController() @@ -30,7 +29,7 @@ public class XWMSPOHController : BaseController } [ActionDescription("Sys.Search")] - public ActionResult Search(string address, string billno, string supply, string materialcode) + public ActionResult Search(string address, string ITMDES2_0, string billno, string supply, string materialcode) { var sql = @"select * from QRE.XWMSPOH where 1=1"; if (!string.IsNullOrEmpty(address)) @@ -49,6 +48,10 @@ public class XWMSPOHController : BaseController { sql += $"and ITMREF_0 like '%{materialcode}%'"; } + if (!string.IsNullOrEmpty(ITMDES2_0)) + { + sql += $"and ITMDES2_0 like '%{ITMDES2_0}%'"; + } var data = OracleHelper.GetDataSet(sql).Tables[0]; var list = data.AsEnumerable().Select diff --git a/HHWMS.Web/Areas/XWMS/Controllers/XWMSSHIPController.cs b/HHWMS.Web/Areas/XWMS/Controllers/XWMSSHIPController.cs index 8cd79e2..c39b52c 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/XWMSSHIPController.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/XWMSSHIPController.cs @@ -33,7 +33,7 @@ public class XWMSSHIPController : BaseController [ActionDescription("Sys.Search")] [FixConnection(CsName = "hangyong")] - public ActionResult Search(string address, string billno, string sbill, string materialcode) + public ActionResult Search(string address, string billno, string ITMDES2_0, string sbill, string materialcode) { var _unitwork = new UnitWork(Wtm); @@ -54,7 +54,10 @@ public class XWMSSHIPController : BaseController { sql += $"and ITMREF_0 like '%{materialcode}%'"; } - + if (!string.IsNullOrEmpty(ITMDES2_0)) + { + sql += $"and ITMDES2_0 like '%{ITMDES2_0}%'"; + } var data = OracleHelper.GetDataSet(sql).Tables[0]; var codeList = data.AsEnumerable().Select(x => x.Field("ITMREF_0")).ToHashSet(); @@ -80,7 +83,7 @@ public class XWMSSHIPController : BaseController POPLIN_0 = x.Field("POPLIN_0"), LOT_0 = x.Field("LOT_0"), QTYSTU_0 = x.Field("QTYSTU_0"), - STATUS = matList.FirstOrDefault(y => y.Code == x.Field("ITMREF_0"))?.ClassA + STATUS = matList.FirstOrDefault(y => y.Code == x.Field("ITMREF_0"))?.ClassA ?? "" } ).ToList(); @@ -117,6 +120,10 @@ public class XWMSSHIPController : BaseController var detailList = new List(); foreach (var item in data) { + if (string.IsNullOrEmpty(item.STATUS)){ + tran.Rollback(); + return JsonMore(null, 500, $"状态不能为空!"); + } var qr = _unitwork.FindSingle(x => x.Code == item.ITMREF_0 && x.Batch == item.LOT_0 diff --git a/HHWMS.Web/Areas/XWMS/ViewModels/ReceiptDetail2VMs/ReceiptDetail2ListVM.cs b/HHWMS.Web/Areas/XWMS/ViewModels/ReceiptDetail2VMs/ReceiptDetail2ListVM.cs index 3340379..67e824e 100644 --- a/HHWMS.Web/Areas/XWMS/ViewModels/ReceiptDetail2VMs/ReceiptDetail2ListVM.cs +++ b/HHWMS.Web/Areas/XWMS/ViewModels/ReceiptDetail2VMs/ReceiptDetail2ListVM.cs @@ -33,6 +33,8 @@ namespace HHWMS.Web this.MakeStandardAction("ReceiptDetail2", GridActionStandardTypesEnum.Import, Localizer["Sys.Import"], "xwms", dialogWidth: 800), this.MakeStandardAction("ReceiptDetail2", GridActionStandardTypesEnum.ExportExcel, Localizer["Sys.Export"], "xwms"), this.MakeAction("ReceiptDetail2","Print",Localizer["Sys.Print"],Localizer["Sys.Print"],GridActionParameterTypesEnum.SingleId,"xwms") + .SetMax().SetShowInRow().SetButtonClass("layui-btn-Warm"), + this.MakeAction("ReceiptDetail2","Prints",Localizer["Sys.Prints"],Localizer["Sys.Prints"],GridActionParameterTypesEnum.MultiIds,"xwms") .SetShowDialog(false).SetOnClickScript("print"), }; } diff --git a/HHWMS.Web/Areas/XWMS/Views/ReceiptDetail2/Create.cshtml b/HHWMS.Web/Areas/XWMS/Views/ReceiptDetail2/Create.cshtml index 1988923..30a3efe 100644 --- a/HHWMS.Web/Areas/XWMS/Views/ReceiptDetail2/Create.cshtml +++ b/HHWMS.Web/Areas/XWMS/Views/ReceiptDetail2/Create.cshtml @@ -29,8 +29,6 @@ diff --git a/HHWMS.Web/Areas/XWMS/Views/ReceiptHeader2/Index.cshtml b/HHWMS.Web/Areas/XWMS/Views/ReceiptHeader2/Index.cshtml index 933b2e8..36a16ca 100644 --- a/HHWMS.Web/Areas/XWMS/Views/ReceiptHeader2/Index.cshtml +++ b/HHWMS.Web/Areas/XWMS/Views/ReceiptHeader2/Index.cshtml @@ -172,7 +172,7 @@ code: value.MaterialCode, batch: value.Batch, qty: value.Qty, - qrcode: 'MT.' + value.MaterialCode + '@@@@LT.' + value.Batch + qrcode: 'MT.' + value.MaterialCode + '@@@@LT.' + value.Batch + '@@@@QT.' + value.Qty }) }); diff --git a/HHWMS.Web/Areas/XWMS/Views/ShipmentHeader2/CreateOut.cshtml b/HHWMS.Web/Areas/XWMS/Views/ShipmentHeader2/CreateOut.cshtml index 51aa571..2fdb647 100644 --- a/HHWMS.Web/Areas/XWMS/Views/ShipmentHeader2/CreateOut.cshtml +++ b/HHWMS.Web/Areas/XWMS/Views/ShipmentHeader2/CreateOut.cshtml @@ -97,7 +97,7 @@
- +
{{scope.row.ThisQty}}
@@ -231,21 +231,11 @@ cell.querySelector('.item__input').style.display = 'none' cell.querySelector('.item__txt').style.display = 'block' } - if (property == "THISQTYSTU") { - // 库存单位除以系数 - if (row.THISQTYSTU > row.QTYSTU_0) { - row.THISQTYSTU = row.QTYSTU_0; - this.$message.error("不能超出单据数量"); - } - else { - row.THISQTYUOM = row.THISQTYSTU / row.UOMSTUCOE_0; - } - } if (property == "ThisQty") { // 库存单位除以系数 - if (row.THISQTYSTU > row.QTY) { - row.THISQTYSTU = row.QTY; - layer.alert("不能超出单据数量!!", { icon: 5, shadeClose: true, title: "错误信息" }); + if (row.ThisQty > row.QTY) { + row.ThisQty = row.QTY; + layer.alert("不能超出库存数量!!", { icon: 5, shadeClose: true, title: "错误信息" }); } } }, diff --git a/HHWMS.Web/Areas/XWMS/Views/XWMSMFM/Index.cshtml b/HHWMS.Web/Areas/XWMS/Views/XWMSMFM/Index.cshtml index 27c7eb5..d291299 100644 --- a/HHWMS.Web/Areas/XWMS/Views/XWMSMFM/Index.cshtml +++ b/HHWMS.Web/Areas/XWMS/Views/XWMSMFM/Index.cshtml @@ -65,6 +65,8 @@ size="small" ref="tableData" v-loading="loading" + :highlight-current-row="true" + @@row-click="handleClickTableRow" @@cell-mouse-enter="handleCellEnter" @@cell-mouse-leave="handleCellLeave" @@selection-change="handleSelectionChange"> @@ -135,11 +137,8 @@ label: '不管理' }], addressList: [{ - value: 'QDB', - label: 'QDB' - }, { - value: 'SBD', - label: 'SBD' + value: 'HYB', + label: 'HYB' }], loading: false, tableData: [], @@ -209,6 +208,9 @@ handleSelectionChange(val) { this.multipleSelection = val; }, + handleClickTableRow(row) { + this.$refs.tableData.toggleRowSelection(row) + }, search() { var _this = this; _this.loading = true; diff --git a/HHWMS.Web/Areas/XWMS/Views/XWMSPOH/Index.cshtml b/HHWMS.Web/Areas/XWMS/Views/XWMSPOH/Index.cshtml index d71b0f2..4f564ce 100644 --- a/HHWMS.Web/Areas/XWMS/Views/XWMSPOH/Index.cshtml +++ b/HHWMS.Web/Areas/XWMS/Views/XWMSPOH/Index.cshtml @@ -187,6 +187,9 @@ + + + @@ -198,6 +201,8 @@ size="small" ref="tableData" v-loading="loading" + :highlight-current-row="true" + @@row-click="handleClickTableRow" @@cell-mouse-enter="handleCellEnter" @@cell-mouse-leave="handleCellLeave" @@selection-change="handleSelectionChange"> @@ -207,31 +212,16 @@ - + @* *@ @* *@ - - - - - - - - - - -
- -
{{scope.row.THISQTYUOM}}
-
-
@@ -250,7 +240,21 @@
{{foodLabel(scope.row.STA_0)}}
+ + +
+ +
{{scope.row.THISQTYUOM}}
+
+
+ + + + + + + @@ -276,7 +280,8 @@ address: 'HYB', billno: '', supply: '', - materialcode: '' + materialcode: '', + ITMDES2_0:'' }, addressList: [{ value: 'HYB', @@ -298,7 +303,7 @@ total: 20, // 总条数 pageSize: 20, // 每页的数据条数 // 需要编辑的属性 - editProp: ['THISQTYUOM', 'THISQTYSTU', 'STA_0'], + editProp: ['THISQTYSTU', 'STA_0'], multipleSelection: [] }; }, @@ -344,23 +349,11 @@ } if (property == "THISQTYSTU") { // 库存单位除以系数 - if (row.THISQTYSTU > row.QTYSTU_0) { - row.THISQTYSTU = row.QTYSTU_0; - this.$message.error("不能超出单据数量"); - } - else { - row.THISQTYUOM = row.THISQTYSTU / row.UOMSTUCOE_0; - } + row.THISQTYUOM = row.THISQTYSTU / row.UOMSTUCOE_0; } if (property == "THISQTYUOM") { // 采购单位 乘 系数 - if (row.THISQTYUOM > row.QTYUOM_0) { - row.THISQTYUOM = row.QTYUOM_0; - this.$message.error("不能超出单据数量"); - } - else { - row.THISQTYSTU = row.THISQTYUOM * row.UOMSTUCOE_0; - } + row.THISQTYSTU = row.THISQTYUOM * row.UOMSTUCOE_0; } }, //每页条数改变时触发 选择一页显示多少行 @@ -375,6 +368,9 @@ handleSelectionChange(val) { this.multipleSelection = val; }, + handleClickTableRow(row) { + this.$refs.tableData.toggleRowSelection(row) + }, search() { var _this = this; _this.loading = true; @@ -385,7 +381,8 @@ address: _this.form.address, billno: _this.form.billno, supply: _this.form.supply, - materialcode: _this.form.materialcode + materialcode: _this.form.materialcode, + ITMDES2_0 : _this.form.ITMDES2_0 }, url: "/xwms/XWMSPOH/Search", success: function (json) { diff --git a/HHWMS.Web/Areas/XWMS/Views/XWMSPTH/Index.cshtml b/HHWMS.Web/Areas/XWMS/Views/XWMSPTH/Index.cshtml index 4136f97..3581d21 100644 --- a/HHWMS.Web/Areas/XWMS/Views/XWMSPTH/Index.cshtml +++ b/HHWMS.Web/Areas/XWMS/Views/XWMSPTH/Index.cshtml @@ -58,6 +58,8 @@ size="small" ref="tableData" v-loading="loading" + :highlight-current-row="true" + @@row-click="handleClickTableRow" @@cell-mouse-enter="handleCellEnter" @@cell-mouse-leave="handleCellLeave" @@selection-change="handleSelectionChange"> @@ -194,6 +196,9 @@ handleSelectionChange(val) { this.multipleSelection = val; }, + handleClickTableRow(row) { + this.$refs.tableData.toggleRowSelection(row) + }, search() { var _this = this; _this.loading = true; diff --git a/HHWMS.Web/Areas/XWMS/Views/XWMSSHIP/Index.cshtml b/HHWMS.Web/Areas/XWMS/Views/XWMSSHIP/Index.cshtml index d378e5b..afdcdfd 100644 --- a/HHWMS.Web/Areas/XWMS/Views/XWMSSHIP/Index.cshtml +++ b/HHWMS.Web/Areas/XWMS/Views/XWMSSHIP/Index.cshtml @@ -45,6 +45,9 @@ + + + @@ -54,13 +57,15 @@ size="small" ref="tableData" v-loading="loading" + :highlight-current-row="true" + @@row-click="handleClickTableRow" @@cell-mouse-enter="handleCellEnter" @@cell-mouse-leave="handleCellLeave" @@selection-change="handleSelectionChange"> - + @* *@ @* *@ @@ -69,8 +74,6 @@ - - @@ -86,6 +89,8 @@
{{foodLabel(scope.row.STATUS)}}
+ + @@ -111,13 +116,18 @@ address: 'HYB', billno: '', sbill: '', - materialcode: '' + materialcode: '', + ITMDES2_0:'' }, addressList: [{ value: 'HYB', label: 'HYB' }], - options: [{ + options: [ + { + value: '', + label: '请选择' + }, { value: 'A', label: 'A' }, { @@ -189,6 +199,9 @@ handleSelectionChange(val) { this.multipleSelection = val; }, + handleClickTableRow(row) { + this.$refs.tableData.toggleRowSelection(row) + }, search() { var _this = this; _this.loading = true; @@ -199,7 +212,8 @@ address: _this.form.address, billno: _this.form.billno, sbill: _this.form.sbill, - materialcode: _this.form.materialcode + materialcode: _this.form.materialcode, + ITMDES2_0: _this.form.ITMDES2_0 }, url: "/xwms/XWMSSHIP/Search", success: function (json) { @@ -214,7 +228,7 @@ }, create() { var _this = this; - _this.$confirm('注意:您确认要对此单据进行创建采购入库吗?', '提示', { + _this.$confirm('注意:您确认要对此单据进行创建内部收货吗?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' @@ -236,7 +250,6 @@ tmp.push(x.SDHNUM_0) } }); - console.log(tmp, _this.multipleSelection) if (tmp.length != _this.multipleSelection.length) { _this.$message.error("一张收货单必须全部收完!"); return; diff --git a/HHWMS.Web/Areas/XWMS/Views/XWMSSOH/Index.cshtml b/HHWMS.Web/Areas/XWMS/Views/XWMSSOH/Index.cshtml index 09f5deb..e23adcd 100644 --- a/HHWMS.Web/Areas/XWMS/Views/XWMSSOH/Index.cshtml +++ b/HHWMS.Web/Areas/XWMS/Views/XWMSSOH/Index.cshtml @@ -55,6 +55,8 @@ size="small" ref="tableData" v-loading="loading" + :highlight-current-row="true" + @@row-click="handleClickTableRow" @@cell-mouse-enter="handleCellEnter" @@cell-mouse-leave="handleCellLeave" @@selection-change="handleSelectionChange"> @@ -177,6 +179,9 @@ handleSelectionChange(val) { this.multipleSelection = val; }, + handleClickTableRow(row) { + this.$refs.tableData.toggleRowSelection(row) + }, search() { var _this = this; _this.loading = true; diff --git a/HHWMS.Web/DataContext.cs b/HHWMS.Web/DataContext.cs index d10973a..a440474 100644 --- a/HHWMS.Web/DataContext.cs +++ b/HHWMS.Web/DataContext.cs @@ -64,6 +64,8 @@ namespace HHWMS.Web public DbSet Suppliers { get; set; } public DbSet Material2s { get; set; } public DbSet Inventory2s { get; set; } + public DbSet MaterialQr2s { get; set; } + public override async Task DataInit(object allModules, bool IsSpa) { var state = await base.DataInit(allModules, IsSpa); diff --git a/HHWMS.Web/Models/XWMS/ReceiptDetail.cs b/HHWMS.Web/Models/XWMS/ReceiptDetail.cs index 5560661..dd1d0e4 100644 --- a/HHWMS.Web/Models/XWMS/ReceiptDetail.cs +++ b/HHWMS.Web/Models/XWMS/ReceiptDetail.cs @@ -13,7 +13,7 @@ namespace HHWMS.Web.Models { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] - public new int ID { get; set; } + public new int? ID { get; set; } /// /// 仓库Id diff --git a/HHWMS.Web/Models/XWMS/ShipmentDetail.cs b/HHWMS.Web/Models/XWMS/ShipmentDetail.cs index 070895e..f9bac8e 100644 --- a/HHWMS.Web/Models/XWMS/ShipmentDetail.cs +++ b/HHWMS.Web/Models/XWMS/ShipmentDetail.cs @@ -168,7 +168,7 @@ namespace HHWMS.Web.Models /// 已出数量 /// [Column("qtyCompleted")] - public decimal? QtyCompleted { get; set; } + public decimal? QtyCompleted { get; set; } = 0; /// /// 单位 @@ -222,7 +222,7 @@ namespace HHWMS.Web.Models /// 已分配数量 /// [Column("qtyDivided")] - public decimal? QtyDivided { get; set; } + public decimal? QtyDivided { get; set; } = 0; /// /// 需求地点 diff --git a/HHWMS.Web/Resources/Program.zh.resx b/HHWMS.Web/Resources/Program.zh.resx index fec0802..952c50b 100644 --- a/HHWMS.Web/Resources/Program.zh.resx +++ b/HHWMS.Web/Resources/Program.zh.resx @@ -1479,4 +1479,16 @@ 备注 + + 批量打印 + + + 其他出库 + + + 存货转移 + + + ERP对账 + diff --git a/HHWMS.Web/appsettings.json b/HHWMS.Web/appsettings.json index 333f19a..5c77b4a 100644 --- a/HHWMS.Web/appsettings.json +++ b/HHWMS.Web/appsettings.json @@ -24,13 +24,13 @@ "Connections": [ { "Key": "default", - "Value": "Server=172.16.12.212;Port=3306;Database=wms;Uid=root;Password=abc123*;Character Set=utf8mb4;", + "Value": "Server=127.0.0.1;Port=3306;Database=8357wms;Uid=root;Password=abc123*;Character Set=utf8mb4;", "DbContext": "DataContext", "DBType": "mysql" }, { "Key": "hangyong", - "Value": "Server=172.16.12.212;Port=3306;Database=hangyongwms;Uid=root;Password=abc123*;Character Set=utf8mb4;", + "Value": "Server=127.0.0.1;Port=3306;Database=hangtongwms2;Uid=root;Password=abc123*;Character Set=utf8mb4;", "DbContext": "DataContext", "DBType": "mysql" }