3
This commit is contained in:
1 parent
e9f154bd06
commit
fa7b5814ba
22 files changed
+989
-168
No files matched your search
@@ -1,27 +1,36 @@
|
||||
<el-row id="print">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-input v-model="qrcode"
|
||||
placeholder="请扫描二维码"
|
||||
@@change="scanCode" ref="QrCode">
|
||||
<el-col :span="4">
|
||||
<el-select v-model="px" :popper-append-to-body="false" placeholder="片型">
|
||||
<el-option v-for="item in pxList"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<el-input v-model="lot"
|
||||
placeholder="型号">
|
||||
</el-input>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-col :span="4">
|
||||
<el-input v-model.number="num"
|
||||
placeholder="请输入数量">
|
||||
placeholder="数量">
|
||||
</el-input>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<el-button type="primary" @@click="genCode">生成</el-button>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<el-button type="primary" @@click="create">创建入库单</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<div style="margin: 20px 0;"></div>
|
||||
@* 富文本 *@
|
||||
<el-input type="textarea"
|
||||
:autosize="{ minRows: 4}"
|
||||
readonly
|
||||
v-model="gendCode">
|
||||
</el-input>
|
||||
|
||||
<div id="qrcode" style="
|
||||
height: 10%;
|
||||
"></div>
|
||||
<el-button style="float: right" type="primary" @@click="print">打印</el-button>
|
||||
</el-row>
|
||||
|
||||
@@ -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 @@
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
</script>
|
||||
@@ -92,8 +92,9 @@ namespace HHWMS.Web.Controllers
|
||||
vm.Entity.SourceLine = (detailList.Count() + 1).ToString();
|
||||
vm.Entity.Status = 0;
|
||||
var mater = dc.Set<Material2>()
|
||||
.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)
|
||||
|
||||
@@ -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<ReceiptDetail2>();
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -123,7 +123,7 @@ namespace HHWMS.Web.Controllers
|
||||
}
|
||||
else
|
||||
{
|
||||
return FFResult().CloseDialog().RefreshGridRow(vm.Entity.ID);
|
||||
return FFResult().CloseDialog().RefreshGridRow((long)vm.Entity.ID);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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<ShipmentHeader2ImportVM>();
|
||||
@@ -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<Inventory2> 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<ShipmentDetail2>();
|
||||
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<Inventory2> 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<ShipmentDetail2>();
|
||||
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<ShipmentDetail2VM>(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<SysDictData>().FirstOrDefault(x => x.DictType == "Loc"
|
||||
&& x.DictValue == warehouseId.ToString())?.DictLabel;
|
||||
|
||||
var _unitwork = new UnitWork(Wtm);
|
||||
|
||||
var ship = _unitwork.FindSingle<ShipmentDetail2>(x => x.ID == int.Parse(str));
|
||||
|
||||
var WmsQty = _unitwork.Find<Inventory2>(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<string>("STOFCY_0"),
|
||||
ITMREF_0 = x.Field<string>("ITMREF_0"),
|
||||
LOT_0 = x.Field<string>("LOT_0"),
|
||||
LOC_0 = x.Field<string>("LOC_0"),
|
||||
QTYSTU_0 = x.Field<decimal>("QTYSTU_0"),
|
||||
PCU_0 = x.Field<string>("PCU_0"),
|
||||
STA_0 = x.Field<string>("STA_0"),
|
||||
WmsQty = WmsQty
|
||||
}
|
||||
).ToList();
|
||||
return JsonMore(list);
|
||||
}
|
||||
|
||||
[ActionDescription("Sys.CheckInv")]
|
||||
[FixConnection(CsName = "hangyong")]
|
||||
public ActionResult Check(string str, List<XWMSSTOHYB> data)
|
||||
{
|
||||
var warehouseId = Wtm.LoginUserInfo.Groups.FirstOrDefault().GroupCode;
|
||||
|
||||
//var dc = Wtm.CreateDC(cskey: "default");
|
||||
var _unitwork = new UnitWork(Wtm);
|
||||
|
||||
var ship = _unitwork.FindSingle<ShipmentDetail2>(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<SysDictData>(x =>
|
||||
x.DictType == "Loc"
|
||||
&& x.DictValue.Length > 1)
|
||||
.Select(x => new
|
||||
{
|
||||
label = HttpUtility.HtmlDecode(x.DictLabel),
|
||||
value = x.DictValue
|
||||
}).ToList();
|
||||
|
||||
return JsonMore(list);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
|
||||
@@ -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());
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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<string>("ITMREF_0")).ToHashSet();
|
||||
var matList = _unitwork.Find<Material2>(x => codeList.Contains(x.Code));
|
||||
|
||||
var list = data.AsEnumerable().Select
|
||||
(x => new
|
||||
{
|
||||
@@ -73,9 +80,10 @@ public class XWMSSHIPController : BaseController
|
||||
POPLIN_0 = x.Field<Int64>("POPLIN_0"),
|
||||
LOT_0 = x.Field<string>("LOT_0"),
|
||||
QTYSTU_0 = x.Field<decimal>("QTYSTU_0"),
|
||||
STATUS = ""
|
||||
STATUS = matList.FirstOrDefault(y => y.Code == x.Field<string>("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<ReceiptDetail2>();
|
||||
foreach (var item in data)
|
||||
{
|
||||
var qr = _unitwork.FindSingle<MaterialQr2>(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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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)
|
||||
};
|
||||
}
|
||||
|
||||
@@ -17,6 +17,9 @@ namespace HHWMS.Web
|
||||
{
|
||||
return new List<GridAction>
|
||||
{
|
||||
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),
|
||||
|
||||
@@ -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(),
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -4,7 +4,9 @@
|
||||
<wt:form vm="@Model">
|
||||
<wt:row items-per-row="ItemsPerRowEnum.One">
|
||||
<wt:row id="selector">
|
||||
<wt:selector field="Entity.MaterialCode" list-vm="MaterialList" text-bind="MaterialList.EntityList[0].Name">
|
||||
<wt:selector field="Entity.MaterialCode" list-vm="MaterialList"
|
||||
text-bind="MaterialList.EntityList[0].Code"
|
||||
submit-func="test">
|
||||
<wt:searchpanel vm="MaterialList">
|
||||
<wt:row items-per-row=" ItemsPerRowEnum.Two">
|
||||
<wt:textbox field="MaterialList.Searcher.Code" />
|
||||
@@ -14,7 +16,7 @@
|
||||
</wt:searchpanel>
|
||||
</wt:selector>
|
||||
</wt:row>
|
||||
@* <wt:textbox field="Entity.Batch"/> *@
|
||||
<wt:textbox field="Entity.MaterialName"/>
|
||||
<wt:textbox field="Entity.Qty" />
|
||||
<wt:textbox field="Entity.Price" />
|
||||
<wt:combobox field="Entity.InventoryStatus" items="InventoryStatus" />
|
||||
@@ -25,3 +27,11 @@
|
||||
<wt:closebutton />
|
||||
</wt:row>
|
||||
</wt:form>
|
||||
<script>
|
||||
function test(val) {
|
||||
console.log($('#ReceiptDetail2VM_Entity_MaterialName').val());
|
||||
console.log(val[0].Name);
|
||||
$('#ReceiptDetail2VM_Entity_MaterialName').val(val[0].Name);
|
||||
ReceiptDetail2VM_Entity_InventoryStatus.setValue([val[0].ClassA]);
|
||||
}
|
||||
</script>
|
||||
@@ -0,0 +1,117 @@
|
||||
@model HHWMS.Web.ShipmentDetail2VM
|
||||
|
||||
<el-row id="Out">
|
||||
<el-table :data="tableData"
|
||||
height="450" stripe border
|
||||
style="width: 100%"
|
||||
ref="tableData"
|
||||
v-loading="loading">
|
||||
<el-table-column type="index"
|
||||
width="50">
|
||||
</el-table-column>
|
||||
<el-table-column label="地点" width="150" align="center" prop="STOFCY_0"></el-table-column>
|
||||
<el-table-column label="物料编码" width="150" align="center" prop="ITMREF_0"></el-table-column>
|
||||
<el-table-column label="批次" width="150" align="center" prop="LOT_0"></el-table-column>
|
||||
<el-table-column label="库位" width="200" align="center" prop="LOC_0"></el-table-column>
|
||||
<el-table-column label="数量" width="150" align="center" prop="QTYSTU_0" ></el-table-column>
|
||||
<el-table-column label="WMS数量" width="150" align="center" prop="WmsQty"></el-table-column>
|
||||
<el-table-column label="单位" width="200" align="center" prop="PCU_0"></el-table-column>
|
||||
<el-table-column label="状态" width="180" align="center" prop="STA_0"></el-table-column>
|
||||
|
||||
</el-table>
|
||||
<el-button type="primary" @@click="check">确定</el-button>
|
||||
</el-row>
|
||||
|
||||
<script>
|
||||
var str = "";
|
||||
@{
|
||||
<text>str = @Model.Entity.ID; </text>
|
||||
}
|
||||
var app = new Vue({
|
||||
el: "#Out",
|
||||
data() {
|
||||
return {
|
||||
loading: false,
|
||||
tableData: [],
|
||||
};
|
||||
},
|
||||
mounted: function () {
|
||||
this.search();
|
||||
// var t = localStorage.getItem("WareHouseId");
|
||||
// console.log(t);
|
||||
// 获取所有单据编码
|
||||
// $.ajax({
|
||||
// type: "post",
|
||||
// dataType: "json",
|
||||
// data: {},
|
||||
// url: "/xwms/XWMSPOH/Search",
|
||||
// success: function (json) {
|
||||
// app.tableData = json.Data;
|
||||
// },
|
||||
// error: function (json) {
|
||||
// alert("加载失败");
|
||||
// }
|
||||
// });
|
||||
},
|
||||
methods: {
|
||||
search() {
|
||||
var _this = this;
|
||||
_this.loading = true;
|
||||
$.ajax({
|
||||
type: "post",
|
||||
dataType: "json",
|
||||
data: {
|
||||
str:str
|
||||
},
|
||||
url: "/xwms/ShipmentHeader2/CheckInvData",
|
||||
success: function (json) {
|
||||
_this.tableData = json.Data;
|
||||
_this.loading = false;
|
||||
},
|
||||
error: function (json) {
|
||||
_this.$message.error("加载失败");
|
||||
_this.loading = false;
|
||||
}
|
||||
});
|
||||
},
|
||||
check() {
|
||||
var _this = this;
|
||||
var sumQty = 0;
|
||||
var wmsQty = 0;
|
||||
_this.tableData.forEach(function (item) {
|
||||
wmsQty = Number.parseFloat(item.WmsQty);
|
||||
sumQty = sumQty + Number.parseFloat(item.QTYSTU_0);
|
||||
});
|
||||
console.log(sumQty, wmsQty)
|
||||
if (sumQty > wmsQty) {
|
||||
layer.alert("数量不满足,无法出库!!", { icon: 5, shadeClose: true, title: "错误信息" });
|
||||
}
|
||||
else {
|
||||
|
||||
$.ajax({
|
||||
type: "post",
|
||||
dataType: "json",
|
||||
data: {
|
||||
str: str,
|
||||
data: _this.tableData
|
||||
},
|
||||
url: "/xwms/ShipmentHeader2/Check",
|
||||
success: function (json) {
|
||||
if (json.Code == 200) {
|
||||
layer.closeAll();
|
||||
layer.msg("创建成功", { icon: 6, shade: 0.4, time: 1500 });
|
||||
}
|
||||
else {
|
||||
layer.alert("创建失败!!" + json.Msg, { icon: 5, shadeClose: true, title: "错误信息" });
|
||||
}
|
||||
},
|
||||
error: function (json) {
|
||||
layer.alert("创建失败!!", { icon: 5, shadeClose: true, title: "错误信息" });
|
||||
}
|
||||
});
|
||||
// layer.closeAll();
|
||||
}
|
||||
}
|
||||
},
|
||||
});
|
||||
</script>
|
||||
@@ -1,50 +1,332 @@
|
||||
@model HHWMS.Web.Inventory2ListVM
|
||||
@inject IStringLocalizer<Program> Localizer;
|
||||
|
||||
<wt:searchpanel vm="@Model" reset-btn="true">
|
||||
<wt:row items-per-row="ItemsPerRowEnum.Three">
|
||||
<wt:textbox field="Searcher.WarehouseId" />
|
||||
<wt:textbox field="Searcher.WarehouseCode" />
|
||||
<wt:textbox field="Searcher.ZoneCode" />
|
||||
<wt:textbox field="Searcher.LocationId" />
|
||||
<wt:textbox field="Searcher.LocationCode" />
|
||||
<wt:textbox field="Searcher.ContainerCode" />
|
||||
<wt:textbox field="Searcher.Roadway" />
|
||||
<wt:textbox field="Searcher.SourceCode" />
|
||||
<wt:textbox field="Searcher.SourceLine" />
|
||||
<wt:textbox field="Searcher.CompanyId" />
|
||||
<wt:textbox field="Searcher.CompanyCode" />
|
||||
<wt:textbox field="Searcher.MaterialId" />
|
||||
<wt:textbox field="Searcher.MaterialCode" />
|
||||
<wt:textbox field="Searcher.MaterialName" />
|
||||
<wt:textbox field="Searcher.ReceiptId" />
|
||||
<wt:textbox field="Searcher.ReceiptCode" />
|
||||
<wt:textbox field="Searcher.ReceiptDetailId" />
|
||||
<wt:textbox field="Searcher.Batch" />
|
||||
<wt:textbox field="Searcher.Lot" />
|
||||
<wt:textbox field="Searcher.Sn" />
|
||||
<wt:textbox field="Searcher.Project" />
|
||||
<wt:datetime field="Searcher.ManufactureDate" range="true" />
|
||||
<wt:datetime field="Searcher.ExpirationDate" range="true" />
|
||||
<wt:textbox field="Searcher.Status" />
|
||||
<wt:textbox field="Searcher.ContainerStatus" />
|
||||
<wt:textbox field="Searcher.Qty" />
|
||||
<wt:textbox field="Searcher.Frozen" />
|
||||
<wt:textbox field="Searcher.TaskQty" />
|
||||
<wt:textbox field="Searcher.CostPrice" />
|
||||
<wt:textbox field="Searcher.ListPrice" />
|
||||
<wt:textbox field="Searcher.NetPrice" />
|
||||
<wt:textbox field="Searcher.UserDef1" />
|
||||
<wt:textbox field="Searcher.UserDef2" />
|
||||
<wt:textbox field="Searcher.UserDef3" />
|
||||
<wt:combobox field="Searcher.Deleted" empty-text="@Localizer["Sys.All"]" />
|
||||
<wt:textbox field="Searcher.TaskStatus" />
|
||||
<wt:textbox field="Searcher.SupplierName" />
|
||||
<wt:textbox field="Searcher.SupplierCode" />
|
||||
<wt:textbox field="Searcher.QrCode" />
|
||||
<wt:textbox field="Searcher.TaskNo" />
|
||||
<wt:textbox field="Searcher.Unit" />
|
||||
<wt:textbox field="Searcher.MaterialQty" />
|
||||
</wt:row>
|
||||
</wt:searchpanel>
|
||||
<wt:grid vm="@Model" url="/xwms/Inventory2/Search"/>
|
||||
<style lang='scss'>
|
||||
.item{
|
||||
.item__input{
|
||||
display: none;
|
||||
width: 80px;
|
||||
/* 调整elementUI中样式 如果不需要调整请忽略 */
|
||||
.el-input__inner{
|
||||
height: 35px!important;
|
||||
}
|
||||
/* 调整elementUI中样式 如果不需要调整请忽略 */
|
||||
.el-input__suffix{
|
||||
i{
|
||||
font-size: 12px !important;
|
||||
line-height: 26px !important;
|
||||
}
|
||||
}
|
||||
}
|
||||
.item__txt{
|
||||
box-sizing: border-box;
|
||||
line-height: 24px;
|
||||
padding: 0 9px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
<el-row id="CreateMove">
|
||||
<el-form :inline="true" :model="form">
|
||||
<el-form-item>
|
||||
<el-select v-model="form.address" :popper-append-to-body="false" placeholder="地点">
|
||||
<el-option v-for="item in addressList"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
@* <el-form-item>
|
||||
<el-select v-model="form.tran" :popper-append-to-body="false" placeholder="交易组">
|
||||
<el-option v-for="item in tranList"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item> *@
|
||||
<el-form-item>
|
||||
<el-select v-model="form.type" :popper-append-to-body="false" placeholder="任务类型">
|
||||
<el-option v-for="item in typeList"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-select v-model="form.address2" :popper-append-to-body="false" placeholder="移入地点">
|
||||
<el-option v-for="item in address2List"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-plus" @@click="create">创建单据</el-button>
|
||||
</el-form-item>
|
||||
<el-divider></el-divider>
|
||||
<el-form-item>
|
||||
<el-input v-model="form.MaterialCode" placeholder="物料编码"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-input v-model="form.MaterialName" placeholder="物料名称"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-input v-model="form.Batch" placeholder="批次"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-input v-model="form.Lot" placeholder="规格"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button icon="el-icon-search" @@click="search" circle></el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-table :data="tableData.slice((currentPage-1)*pageSize,currentPage*pageSize)"
|
||||
height="600" stripe border
|
||||
style="width: 100%"
|
||||
ref="tableData"
|
||||
v-loading="loading"
|
||||
@@cell-mouse-enter="handleCellEnter"
|
||||
@@cell-mouse-leave="handleCellLeave"
|
||||
@@selection-change="handleSelectionChange">
|
||||
<el-table-column type="index"
|
||||
width="50">
|
||||
</el-table-column>
|
||||
<el-table-column type="selection"
|
||||
width="55">
|
||||
</el-table-column>
|
||||
<el-table-column label="库位" width="150" align="center" prop="LocationCode"></el-table-column>
|
||||
<el-table-column label="容器" width="150" align="center" prop="ContainerCode"></el-table-column>
|
||||
<el-table-column label="物料编码" width="150" align="center" prop="MaterialCode" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="物料名称" width="180" align="center" prop="MaterialName"></el-table-column>
|
||||
<el-table-column label="批次" width="150" align="center" prop="Batch"></el-table-column>
|
||||
<el-table-column label="规格" width="200" align="center" prop="Lot"></el-table-column>
|
||||
<el-table-column label="供应商名称" width="200" align="center" prop="SupplierName"></el-table-column>
|
||||
<el-table-column label="数量" width="150" align="center" prop="Qty" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="出库数量" width="200" align="center" prop="ThisQty">
|
||||
<div class="item" slot-scope="scope">
|
||||
<el-input class="item__input" v-model="scope.row.ThisQty" placeholder="请输入内容"></el-input>
|
||||
<div class="item__txt">{{scope.row.ThisQty}}</div>
|
||||
</div>
|
||||
</el-table-column>
|
||||
<el-table-column label="移入状态" width="100" align="center" prop="UserDef2">
|
||||
<div class="item" slot-scope="scope">
|
||||
<el-select class="item__input" :popper-append-to-body="false" v-model="scope.row.UserDef2" placeholder="请选择">
|
||||
<el-option v-for="item in options"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value">
|
||||
</el-option>
|
||||
</el-select>
|
||||
<div class="item__txt">{{foodLabel(scope.row.UserDef2)}}</div>
|
||||
</div>
|
||||
</el-table-column>
|
||||
<el-table-column label="仓库" width="100" align="center" prop="UserDef3">
|
||||
<div class="item" slot-scope="scope">
|
||||
<el-select class="item__input" :popper-append-to-body="false" v-model="scope.row.UserDef3" placeholder="请选择">
|
||||
<el-option v-for="item in wareList"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value">
|
||||
</el-option>
|
||||
</el-select>
|
||||
<div class="item__txt">{{foodLabel2(scope.row.UserDef3)}}</div>
|
||||
</div>
|
||||
</el-table-column>
|
||||
|
||||
</el-table>
|
||||
|
||||
<el-pagination align='center'
|
||||
@@size-change="handleSizeChange"
|
||||
@@current-change="handleCurrentChange"
|
||||
:current-page="currentPage"
|
||||
:page-sizes="[1,5,10,20]"
|
||||
:page-size="pageSize"
|
||||
layout="total, sizes, prev, pager, next, jumper"
|
||||
:total="tableData.length">
|
||||
</el-pagination>
|
||||
</el-row>
|
||||
|
||||
<script>
|
||||
var app = new Vue({
|
||||
el: "#CreateMove",
|
||||
data() {
|
||||
return {
|
||||
form: {
|
||||
address: 'HYB',
|
||||
tran: 'CHG',
|
||||
type: 'ZYC',
|
||||
address2: '',
|
||||
MaterialCode: '',
|
||||
MaterialName: '',
|
||||
Batch: '',
|
||||
Lot: '',
|
||||
},
|
||||
addressList: [{
|
||||
value: 'HYB',
|
||||
label: 'HYB'
|
||||
}],
|
||||
address2List: [{
|
||||
value: 'HYB',
|
||||
label: 'HYB'
|
||||
}],
|
||||
options: [{
|
||||
value: '',
|
||||
label: '=请选择='
|
||||
}, {
|
||||
value: 'A',
|
||||
label: 'A'
|
||||
}, {
|
||||
value: 'Q',
|
||||
label: 'Q'
|
||||
}, {
|
||||
value: 'R',
|
||||
label: 'R'
|
||||
}],
|
||||
tranList: [{
|
||||
value: 'CHG',
|
||||
label: 'CHG'
|
||||
}],
|
||||
typeList: [{
|
||||
value: 'ZYC',
|
||||
label: '转移出库'
|
||||
}],
|
||||
wareList: [{
|
||||
value: '',
|
||||
label: '=请选择='
|
||||
}],
|
||||
loading: false,
|
||||
tableData: [],
|
||||
currentPage: 1, // 当前页码
|
||||
total: 20, // 总条数
|
||||
pageSize: 20, // 每页的数据条数
|
||||
// 需要编辑的属性
|
||||
editProp: ['ThisQty', 'UserDef2', 'UserDef3'],
|
||||
multipleSelection: []
|
||||
};
|
||||
},
|
||||
mounted: function () {
|
||||
// var t = localStorage.getItem("WareHouseId");
|
||||
// console.log(t);
|
||||
// 获取所有单据编码
|
||||
$.ajax({
|
||||
type: "post",
|
||||
dataType: "json",
|
||||
data: {},
|
||||
url: "/xwms/ShipmentHeader2/SearchWare",
|
||||
success: function (json) {
|
||||
app.wareList.push(...json.Data)
|
||||
console.log(app.wareList);
|
||||
},
|
||||
error: function (json) {
|
||||
alert("加载失败");
|
||||
}
|
||||
});
|
||||
},
|
||||
computed: {
|
||||
foodLabel() {
|
||||
return (val) => {
|
||||
return this.options.find(o => o.value === val).label
|
||||
}
|
||||
},
|
||||
foodLabel2() {
|
||||
return (val) => {
|
||||
return this.wareList.find(o => o.value === val).label
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
/** 鼠标移入cell */
|
||||
handleCellEnter(row, column, cell, event) {
|
||||
const property = column.property
|
||||
if (this.editProp.includes(property)) {
|
||||
cell.querySelector('.item__input').style.display = 'block'
|
||||
cell.querySelector('.item__txt').style.display = 'none'
|
||||
}
|
||||
},
|
||||
/** 鼠标移出cell */
|
||||
handleCellLeave(row, column, cell, event) {
|
||||
const property = column.property
|
||||
if (this.editProp.includes(property)) {
|
||||
cell.querySelector('.item__input').style.display = 'none'
|
||||
cell.querySelector('.item__txt').style.display = 'block'
|
||||
}
|
||||
},
|
||||
//每页条数改变时触发 选择一页显示多少行
|
||||
handleSizeChange(val) {
|
||||
this.currentPage = 1;
|
||||
this.pageSize = val;
|
||||
},
|
||||
//当前页改变时触发 跳转其他页
|
||||
handleCurrentChange(val) {
|
||||
this.currentPage = val;
|
||||
},
|
||||
handleSelectionChange(val) {
|
||||
this.multipleSelection = val;
|
||||
},
|
||||
search() {
|
||||
var _this = this;
|
||||
_this.loading = true;
|
||||
$.ajax({
|
||||
type: "post",
|
||||
dataType: "json",
|
||||
data: {
|
||||
materialCode: _this.form.MaterialCode,
|
||||
materialName: _this.form.MaterialName,
|
||||
batch: _this.form.Batch,
|
||||
lot: _this.form.Lot
|
||||
},
|
||||
url: "/xwms/ShipmentHeader2/SearchInv",
|
||||
success: function (json) {
|
||||
_this.tableData = json.Data;
|
||||
_this.loading = false;
|
||||
},
|
||||
error: function (json) {
|
||||
_this.$message.error("加载失败");
|
||||
_this.loading = false;
|
||||
}
|
||||
});
|
||||
},
|
||||
create() {
|
||||
var _this = this;
|
||||
layer.confirm('确定创建出库单据?', {
|
||||
btn: ['确定', '取消']
|
||||
}, function () {
|
||||
//加校验
|
||||
if (_this.multipleSelection.length == 0) {
|
||||
layer.alert("至少选择一条数据!!", { icon: 5, shadeClose: true, title: "错误信息" });
|
||||
return;
|
||||
}
|
||||
$.ajax({
|
||||
type: "post",
|
||||
dataType: "json",
|
||||
data: {
|
||||
tran: _this.form.tran,
|
||||
address: _this.form.address2,
|
||||
data: _this.multipleSelection
|
||||
},
|
||||
url: "/xwms/ShipmentHeader2/CreateMoveBill",
|
||||
success: function (json) {
|
||||
if (json.Code == 200) {
|
||||
layer.msg("创建成功", { icon: 6, shade: 0.4, time: 1500 });
|
||||
_this.$refs.tableData.clearSelection();
|
||||
}
|
||||
else {
|
||||
layer.alert("创建失败!!", { icon: 5, shadeClose: true, title: "错误信息" });
|
||||
}
|
||||
},
|
||||
error: function (json) {
|
||||
layer.alert("创建失败!!", { icon: 5, shadeClose: true, title: "错误信息" });
|
||||
}
|
||||
});
|
||||
});
|
||||
},
|
||||
verify(array) {
|
||||
const tmp = new Set();
|
||||
array.forEach(x => tmp.add(x.POHNUM_0));
|
||||
return tmp.size > 1 ? true : false;
|
||||
}
|
||||
},
|
||||
});
|
||||
</script>
|
||||
@@ -101,19 +101,19 @@
|
||||
<div class="item__txt">{{scope.row.ThisQty}}</div>
|
||||
</div>
|
||||
</el-table-column>
|
||||
@*<el-table-column label="库存状态" width="100" align="center" prop="UserDef1">
|
||||
@* <el-table-column label="库存状态" width="100" align="center" prop="InvenoryStatus">
|
||||
<div class="item" slot-scope="scope">
|
||||
<el-select class="item__input" v-model="scope.row.UserDef1" placeholder="请选择">
|
||||
<el-select class="item__input" v-model="scope.row.InvenoryStatus" placeholder="请选择">
|
||||
<el-option v-for="item in options"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value">
|
||||
</el-option>
|
||||
</el-select>
|
||||
<div class="item__txt">{{foodLabel(scope.row.UserDef1)}}</div>
|
||||
<div class="item__txt">{{foodLabel(scope.row.InvenoryStatus)}}</div>
|
||||
</div>
|
||||
</el-table-column>
|
||||
*@
|
||||
</el-table-column> *@
|
||||
|
||||
</el-table>
|
||||
|
||||
<el-pagination align='center'
|
||||
@@ -241,14 +241,11 @@
|
||||
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;
|
||||
if (property == "ThisQty") {
|
||||
// 库存单位除以系数
|
||||
if (row.THISQTYSTU > row.QTY) {
|
||||
row.THISQTYSTU = row.QTY;
|
||||
layer.alert("不能超出单据数量!!", { icon: 5, shadeClose: true, title: "错误信息" });
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -76,6 +76,7 @@ namespace HHWMS.Web.Models
|
||||
/// 类别A
|
||||
/// </summary>
|
||||
[Column("classA")]
|
||||
[Display(Name = "Material2.ClassA")]
|
||||
public string ClassA { get; set; }
|
||||
/// <summary>
|
||||
/// 类别B
|
||||
|
||||
@@ -115,6 +115,7 @@ namespace HHWMS.Web.Models
|
||||
/// </summary>
|
||||
[Column("materialName")]
|
||||
[Display(Name = "ReceiptDetail2.MaterialName")]
|
||||
[CanNotEdit]
|
||||
public string MaterialName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
@@ -167,8 +168,9 @@ namespace HHWMS.Web.Models
|
||||
/// <summary>
|
||||
/// 系统数量
|
||||
/// </summary>
|
||||
[Column("qty")]
|
||||
[Column("qty", TypeName = "decimal(18,9)")]
|
||||
[Display(Name = "ReceiptDetail2.Qty")]
|
||||
[Required]
|
||||
public decimal? Qty { get; set; }
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -13,7 +13,7 @@ namespace HHWMS.Web.Models
|
||||
{
|
||||
[Key]
|
||||
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
|
||||
public new int ID { get; set; }
|
||||
public new int? ID { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 仓库Id
|
||||
|
||||
@@ -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; }
|
||||
}
|
||||
}
|
||||
@@ -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"
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user