From e05f0fb09b78e6de1dd4ad808fdbe1e044ebbbdd Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期五, 28 三月 2025 11:46:33 +0800
Subject: [PATCH] 添加生成收货单功能及相关接口
---
Tiger.Business.WMS/ERP/U9C_WMS.cs | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/Tiger.Business.WMS/ERP/U9C_WMS.cs b/Tiger.Business.WMS/ERP/U9C_WMS.cs
index 73fa43c..9563e70 100644
--- a/Tiger.Business.WMS/ERP/U9C_WMS.cs
+++ b/Tiger.Business.WMS/ERP/U9C_WMS.cs
@@ -9,6 +9,7 @@
using Tiger.IBusiness;
using SqlSugar;
using System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;
+using Tiger.Model.Entitys.MES.U9C;
namespace Tiger.Business.WMS
{
@@ -129,9 +130,10 @@
ID = dtl.LineID.ToString(),
ITEM_CODE = dtl.ItemCode,
QTY_PACKING = dtl.PackQty.ToDouble(),
- QTY = dtl.POQtyTU.ToDouble(),
+ QTY = dtl.ShipQtyTU.ToDouble(),
+ PO_QTY = dtl.POQtyTU,
SUPP_CODE = dtl.SupplierCode,
- SUPP_LOTNO = dtl.SupplierLot,
+ SUPP_LOTNO = dtl.LotMater,
LOTNO = dtl.LotMater,
AUTH_ORG = orgs.FirstOrDefault(q => q.ID == dtl.Org.ToString())?.ORG_CODE,
CREATE_TIME = dtl.ModifiedOn,//--鏃堕棿涓嶆洿鏂�
@@ -145,10 +147,12 @@
foreach (var asn in asns)
{
var snlist = db.Queryable<mes_MaterialBarCode>().Where(x => x.Segment1 == asn.ORDER_NO || x.Segment2 == asn.ORDER_NO).ToList();
+
foreach (var sn in snlist)
{
var barcode = new Barcode(sn.Code);
var dtl = dtls.First(q => q.LINE_NO == barcode.OrderLine);
+ var asnDtl = list.First(q => q.DocLineNo.ToString() == barcode.OrderLine);
BIZ_U9_ASN_SN info = new()
{
AUTH_ORG = asn.AUTH_ORG,
@@ -176,7 +180,7 @@
AUTH_ORG = asn.AUTH_ORG,
STATUS = WMS_ITEM.STATUSs.Incoming.GetValue(),
QTY = sn.WhQty,
- PROD_DATE = barcode.ProdDate ?? DateTime.Now,
+ PROD_DATE = barcode.ProdDate ?? BarcodeAnalysis.GetDateTime(asnDtl.SupplierLot) ??DateTime.Now,
UNIT = barcode.Unit,
TRANS_CODE = nameof(BIZ_U9_ASN),
TRANS_NO = info.ORDER_NO,
@@ -223,7 +227,7 @@
.WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
.ToStorage();
y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.ORDER_NO, q.SUPP_CODE, q.SUPP_NAME, q.DELIVERY_DATE, q.PLANARRIVED_DATE, q.ORDER_DATE, q.CREATE_USER, q.UPDATE_TIME, q.AUTH_ORG, q.UPDATE_USER, }).ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.ORDER_NO, q.SUPP_CODE, q.SUPP_NAME, q.DELIVERY_DATE,q.PLANARRIVED_DATE, q.ORDER_DATE, q.CREATE_USER, q.UPDATE_TIME, q.AUTH_ORG, q.UPDATE_USER, }).ExecuteCommand();
});
}
if (dtls.Any())
@@ -234,7 +238,7 @@
.WhereColumns(t => new { t.ORDER_NO, t.ID, t.GHOST_ROW })
.ToStorage();
y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.UpdateColumns(q => new { q.ORDER_NO, q.LINE_NO, q.SUPP_CODE, q.ID, q.ITEM_CODE, q.QTY_PACKING, q.QTY, q.SUPP_LOTNO, q.LOTNO, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
+ y.AsUpdateable.UpdateColumns(q => new { q.ORDER_NO, q.LINE_NO, q.SUPP_CODE, q.ID, q.ITEM_CODE, q.QTY_PACKING, q.QTY,q.PO_QTY, q.SUPP_LOTNO, q.LOTNO, q.AUTH_ORG, q.CREATE_USER, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
});
}
if (sns.Any())
@@ -328,11 +332,11 @@
{
BIZ_U9_RECEIPT_DTL info = new()
{
- STATUS = BIZ_U9_RETURN.STATUSs.Imported.GetValue(), //鐘舵��
+ STATUS = BIZ_U9_RMA.STATUSs.Imported.GetValue(), //鐘舵��
ORDER_NO = item.DocNo, //鍗曟嵁鍙�
LINE_NO = item.DocLineNo.ToString(), //鍗曟嵁琛屽彿
ITEM_CODE = item.ItemCode, //鐗╂枡缂栫爜
- QTY = item.RtnFillQtyTU.ToDouble(), // mes鍗曟嵁鏁伴噺 --U9閫�琛ユ暟閲�
+ QTY = item.EyeballingQtyTU.ToDouble(), // mes鍗曟嵁鏁伴噺 --U9閫�琛ユ暟閲�
AUTH_ORG = orgs.FirstOrDefault(q => q.ID == item.Org.ToString())?.ORG_CODE, //鐢熶骇鍗曞厓鎺堟潈鏍囪瘑瀛楃
CREATE_TIME = item.ModifiedOn,//--鏃堕棿涓嶆洿鏂�
CREATE_USER = UserCode,
@@ -387,13 +391,13 @@
string UserCode = "U9C_In_GetReturn";
var list = db.Queryable<mes_ReturnedDocInfo>().Where(x => x.SplitFlag == 0 && x.ReceivementType == 1 && x.ModifiedOn > input.startTime.ToDateTime() && x.ModifiedOn < input.endTime.ToDateTime()).ToList();
var orgs = Biz.Db.Queryable<SYS_ORGANIZATION>().ToList();
- List<BIZ_U9_RETURN> result = new();
- List<BIZ_U9_RETURN_DTL> resultDt = new();
+ List<BIZ_U9_RMA> result = new();
+ List<BIZ_U9_RMA_DTL> resultDt = new();
if (list != null && list.Count > 0)
{
result = list
.GroupBy(x => new { x.DocNo })
- .Select(x => new BIZ_U9_RETURN
+ .Select(x => new BIZ_U9_RMA
{
STATUS = BIZ_U9_RECEIPT.STATUSs.Init.GetValue(), //鐘舵��
ORDER_NO = x.Key.DocNo, //鍗曞彿
@@ -413,9 +417,9 @@
Logger.Scheduler.Info($"閫�璐у崟琛ㄥご淇℃伅瀛樺叆瀹炰綋涓紝鎬绘暟锛歔{result.Count}]");
foreach (var item in list)
{
- BIZ_U9_RETURN_DTL info = new()
+ BIZ_U9_RMA_DTL info = new()
{
- STATUS = BIZ_U9_RETURN.STATUSs.Imported.GetValue(), //鐘舵��
+ STATUS = BIZ_U9_RMA.STATUSs.Imported.GetValue(), //鐘舵��
ORDER_NO = item.DocNo, //鍗曟嵁鍙�
LINE_NO = item.DocLineNo.ToString(), //鍗曟嵁琛屽彿
ITEM_CODE = item.ItemCode, //鐗╂枡缂栫爜
@@ -617,7 +621,7 @@
{
ORDER_NO = item.DocNo, //鍗曟嵁鍙�
LINE_NO = item.DocLineNo.ToString(), //鍗曟嵁琛屽彿
- STATUS = BIZ_U9_RETURN.STATUSs.Imported.GetValue(), //鐘舵��
+ STATUS = BIZ_U9_RMA.STATUSs.Imported.GetValue(), //鐘舵��
ITEM_CODE = item.ItemCode, //鐗╂枡缂栫爜
UNIT =item.StoreUOM,// UNIT 鍗曚綅
QTY = item.StoreUOMQty,//QTY 鍗曟嵁鏁伴噺
--
Gitblit v1.9.3