From a9759e8c6b70a4d94d65ca99435fb6d328051c48 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 27 一月 2026 14:47:20 +0800
Subject: [PATCH] layui、vue容器主档增加字段 托体积HPackV、托标准容器数量 HStandardQtyForMouldInPack
---
WebAPI/Controllers/Sc_ProcessMangementController.cs | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index d1917d2..e07ff59 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -1707,9 +1707,10 @@
objJsonResult.data = null;
return objJsonResult;
}
+ LogService.Write("WMS_CampanyName: ", oSystemParameter.omodel.WMS_CampanyName);
- //if (oSystemParameter.omodel.WMS_CampanyName == "閿﹂殕")
- //{
+ if (string.Equals(oSystemParameter.omodel.WMS_CampanyName, "閿﹂殕"))
+ {
string sql = @"select a.FID,a.FNUMBER Employee,d.FNUMBER Dept from Gy_Employee e
join JL20250716203240..T_HR_EMPINFO a on e.HNumber = a.FNUMBER
join JL20250716203240..T_BD_STAFFTEMP c on c.FID = a.FID
@@ -1717,7 +1718,7 @@
where e.HItemID ='" + HKeeperID + "' ";
//鏌ヨ璐ㄦ鍛樺搴旇川妫�閮ㄩ棬
ds = oCN.RunProcReturn(sql, "T_HR_EMPINFO");
- LogService.Write("sql" + sql);
+ // LogService.Write("sql" + sql);
if (ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -1726,7 +1727,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- //}
+ }
@@ -1737,11 +1738,10 @@
model.Add("FInspectOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //璐ㄦ缁勭粐
model.Add("FSourceOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //鏉ユ簮缁勭粐
//model.Add("FInspectDepId", new JObject() { ["Fnumber"] = ds.Tables[0].Rows[0]["Dept"].ToString() }); //璐ㄦ閮ㄩ棬
- LogService.Write("WMS_CampanyName: ", oSystemParameter.omodel.WMS_CampanyName);
- // if (oSystemParameter.omodel.WMS_CampanyName == "閿﹂殕")
- // {
+ if (string.Equals(oSystemParameter.omodel.WMS_CampanyName, "閿﹂殕"))
+ {
model.Add("FInspectorId", new JObject() { ["Fnumber"] = ds.Tables[0].Rows[0]["Employee"].ToString() }); //璐ㄦ鍛�
- // }
+ }
model.Add("FISSYNCED", "false");// 鏄惁宸插悓姝�
model.Add("F_PGKJ_Date", DateTime.Now.ToString("yyyy-MM-dd"));// 鎶ユ鏃ユ湡
model.Add("FBillNo", HBillNo);
@@ -1783,6 +1783,11 @@
FentityModel2.Add("FUsePolicy", HUseResult.ToString()); //浣跨敤鍐崇瓥
FentityModel2.Add("FIsCheck", false); //鏄惁鎶芥
FentityModel2.Add("FIsDefectProcess", false); //涓嶈壇澶勭悊
+ // 閿﹂殕鍚敤涓嶈壇澶勭悊
+ if (string.Equals(oSystemParameter.omodel.WMS_CampanyName, "閿﹂殕"))
+ {
+ FentityModel2.Add("FIsDefectProcess", true); //涓嶈壇澶勭悊
+ }
FentityModel2.Add("FCanSale", false); //鍙攢鍞�
FentityModel2.Add("FIsMRBReview", false); //MRP璇勫
FentityModel2.Add("FIsReturn", true); //鍒ら��
--
Gitblit v1.9.1