From eb64567d5da7d6a5c80b7579b486234b89b0e6ee Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期一, 25 十一月 2024 15:19:01 +0800
Subject: [PATCH] 包装完成标志
---
Tiger.Business.MES/BIZ/BIZ_MES_WO.cs | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
index 29d2183..2755254 100644
--- a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
+++ b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
@@ -605,22 +605,31 @@
/// </summary>
/// <param name="wo"></param>
/// <returns></returns>
- public async Task<ApiAction<ShippingOutput>> GetShipList(string wo, string orgCode)
+ public async Task<ApiAction<ShippingOutput>> GetShipList(ShippingInput input)
{
var result = new ApiAction<ShippingOutput>();
try
{
DbClient db = Biz.DataSource["YadaU9C"].Client;
- var org = await Biz.Db.Queryable<SYS_ORGANIZATION>().Where(q => q.ORG_CODE == orgCode).FirstAsync();
- var ship = db.Queryable<mes_ShipList>().Where(q => q.MoDoc.Equals(wo) && q.Org == org.ID.ToInt64()).First();
+ var org = await Biz.Db.Queryable<SYS_ORGANIZATION>().Where(q => q.ORG_CODE == input.orgCode).FirstAsync();
+ string wo = input.wo;
+ if (!input.SN.IsNullOrEmpty() && input.wo.IsNullOrEmpty()) {
+ var woSn = Biz.Db.Queryable<BIZ_MES_WO_SN>().Where(q => q.SN == input.SN || q.FLOW_SN == input.SN).First();
+ if (!woSn.IsNullOrEmpty()) {
+ wo = woSn.WORK_ORDER;
+ }
+ }
+ var ship = db.Queryable<mes_ShipList>().Where(q => q.MoDoc.Equals(wo) && q.Org == org.ID.ToInt64() && q.Status == 2 ).First();
if (!ship.IsNullOrEmpty())
{
result.Data = ship.BusinessDate.Date == DateTime.Now.Date ? new()
{
+ ShipDoc = ship.ShipDoc,
ShippingQty = ship.ShipQty,
Tag = "Customer"
} : new()
{
+ ShipDoc = ship.ShipDoc,
ShippingQty = ship.ShipQty,
Tag = "InStoreLabel"
};
@@ -630,6 +639,7 @@
{
result.Data = new()
{
+ ShipDoc = "",
ShippingQty = 0,
Tag = "InStoreLabel"
};
@@ -706,20 +716,22 @@
WORK_ORDER = wo.ORDER_NO,
BATCH_NO = woSns[0].BATCH_NO,
ITEM_CODE = wo.ITEM_CODE,
- ITEM_NAME = wo.ItemInfo?.ITEM_NAME,
+ ITEM_NAME = wo.ItemInfo?.ITEM_DESC,
SCAN_QTY = woSns.Count
},
ProdInBatch = new()
{
WORK_ORDER = wo.ORDER_NO,
+ SALES_ORDER = wo.SALES_ORDER,
BATCH_NO = woSns[0].BATCH_NO,
ITEM_CODE = wo.ITEM_CODE,
- ITEM_NAME = wo.ItemInfo?.ITEM_NAME,
+ ITEM_NAME = wo.ItemInfo?.ITEM_DESC,
PLAN_QTY = wo.PLAN_QTY,
SCAN_QTY = woSns.Count
},
InStoreScanInfo = new() {
SN = code,
+ SALES_ORDER = wo.SALES_ORDER,
WORK_ORDER = wo.ORDER_NO,
BATCH_NO = woSns[0].BATCH_NO,
SCAN_QTY = woSns.Count
--
Gitblit v1.9.3