This commit is contained in:
2025-06-13 14:26:17 +08:00
parent d41b16306e
commit 4dce18c459
2 changed files with 42 additions and 41 deletions

View File

@@ -519,11 +519,11 @@ namespace Pilot_KD_Parino.Sal_Order
{
string sql2 = $@"/*dialect*/ SELECT FUseOrgId,fname, a.FSTOCKID,FForbidStatus,FDocumentStatus FROM T_BD_STOCK a
LEFT JOIN T_BD_STOCK_L b ON a.FSTOCKID=b.FSTOCKID
WHERE fname like '%成品仓%' AND FForbidStatus='A' AND FDocumentStatus='C' AND FUseOrgId={stocks3["StockOrgId_Id"]}";
WHERE fname like '%周转仓%' AND FForbidStatus='A' AND FDocumentStatus='C' AND FUseOrgId={stocks3["StockOrgId_Id"]}";
var stockList = DBServiceHelper.ExecuteDynamicObject(this.Context, sql2, null, null, CommandType.Text, null);
if (stockList == null || stockList.Count == 0)
{
throw new KDBusinessException("", "所涉及的跨组织单位没有配置成品仓");
throw new KDBusinessException("", "所涉及的跨组织单位没有配置周转仓");
}
@@ -584,11 +584,42 @@ namespace Pilot_KD_Parino.Sal_Order
{
t["StockID_Id"] = temStockId;
});
}
//SAL_OUTSTOCK
if (target == "SAL_OUTSTOCK")//销售出库单,强制跨组织的出库单是周转仓 2025-06-13
{
//var sheet = destObjs.FirstOrDefault(); PUR_ReceiveEntry
string pur = ("SAL_OUTSTOCKENTRY");
var stocks3 = destObjs[0];
if (temStockId == 0 || 1==1) //强制跨组织的出库单是周转仓
{
string sql2 = $@"/*dialect*/ SELECT FUseOrgId,fname, a.FSTOCKID,FForbidStatus,FDocumentStatus FROM T_BD_STOCK a
LEFT JOIN T_BD_STOCK_L b ON a.FSTOCKID=b.FSTOCKID
WHERE fname like '%周转仓%' AND FForbidStatus='A' AND FDocumentStatus='C' AND FUseOrgId={stocks3["StockOrgId_Id"]}";
var stockList = DBServiceHelper.ExecuteDynamicObject(this.Context, sql2, null, null, CommandType.Text, null);
if (stockList == null || stockList.Count == 0)
{
throw new KDBusinessException("", "所涉及的跨组织单位没有配置周转仓");
}
temStockId = stockList.Select(t => int.Parse(t["FSTOCKID"].ToString())).FirstOrDefault();
stockId = temStockId;
}
var stocks333 = stocks3[pur];
var stocks = stocks333 as DynamicObjectCollection;
var stock0 = stocks.ToList();
stock0.ForEach(t =>
{
t["StockID_Id"] = temStockId;
});
}
//根据实际情况,处理目标单据数据
//destObjs[0]["Date"] = Convert.ToDateTime(sDate);
//DynamicObjectCollection col_FEntityDetail;