入库明细拆分
铁心库打码
This commit is contained in:
1 parent
fa7b5814ba
commit
d19f62e48b
21 files changed
+513
-93
No files matched your search
@@ -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<string>("ITMREF_0")).ToHashSet();
|
||||
@@ -80,7 +83,7 @@ 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 = matList.FirstOrDefault(y => y.Code == x.Field<string>("ITMREF_0"))?.ClassA
|
||||
STATUS = matList.FirstOrDefault(y => y.Code == x.Field<string>("ITMREF_0"))?.ClassA ?? ""
|
||||
}
|
||||
).ToList();
|
||||
|
||||
@@ -117,6 +120,10 @@ public class XWMSSHIPController : BaseController
|
||||
var detailList = new List<ReceiptDetail2>();
|
||||
foreach (var item in data)
|
||||
{
|
||||
if (string.IsNullOrEmpty(item.STATUS)){
|
||||
tran.Rollback();
|
||||
return JsonMore(null, 500, $"状态不能为空!");
|
||||
}
|
||||
var qr = _unitwork.FindSingle<MaterialQr2>(x =>
|
||||
x.Code == item.ITMREF_0
|
||||
&& x.Batch == item.LOT_0
|
||||
|
||||
Reference in new issue
Block a user