取消内部收货二维码校验

This commit is contained in:
zgf committed 2024-01-20 15:34:59 +08:00
1 parent 67227db833
commit cce238c833
1 file changed
+11 -11
@@ -36,7 +36,7 @@ public class XWMSSHIPController : BaseController
public ActionResult Search(string address, string billno, string ITMDES2_0, string sbill, string materialcode) public ActionResult Search(string address, string billno, string ITMDES2_0, string sbill, string materialcode)
{ {
var _unitwork = new UnitWork(Wtm); var _unitwork = new UnitWork(Wtm);
var sql = @"select * from QRE.XWMSSHIP where 1=1"; var sql = @"select * from QRE.XWMSSHIP where 1=1";
if (!string.IsNullOrEmpty(address)) if (!string.IsNullOrEmpty(address))
{ {
@@ -86,7 +86,7 @@ public class XWMSSHIPController : BaseController
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(); ).ToList();
return JsonMore(list); return JsonMore(list);
} }
@@ -124,15 +124,15 @@ public class XWMSSHIPController : BaseController
// tran.Rollback(); // tran.Rollback();
// return JsonMore(null, 500, $"状态不能为空!"); // return JsonMore(null, 500, $"状态不能为空!");
//} //}
var qr = _unitwork.FindSingle<MaterialQr2>(x => // var qr = _unitwork.FindSingle<MaterialQr2>(x =>
x.Code == item.ITMREF_0 // x.Code == item.ITMREF_0
&& x.Batch == item.LOT_0 // && x.Batch == item.LOT_0
); // );
if (qr == null) // if (qr == null)
{ // {
tran.Rollback(); // tran.Rollback();
return JsonMore(null, 500, $"未查找到物料码 {item.ITMREF_0} 对应的二维码"); // return JsonMore(null, 500, $"未查找到物料码 {item.ITMREF_0} 对应的二维码");
} // }
var detail = new ReceiptDetail2(); var detail = new ReceiptDetail2();
detail.WarehouseId = receipt.WarehouseId; detail.WarehouseId = receipt.WarehouseId;
detail.ReceiptId = receipt.ID; detail.ReceiptId = receipt.ID;