From fa7b5814ba52a2e9c5da482555adc989a3d8c98a Mon Sep 17 00:00:00 2001 From: zgf Date: Wed, 10 Jan 2024 16:03:55 +0800 Subject: [PATCH] 3 --- .../Areas/Configs/Views/Print/Index.cshtml | 215 ++++++---- .../Controllers/ReceiptDetail2Controller.cs | 5 +- .../Controllers/ReceiptHeader2Controller.cs | 56 +++ .../Controllers/ShipmentDetail2Controller.cs | 2 +- .../Controllers/ShipmentHeader2Controller.cs | 263 +++++++++++- .../XWMS/Controllers/XWMSMFMController.cs | 3 +- .../XWMS/Controllers/XWMSPOHController.cs | 5 +- .../XWMS/Controllers/XWMSPTHController.cs | 5 +- .../XWMS/Controllers/XWMSSHIPController.cs | 24 +- .../XWMS/Controllers/XWMSSOHController.cs | 5 +- .../Material2VMs/Material2ListVM.cs | 1 + .../ShipmentDetail2ListVM.cs | 3 + .../ShipmentHeader2ListVM.cs | 5 +- .../XWMS/Views/ReceiptDetail2/Create.cshtml | 14 +- .../Views/ShipmentHeader2/CheckInv.cshtml | 117 ++++++ .../Views/ShipmentHeader2/CreateMove.cshtml | 380 +++++++++++++++--- .../Views/ShipmentHeader2/CreateOut.cshtml | 23 +- HHWMS.Web/Models/XWMS/Material.cs | 1 + HHWMS.Web/Models/XWMS/ReceiptDetail.cs | 4 +- HHWMS.Web/Models/XWMS/ShipmentDetail.cs | 2 +- HHWMS.Web/Models/XWMS/XWMSSTOHYB.cs | 20 + HHWMS.Web/appsettings.json | 4 +- 22 files changed, 989 insertions(+), 168 deletions(-) create mode 100644 HHWMS.Web/Areas/XWMS/Views/ShipmentHeader2/CheckInv.cshtml create mode 100644 HHWMS.Web/Models/XWMS/XWMSSTOHYB.cs diff --git a/HHWMS.Web/Areas/Configs/Views/Print/Index.cshtml b/HHWMS.Web/Areas/Configs/Views/Print/Index.cshtml index 7ddf5b7..63f4a21 100644 --- a/HHWMS.Web/Areas/Configs/Views/Print/Index.cshtml +++ b/HHWMS.Web/Areas/Configs/Views/Print/Index.cshtml @@ -1,27 +1,36 @@ - - + + + + + + + + - + + placeholder="数量"> 生成 + + 创建入库单 +
- @* 富文本 *@ - - + +
打印
@@ -30,46 +39,96 @@ el: "#print", data() { return { + pxList:[ + { + value: '1', + label: '上轭片' + }, { + value: '2', + label: '下轭片' + }, { + value: '3', + label: 'A柱片' + }, { + value: '4', + label: 'B柱片' + }, { + value: '5', + label: 'C柱片' + } + ], printData:[], gendCode: '', - qrcode: '', + px: '', + lot:'', 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": 50, "width": 80, "paperHeader": 43.5, "paperFooter": 141.73228346456693, "printElements": [{ "options": { "left": 96, "top": 19.5, "height": 87, "width": 120, "field": "qrcode", "testData": "12312312312", "textType": "qrcode" }, "printElementType": { "type": "text" } }, { "options": { "left": 16.5, "top": 24, "height": 25.5, "width": 69, "field": "px", "testData": "123123", "textAlign": "center", "textContentVerticalAlign": "middle" }, "printElementType": { "type": "text" } }, { "options": { "left": 16.5, "top": 67.5, "height": 24, "width": 67.5, "field": "lot", "testData": "1231231", "textAlign": "center", "textContentVerticalAlign": "middle" }, "printElementType": { "type": "text" } }], "paperNumberLeft": 196.5, "paperNumberTop": 118.5, "paperNumberDisabled": true }] } } }, methods: { + create() { + var _this = this; + if (_this.px == "") { + _this.$message({ + message: "请选择片型!", + type: "warning", + duration: "500", + }); + return; + } + if (_this.lot == "") { + _this.$message({ + message: "请输入型号!", + type: "warning", + duration: "500", + }); + return; + } + if (_this.num <= 0) { + _this.$message({ + message: "数量要大于0!", + type: "warning", + duration: "500", + }); + return; + } + var pxName = ""; + _this.pxList.forEach(function (item) { + if (item.value == _this.px) + pxName = item.label; + }) + // 调用后台方法,判断是否在物料表内 + $.ajax({ + type: "post", + dataType: "json", + data: { px: _this.px, pxName: pxName, lot: _this.lot, num: _this.num }, + url: "/xwms/ReceiptHeader2/CreateDetail3", + success: function (json) { + if (json.Code != 200) { + _this.$message({ + message: "创建失败!" + json.Msg, + type: "warning", + duration: "10000", + }); + return; + } else { + _this.$message({ + message: "创建成功!" + }); + _this.gendCode = ""; + _this.printData = []; + } + }, + error: function (json) { + _this.$message({ + message: "创建失败!", + type: "error", + duration: "10000", + }); + }, + }); + }, scanCode() { var _this = this; // 调用后台方法,判断是否在物料表内 @@ -103,57 +162,46 @@ }, genCode() { var _this = this; - if (_this.qrcode == "") { + if (_this.px == "") { _this.$message({ - message: "请扫描二维码后再操作!", + message: "请选择片型!", type: "warning", duration: "500", }); return; } - if (_this.num == "") { + if (_this.lot == "") { _this.$message({ - message: "请输入数量后再操作!", + message: "请输入型号!", type: "warning", duration: "500", }); return; } - // 调用后台方法,生成唯一码,(流水号) - $.ajax({ - type: "post", - dataType: "json", - data: { code: _this.qrcode, num: _this.num }, - url: "/configs/Print/GenCode", - success: function (json) { - if (json.Code != 200) { - _this.$message({ - message: "生成失败!" + json.Msg, - type: "warning", - duration: "10000", - }); - return; - } - else{ - // console.log(json); - json.Data.forEach(function (item) { - _this.gendCode += item.UniqueCode + '\n'; - _this.gendCode += item.Batch + '\n'; - _this.printData.push({ uniqueCode: item.UniqueCode }); - _this.printData.push({ uniqueCode: item.Batch }); - }); - - } - }, - error: function (json) { - _this.$message({ - message: "生成失败!", - type: "error", - duration: "10000", - }); - }, + _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 }); - _this.num = 1; + // 设置参数方式 + var qrcode = new QRCode(document.getElementById('qrcode'), { + text: _this.gendCode, + width: 256, + height: 256, + colorDark: '#000000', + colorLight: '#ffffff', + correctLevel: QRCode.CorrectLevel.H + }); + + // 使用 API + qrcode.clear(); + qrcode.makeCode(_this.gendCode); }, print() { var _this = this; @@ -171,4 +219,5 @@ } } }); + diff --git a/HHWMS.Web/Areas/XWMS/Controllers/ReceiptDetail2Controller.cs b/HHWMS.Web/Areas/XWMS/Controllers/ReceiptDetail2Controller.cs index 4207b81..6b789d3 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/ReceiptDetail2Controller.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/ReceiptDetail2Controller.cs @@ -92,8 +92,9 @@ namespace HHWMS.Web.Controllers vm.Entity.SourceLine = (detailList.Count() + 1).ToString(); vm.Entity.Status = 0; var mater = dc.Set() - .FirstOrDefault(x => x.Code == vm.Entity.MaterialCode); - vm.Entity.MaterialCode = mater?.Name; + .FirstOrDefault(x => x.ID == int.Parse(vm.Entity.MaterialCode)); + vm.Entity.MaterialCode = mater?.Code; + vm.Entity.Unit = mater?.MasterUnit; vm.Entity.Batch = vm.Entity.Batch = _unitwork.GetSerialNumber("HYB", 5).Remove(3, 2); vm.DoAdd(); if (!ModelState.IsValid) diff --git a/HHWMS.Web/Areas/XWMS/Controllers/ReceiptHeader2Controller.cs b/HHWMS.Web/Areas/XWMS/Controllers/ReceiptHeader2Controller.cs index 2806edc..6b1b702 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/ReceiptHeader2Controller.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/ReceiptHeader2Controller.cs @@ -7,6 +7,7 @@ using WalkingTec.Mvvm.Core.Extensions; using HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs; using HHWMS.Web.Models; using System.Linq; +using System.Collections.Generic; namespace HHWMS.Web.Controllers { @@ -246,5 +247,60 @@ namespace HHWMS.Web.Controllers } #endregion + [HttpPost] + [ActionDescription("Sys.Create")] + [FixConnection(CsName = "hangyong")] + public ActionResult CreateDetail3(string px,string pxName, string lot, int num) + { + var warehouseId = Wtm.LoginUserInfo.Groups.FirstOrDefault().GroupCode; + var dc = Wtm.CreateDC(cskey: "hangyong"); + + using (var tran = dc.BeginTransaction()) + { + try + { + Wtm.DC = dc; + var _unit = new UnitWork(Wtm); + var receipt = new ReceiptHeader2(); + receipt.WarehouseId = int.Parse(warehouseId); + receipt.Code = _unitwork.GetSerialNumber("10"); + receipt.Type = "10"; + receipt.FirstStatus = 0; + receipt.LastStatus = 0; + + _unit.Add(receipt); + + var detailList = new List(); + while(num > 0) + { + var detail = new ReceiptDetail2(); + detail.WarehouseId = receipt.WarehouseId; + detail.ReceiptId = receipt.ID; + detail.ReceiptCode = receipt.Code; + detail.MaterialName = pxName; + detail.Lot = lot; + detail.Project = $"{lot}--{px}"; + detail.Qty = 1; + detail.Status = 0; + detail.CreateTime = DateTime.Now; + detailList.Add(detail); + num--; + } + _unit.BatchAdd(detailList.ToArray()); + + receipt.TotalLines = detailList.Count(); + receipt.TotalQty = detailList.Sum(x => x.Qty); + _unit.Update(receipt); + + tran.Commit(); + } + catch (Exception ex) + { + tran.Rollback(); + return JsonMore(null, 500, ex.Message); + } + } + return JsonMore(null); + } } } diff --git a/HHWMS.Web/Areas/XWMS/Controllers/ShipmentDetail2Controller.cs b/HHWMS.Web/Areas/XWMS/Controllers/ShipmentDetail2Controller.cs index 8e2883e..e1763fc 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/ShipmentDetail2Controller.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/ShipmentDetail2Controller.cs @@ -123,7 +123,7 @@ namespace HHWMS.Web.Controllers } else { - return FFResult().CloseDialog().RefreshGridRow(vm.Entity.ID); + return FFResult().CloseDialog().RefreshGridRow((long)vm.Entity.ID); } } } diff --git a/HHWMS.Web/Areas/XWMS/Controllers/ShipmentHeader2Controller.cs b/HHWMS.Web/Areas/XWMS/Controllers/ShipmentHeader2Controller.cs index 4a5f48a..e18660a 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/ShipmentHeader2Controller.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/ShipmentHeader2Controller.cs @@ -9,6 +9,8 @@ using System.Linq; using System.Data; using HHWMS.Web.Models; using System.Collections.Generic; +using System.Web; +using NPOI.SS.Formula.Functions; namespace HHWMS.Web.Controllers { @@ -169,7 +171,7 @@ namespace HHWMS.Web.Controllers { if (!ModelState.IsValid || !vm.DoBatchEdit()) { - return PartialView("BatchEdit",vm); + return PartialView("BatchEdit", vm); } else { @@ -193,7 +195,7 @@ namespace HHWMS.Web.Controllers { if (!ModelState.IsValid || !vm.DoBatchDelete()) { - return PartialView("BatchDelete",vm); + return PartialView("BatchDelete", vm); } else { @@ -203,7 +205,7 @@ namespace HHWMS.Web.Controllers #endregion #region Import - [ActionDescription("Sys.Import")] + [ActionDescription("Sys.Import")] public ActionResult Import() { var vm = Wtm.CreateVM(); @@ -239,11 +241,61 @@ namespace HHWMS.Web.Controllers { return PartialView("CreateOut"); } - [ActionDescription("Sys.SearchInv")] + [ActionDescription("Sys.CreateOut")] [FixConnection(CsName = "hangyong")] public ActionResult CreateOutBill(string tran, List data) { - return JsonMore(null); + var warehouseId = Wtm.LoginUserInfo.Groups.FirstOrDefault().GroupCode; + var _unitwork = new UnitWork(Wtm); + var dc = Wtm.CreateDC(cskey: "hangyong"); + + using (var trans = dc.BeginTransaction()) + { + try + { + var shipment = new ShipmentHeader2(); + shipment.WarehouseId = int.Parse(warehouseId); + shipment.Code = _unitwork.GetSerialNumber("QTC"); + shipment.UserDef1 = "HYB"; + shipment.UserDef4 = tran; + shipment.Type = "QTC"; + shipment.FirstStatus = 0; + shipment.LastStatus = 0; + + _unitwork.Add(shipment); + + var detailList = new List(); + foreach (var item in data) + { + var detail = new ShipmentDetail2(); + detail.WarehouseId = shipment.WarehouseId; + detail.ShipmentId = shipment.ID; + detail.ShipmentCode = shipment.Code; + detail.MaterialCode = item.MaterialCode; + detail.MaterialName = item.MaterialName; + detail.Lot = item.Lot; + detail.Qty = item.ThisQty; + detail.Unit = item.Unit; + detail.InventoryStatus = item.Status; + detail.Batch = item.Batch; + detail.Status = 0; + detail.CreateTime = DateTime.Now; + detailList.Add(detail); + } + _unitwork.BatchAdd(detailList.ToArray()); + + shipment.TotalLines = detailList.Count; + shipment.TotalQty = detailList.Sum(x => x.Qty); + _unitwork.Update(shipment); + trans.Commit(); + } + catch (Exception ex) + { + trans.Rollback(); + return JsonMore(null, 500, ex.Message); + } + return JsonMore(null); + } } [ActionDescription("Sys.SearchInv")] @@ -268,9 +320,208 @@ namespace HHWMS.Web.Controllers x.ContainerCode, x.SupplierName, x.Qty, - ThisQty = x.Qty + UserDef2 = x.Status ?? "", + ThisQty = x.Qty, + UserDef3 = "" }).ToList(); return JsonMore(list); } + + [ActionDescription("Sys.CreateMove")] + public ActionResult CreateMove() + { + return PartialView("CreateMove"); + } + + [ActionDescription("Sys.CreateMove")] + [FixConnection(CsName = "hangyong")] + public ActionResult CreateMoveBill(string address, List data, string tran = "CHG") + { + var err = data.FirstOrDefault(x => x.UserDef3 == "" + || x.UserDef2 == ""); + if(err != null) + { + return JsonMore(null, 500, "状态和仓库是必选项!"); + } + + var err2 = data.FirstOrDefault(x => x.Qty <= 0); + if (err2 != null) + { + return JsonMore(null, 500, "数量不能小于0!"); + } + var warehouseId = Wtm.LoginUserInfo.Groups.FirstOrDefault().GroupCode; + var _unitwork = new UnitWork(Wtm); + var dc = Wtm.CreateDC(cskey: "hangyong"); + using (var trans = dc.BeginTransaction()) + { + try + { + var shipment = new ShipmentHeader2(); + shipment.WarehouseId = int.Parse(warehouseId); + shipment.Code = _unitwork.GetSerialNumber("ZYC"); + shipment.UserDef1 = "HYB"; + shipment.UserDef4 = tran; + shipment.Type = "ZYC"; + shipment.FirstStatus = 0; + shipment.LastStatus = 0; + + _unitwork.Add(shipment); + + var detailList = new List(); + foreach (var item in data) + { + var detail = new ShipmentDetail2(); + detail.WarehouseId = shipment.WarehouseId; + detail.ShipmentId = shipment.ID; + detail.ShipmentCode = shipment.Code; + detail.MaterialCode = item.MaterialCode; + detail.MaterialName = item.MaterialName; + detail.Lot = item.Lot; + detail.Qty = item.ThisQty; + detail.Unit = item.Unit; + detail.UserDef3 = item.UserDef3;//地点 + //detail.PurchasQty = item.THISQTYUOM; + //detail.PurchasUnits = item.UOM_0; + detail.InventoryStatus = item.Status; + detail.PurchasUnits = item.UserDef2;//状态 + detail.Batch = item.Batch; + detail.Status = 0; + detail.CreateTime = DateTime.Now; + detailList.Add(detail); + } + _unitwork.BatchAdd(detailList.ToArray()); + + shipment.TotalLines = detailList.Count; + shipment.TotalQty = detailList.Sum(x => x.Qty); + _unitwork.Update(shipment); + trans.Commit(); + } + catch (Exception ex) + { + trans.Rollback(); + return JsonMore(null, 500, ex.Message); + } + return JsonMore(null); + } + } + [ActionDescription("Sys.CheckInv")] + [FixConnection(CsName = "hangyong")] + public ActionResult CheckInv(string id) + { + var vm = Wtm.CreateVM(id); + return PartialView(vm); + } + [ActionDescription("Sys.CheckInv")] + [FixConnection(CsName = "hangyong")] + public ActionResult CheckInvData(string str) + { + var warehouseId = Wtm.LoginUserInfo.Groups.FirstOrDefault().GroupCode; + + var dc = Wtm.CreateDC(cskey: "default"); + var loc = dc.Set().FirstOrDefault(x => x.DictType == "Loc" + && x.DictValue == warehouseId.ToString())?.DictLabel; + + var _unitwork = new UnitWork(Wtm); + + var ship = _unitwork.FindSingle(x => x.ID == int.Parse(str)); + + 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"; + sql += $" and LOC_0 = '{loc}' and ITMREF_0 = '{ship.MaterialCode}'"; + // and LOT_0 = '{ship.Batch}' + var data = OracleHelper.GetDataSet(sql).Tables[0]; + + var list = data.AsEnumerable().Select + (x => new + { + STOFCY_0 = x.Field("STOFCY_0"), + ITMREF_0 = x.Field("ITMREF_0"), + LOT_0 = x.Field("LOT_0"), + LOC_0 = x.Field("LOC_0"), + QTYSTU_0 = x.Field("QTYSTU_0"), + PCU_0 = x.Field("PCU_0"), + STA_0 = x.Field("STA_0"), + WmsQty = WmsQty + } + ).ToList(); + return JsonMore(list); + } + + [ActionDescription("Sys.CheckInv")] + [FixConnection(CsName = "hangyong")] + public ActionResult Check(string str, List data) + { + var warehouseId = Wtm.LoginUserInfo.Groups.FirstOrDefault().GroupCode; + + //var dc = Wtm.CreateDC(cskey: "default"); + var _unitwork = new UnitWork(Wtm); + + var ship = _unitwork.FindSingle(x => + x.ID == int.Parse(str) + && x.Status == 0); + if (ship == null) + { + return JsonMore(null, 500, "未找到新建状态的出库单明细!"); + } + + var item = data.FirstOrDefault(); + if(item== null) + { + return JsonMore(null,500,"ERP无库存!"); + } + if(ship.Qty > data.Sum(x => x.QTYSTU_0)) + { + return JsonMore(null, 500, "ERP无足够库存!"); + } + if(ship.Qty <= item.QTYSTU_0) + { + ship.Batch = item.LOT_0; + ship.InventoryStatus = item.STA_0; + _unitwork.Update(ship); + } + else if(ship.Qty > item.QTYSTU_0) + { + var newShip = ship; + newShip.ID = null; + newShip.Qty = ship.Qty - item.QTYSTU_0; + _unitwork.Add(newShip); + + ship.Qty = item.QTYSTU_0; + ship.Batch = item.LOT_0; + ship.InventoryStatus = item.STA_0; + _unitwork.Update(ship); + + data.Remove(item); + + Check(newShip.ID.ToString(), data); + } + + return JsonMore(null); + } + + [ActionDescription("Sys.SearchWare")] + public ActionResult SearchWare() + { + var warehouseId = Wtm.LoginUserInfo.Groups.FirstOrDefault().GroupCode; + + //var dc = Wtm.CreateDC(cskey: "default"); + var _unitwork = new UnitWork(Wtm); + + var list = _unitwork.Find(x => + x.DictType == "Loc" + && x.DictValue.Length > 1) + .Select(x => new + { + label = HttpUtility.HtmlDecode(x.DictLabel), + value = x.DictValue + }).ToList(); + + return JsonMore(list); + } } } diff --git a/HHWMS.Web/Areas/XWMS/Controllers/XWMSMFMController.cs b/HHWMS.Web/Areas/XWMS/Controllers/XWMSMFMController.cs index f669ad2..cf3c058 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/XWMSMFMController.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/XWMSMFMController.cs @@ -34,7 +34,7 @@ public class XWMSMFMController : BaseController [ActionDescription("Sys.Search")] public ActionResult Search(string address, string zjcode, string materialcode, string gdbill, int gdline = 0, int ms = 0) { - var sql = @"select * from QREQ3.XWMSMFM where 1=1"; + var sql = @"select * from QRE.XWMSMFM where 1=1"; if (!string.IsNullOrEmpty(address)) { sql += $" and MFGFCY_0 = '{address}'"; @@ -111,6 +111,7 @@ public class XWMSMFMController : BaseController shipment.UserDef2 = data.FirstOrDefault().MFGLIN_0.ToString(); shipment.Type = "SCC"; shipment.FirstStatus = 0; + shipment.LastStatus = 0; shipment.UserDef1 = data.FirstOrDefault().MFGFCY_0; _unitwork.Add(shipment); diff --git a/HHWMS.Web/Areas/XWMS/Controllers/XWMSPOHController.cs b/HHWMS.Web/Areas/XWMS/Controllers/XWMSPOHController.cs index 11b14d6..3c9f3c9 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/XWMSPOHController.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/XWMSPOHController.cs @@ -32,7 +32,7 @@ public class XWMSPOHController : BaseController [ActionDescription("Sys.Search")] public ActionResult Search(string address, string billno, string supply, string materialcode) { - var sql = @"select * from QREQ3.XWMSPOH where 1=1"; + var sql = @"select * from QRE.XWMSPOH where 1=1"; if (!string.IsNullOrEmpty(address)) { sql += $" and POHFCY_0 = '{address}'"; @@ -106,6 +106,7 @@ public class XWMSPOHController : BaseController receipt.SupplierName = data.FirstOrDefault().BPRNAM_0; receipt.Type = "CGR"; receipt.FirstStatus = 0; + receipt.LastStatus = 0; receipt.AppointmentTime = data.FirstOrDefault().ORDDAT_0; receipt.UserDef2 = data.FirstOrDefault().POHFCY_0; @@ -132,6 +133,8 @@ public class XWMSPOHController : BaseController detail.Batch = _unitwork.GetSerialNumber("HYB", 5).Remove(3, 2); detail.Status = 0; detail.CreateTime = DateTime.Now; + detail.SupplierCode = receipt.SupplierCode; + detail.SupplierName = receipt.SupplierName; detailList.Add(detail); } _unitwork.BatchAdd(detailList.ToArray()); diff --git a/HHWMS.Web/Areas/XWMS/Controllers/XWMSPTHController.cs b/HHWMS.Web/Areas/XWMS/Controllers/XWMSPTHController.cs index f68ded3..a784625 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/XWMSPTHController.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/XWMSPTHController.cs @@ -34,7 +34,7 @@ public class XWMSPTHController : BaseController [ActionDescription("Sys.Search")] public ActionResult Search(string address, string billno, string supply, string materialcode, string cgsh) { - var sql = @"select * from QREQ3.XWMSPTH where 1=1"; + var sql = @"select * from QRE.XWMSPTH where 1=1"; if (!string.IsNullOrEmpty(address)) { sql += $" and PRHFCY_0 = '{address}'"; @@ -111,6 +111,7 @@ public class XWMSPTHController : BaseController shipment.ShipTo = data.FirstOrDefault().BPSNUM_0; shipment.Type = "CGT"; shipment.FirstStatus = 0; + shipment.LastStatus = 0; shipment.AppointmentTime = data.FirstOrDefault().RCPDAT_0; shipment.UserDef1 = data.FirstOrDefault().PRHFCY_0; @@ -128,6 +129,8 @@ public class XWMSPTHController : BaseController detail.MaterialCode = item.ITMREF_0; detail.MaterialName = HttpUtility.HtmlDecode(item.ITMDES1_0); detail.Lot = HttpUtility.HtmlDecode(item.ITMDES2_0); + detail.SupplierCode = shipment.ShipTo; + detail.SupplierName = item.BPSNAM_0; detail.Qty = item.THISQTYSTU; detail.Unit = item.STU_0; detail.PurchasQty = item.THISQTYUOM; diff --git a/HHWMS.Web/Areas/XWMS/Controllers/XWMSSHIPController.cs b/HHWMS.Web/Areas/XWMS/Controllers/XWMSSHIPController.cs index 1a593be..8cd79e2 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/XWMSSHIPController.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/XWMSSHIPController.cs @@ -32,9 +32,12 @@ public class XWMSSHIPController : BaseController } [ActionDescription("Sys.Search")] + [FixConnection(CsName = "hangyong")] public ActionResult Search(string address, string billno, string sbill, string materialcode) { - var sql = @"select * from QREQ3.XWMSSHIP where 1=1"; + var _unitwork = new UnitWork(Wtm); + + var sql = @"select * from QRE.XWMSSHIP where 1=1"; if (!string.IsNullOrEmpty(address)) { sql += $" and FCY_0 = '{address}'"; @@ -53,6 +56,10 @@ public class XWMSSHIPController : BaseController } var data = OracleHelper.GetDataSet(sql).Tables[0]; + + var codeList = data.AsEnumerable().Select(x => x.Field("ITMREF_0")).ToHashSet(); + var matList = _unitwork.Find(x => codeList.Contains(x.Code)); + var list = data.AsEnumerable().Select (x => new { @@ -73,9 +80,10 @@ public class XWMSSHIPController : BaseController POPLIN_0 = x.Field("POPLIN_0"), LOT_0 = x.Field("LOT_0"), QTYSTU_0 = x.Field("QTYSTU_0"), - STATUS = "" + STATUS = matList.FirstOrDefault(y => y.Code == x.Field("ITMREF_0"))?.ClassA } ).ToList(); + return JsonMore(list); } @@ -100,6 +108,7 @@ public class XWMSSHIPController : BaseController receipt.SupplierName = data.FirstOrDefault().BPRNAM_0; receipt.Type = "DDS"; receipt.FirstStatus = 0; + receipt.LastStatus = 0; receipt.AppointmentTime = data.FirstOrDefault().SHIDAT_0; receipt.UserDef2 = data.FirstOrDefault().FCY_0; @@ -108,6 +117,15 @@ public class XWMSSHIPController : BaseController var detailList = new List(); foreach (var item in data) { + var qr = _unitwork.FindSingle(x => + x.Code == item.ITMREF_0 + && x.Batch == item.LOT_0 + ); + if(qr == null) + { + tran.Rollback(); + return JsonMore(null, 500, $"未查找到物料码 {item.ITMREF_0} 对应的二维码"); + } var detail = new ReceiptDetail2(); detail.WarehouseId = receipt.WarehouseId; detail.ReceiptId = receipt.ID; @@ -117,6 +135,8 @@ public class XWMSSHIPController : BaseController detail.MaterialCode = item.ITMREF_0; detail.MaterialName = HttpUtility.HtmlDecode(item.ITMDES1_0); detail.Lot = HttpUtility.HtmlDecode(item.ITMDES2_0); + detail.SupplierCode = receipt.SupplierCode; + detail.SupplierName = receipt.SupplierName; detail.Qty = item.QTYSTU_0; detail.Unit = item.SAU_0; detail.PurchasQty = item.QTY_0; diff --git a/HHWMS.Web/Areas/XWMS/Controllers/XWMSSOHController.cs b/HHWMS.Web/Areas/XWMS/Controllers/XWMSSOHController.cs index 3e3981c..35376a2 100644 --- a/HHWMS.Web/Areas/XWMS/Controllers/XWMSSOHController.cs +++ b/HHWMS.Web/Areas/XWMS/Controllers/XWMSSOHController.cs @@ -35,7 +35,7 @@ public class XWMSSOHController : BaseController [ActionDescription("Sys.Search")] public ActionResult Search(string address, string billno, string cust, string materialcode) { - var sql = @"select * from QREQ3.XWMSSOH where 1=1"; + var sql = @"select * from QRE.XWMSSOH where 1=1"; if (!string.IsNullOrEmpty(address)) { sql += $" and SALFCY_0 = '{address}'"; @@ -99,6 +99,7 @@ public class XWMSSOHController : BaseController shipment.SourceCode = data.FirstOrDefault().SOHNUM_0; shipment.ShipTo = data.FirstOrDefault().BPCORD_0; shipment.FirstStatus = 0; + shipment.LastStatus = 0; shipment.AppointmentTime = data.FirstOrDefault().ORDDAT_0; shipment.UserDef1 = $"{data.FirstOrDefault().SALFCY_0} {data.FirstOrDefault().BPAADD_0}"; @@ -118,6 +119,8 @@ public class XWMSSOHController : BaseController detail.Lot = HttpUtility.HtmlDecode(item.ITMDES2_0); detail.Qty = item.THISQTYSTU; detail.Unit = item.STU_0; + detail.SupplierCode = shipment.ShipTo; + detail.SupplierName = item.BPCNAM_0; //detail.PurchasQty = item.THISQTYUOM; //detail.PurchasUnits = item.UOM_0; //detail.InventoryStatus = item.STA_0; diff --git a/HHWMS.Web/Areas/XWMS/ViewModels/Material2VMs/Material2ListVM.cs b/HHWMS.Web/Areas/XWMS/ViewModels/Material2VMs/Material2ListVM.cs index 993a040..8b9c054 100644 --- a/HHWMS.Web/Areas/XWMS/ViewModels/Material2VMs/Material2ListVM.cs +++ b/HHWMS.Web/Areas/XWMS/ViewModels/Material2VMs/Material2ListVM.cs @@ -36,6 +36,7 @@ namespace HHWMS.Web this.MakeGridHeader(x => x.Type), this.MakeGridHeader(x => x.Name).SetWidth(150), this.MakeGridHeader(x => x.MasterUnit), + this.MakeGridHeader(x => x.ClassA), this.MakeGridHeaderAction(width: 200) }; } diff --git a/HHWMS.Web/Areas/XWMS/ViewModels/ShipmentDetail2VMs/ShipmentDetail2ListVM.cs b/HHWMS.Web/Areas/XWMS/ViewModels/ShipmentDetail2VMs/ShipmentDetail2ListVM.cs index da581a1..66805de 100644 --- a/HHWMS.Web/Areas/XWMS/ViewModels/ShipmentDetail2VMs/ShipmentDetail2ListVM.cs +++ b/HHWMS.Web/Areas/XWMS/ViewModels/ShipmentDetail2VMs/ShipmentDetail2ListVM.cs @@ -17,6 +17,9 @@ namespace HHWMS.Web { return new List { + this.MakeAction("ShipmentHeader2","CheckInv",Localizer["Sys.CheckInv"],Localizer["Sys.CheckInv"],GridActionParameterTypesEnum.SingleId,"xwms") + .SetShowInRow().SetHideOnToolBar().SetButtonClass("layui-btn-Warm").SetSize(1200,600), + //this.MakeStandardAction("ShipmentDetail2", GridActionStandardTypesEnum.Create, Localizer["Sys.Create"],"xwms", dialogWidth: 800), //this.MakeStandardAction("ShipmentDetail2", GridActionStandardTypesEnum.Edit, Localizer["Sys.Edit"], "xwms", dialogWidth: 800), //this.MakeStandardAction("ShipmentDetail2", GridActionStandardTypesEnum.Delete, Localizer["Sys.Delete"], "xwms", dialogWidth: 800), diff --git a/HHWMS.Web/Areas/XWMS/ViewModels/ShipmentHeader2VMs/ShipmentHeader2ListVM.cs b/HHWMS.Web/Areas/XWMS/ViewModels/ShipmentHeader2VMs/ShipmentHeader2ListVM.cs index 4469283..42be6c2 100644 --- a/HHWMS.Web/Areas/XWMS/ViewModels/ShipmentHeader2VMs/ShipmentHeader2ListVM.cs +++ b/HHWMS.Web/Areas/XWMS/ViewModels/ShipmentHeader2VMs/ShipmentHeader2ListVM.cs @@ -33,8 +33,9 @@ namespace HHWMS.Web this.MakeStandardAction("ShipmentHeader2", GridActionStandardTypesEnum.ExportExcel, Localizer["Sys.Export"], "xwms"), this.MakeAction("ShipmentHeader2","CreateOut",Localizer["Sys.Out"],Localizer["Sys.Out"],GridActionParameterTypesEnum.NoId,"xwms") .SetMax(), - - }; + this.MakeAction("ShipmentHeader2","CreateMove",Localizer["Sys.Move"],Localizer["Sys.Move"],GridActionParameterTypesEnum.NoId,"xwms") + .SetMax(), + }; } diff --git a/HHWMS.Web/Areas/XWMS/Views/ReceiptDetail2/Create.cshtml b/HHWMS.Web/Areas/XWMS/Views/ReceiptDetail2/Create.cshtml index cd2e8b7..1988923 100644 --- a/HHWMS.Web/Areas/XWMS/Views/ReceiptDetail2/Create.cshtml +++ b/HHWMS.Web/Areas/XWMS/Views/ReceiptDetail2/Create.cshtml @@ -4,7 +4,9 @@ - + @@ -14,7 +16,7 @@ -@* *@ + @@ -25,3 +27,11 @@ + diff --git a/HHWMS.Web/Areas/XWMS/Views/ShipmentHeader2/CheckInv.cshtml b/HHWMS.Web/Areas/XWMS/Views/ShipmentHeader2/CheckInv.cshtml new file mode 100644 index 0000000..93ca363 --- /dev/null +++ b/HHWMS.Web/Areas/XWMS/Views/ShipmentHeader2/CheckInv.cshtml @@ -0,0 +1,117 @@ +@model HHWMS.Web.ShipmentDetail2VM + + + + + + + + + + + + + + + + 确定 + + + diff --git a/HHWMS.Web/Areas/XWMS/Views/ShipmentHeader2/CreateMove.cshtml b/HHWMS.Web/Areas/XWMS/Views/ShipmentHeader2/CreateMove.cshtml index 5d4e961..01f34fa 100644 --- a/HHWMS.Web/Areas/XWMS/Views/ShipmentHeader2/CreateMove.cshtml +++ b/HHWMS.Web/Areas/XWMS/Views/ShipmentHeader2/CreateMove.cshtml @@ -1,50 +1,332 @@ -@model HHWMS.Web.Inventory2ListVM -@inject IStringLocalizer Localizer; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + +@* + + + + + *@ + + + + + + + + + + + + + + 创建单据 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
{{scope.row.ThisQty}}
+
+
+ +
+ + + + +
{{foodLabel(scope.row.UserDef2)}}
+
+
+ +
+ + + + +
{{foodLabel2(scope.row.UserDef3)}}
+
+
+ +
+ + + +
+ + diff --git a/HHWMS.Web/Areas/XWMS/Views/ShipmentHeader2/CreateOut.cshtml b/HHWMS.Web/Areas/XWMS/Views/ShipmentHeader2/CreateOut.cshtml index 946ae57..51aa571 100644 --- a/HHWMS.Web/Areas/XWMS/Views/ShipmentHeader2/CreateOut.cshtml +++ b/HHWMS.Web/Areas/XWMS/Views/ShipmentHeader2/CreateOut.cshtml @@ -101,19 +101,19 @@
{{scope.row.ThisQty}}
- @* + @*
- + -
{{foodLabel(scope.row.UserDef1)}}
+
{{foodLabel(scope.row.InvenoryStatus)}}
-
- *@ +
*@ + row.QTYUOM_0) { - row.THISQTYUOM = row.QTYUOM_0; - this.$message.error("不能超出单据数量"); - } - else { - row.THISQTYSTU = row.THISQTYUOM * row.UOMSTUCOE_0; + if (property == "ThisQty") { + // 库存单位除以系数 + if (row.THISQTYSTU > row.QTY) { + row.THISQTYSTU = row.QTY; + layer.alert("不能超出单据数量!!", { icon: 5, shadeClose: true, title: "错误信息" }); } } }, diff --git a/HHWMS.Web/Models/XWMS/Material.cs b/HHWMS.Web/Models/XWMS/Material.cs index 96b6d4e..fb9cae7 100644 --- a/HHWMS.Web/Models/XWMS/Material.cs +++ b/HHWMS.Web/Models/XWMS/Material.cs @@ -76,6 +76,7 @@ namespace HHWMS.Web.Models /// 类别A /// [Column("classA")] + [Display(Name = "Material2.ClassA")] public string ClassA { get; set; } /// /// 类别B diff --git a/HHWMS.Web/Models/XWMS/ReceiptDetail.cs b/HHWMS.Web/Models/XWMS/ReceiptDetail.cs index bbc275a..5560661 100644 --- a/HHWMS.Web/Models/XWMS/ReceiptDetail.cs +++ b/HHWMS.Web/Models/XWMS/ReceiptDetail.cs @@ -115,6 +115,7 @@ namespace HHWMS.Web.Models /// [Column("materialName")] [Display(Name = "ReceiptDetail2.MaterialName")] + [CanNotEdit] public string MaterialName { get; set; } /// @@ -167,8 +168,9 @@ namespace HHWMS.Web.Models /// /// 系统数量 /// - [Column("qty")] + [Column("qty", TypeName = "decimal(18,9)")] [Display(Name = "ReceiptDetail2.Qty")] + [Required] public decimal? Qty { get; set; } /// diff --git a/HHWMS.Web/Models/XWMS/ShipmentDetail.cs b/HHWMS.Web/Models/XWMS/ShipmentDetail.cs index 18c2140..070895e 100644 --- a/HHWMS.Web/Models/XWMS/ShipmentDetail.cs +++ b/HHWMS.Web/Models/XWMS/ShipmentDetail.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/XWMSSTOHYB.cs b/HHWMS.Web/Models/XWMS/XWMSSTOHYB.cs new file mode 100644 index 0000000..83d2508 --- /dev/null +++ b/HHWMS.Web/Models/XWMS/XWMSSTOHYB.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations; +using System.Text; +using WalkingTec.Mvvm.Core; + +namespace HHWMS.Web.Models +{ + public class XWMSSTOHYB : TopBasePoco + { + public string STOFCY_0 { get; set; } + public string ITMREF_0 { get; set; } + public string LOT_0 { get; set; } + public string LOC_0 { get; set; } + public decimal QTYSTU_0 { get; set; } + public string PCU_0 { get; set; } + public string STA_0 { get; set; } + } +} diff --git a/HHWMS.Web/appsettings.json b/HHWMS.Web/appsettings.json index 5c77b4a..333f19a 100644 --- a/HHWMS.Web/appsettings.json +++ b/HHWMS.Web/appsettings.json @@ -24,13 +24,13 @@ "Connections": [ { "Key": "default", - "Value": "Server=127.0.0.1;Port=3306;Database=8357wms;Uid=root;Password=abc123*;Character Set=utf8mb4;", + "Value": "Server=172.16.12.212;Port=3306;Database=wms;Uid=root;Password=abc123*;Character Set=utf8mb4;", "DbContext": "DataContext", "DBType": "mysql" }, { "Key": "hangyong", - "Value": "Server=127.0.0.1;Port=3306;Database=hangtongwms2;Uid=root;Password=abc123*;Character Set=utf8mb4;", + "Value": "Server=172.16.12.212;Port=3306;Database=hangyongwms;Uid=root;Password=abc123*;Character Set=utf8mb4;", "DbContext": "DataContext", "DBType": "mysql" }