From f9a5863dd719d6036e28391b0d4f39b2d349f3e9 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 24 四月 2023 08:30:19 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | 239 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 203 insertions(+), 36 deletions(-)
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
index b38c925..5118795 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
@@ -41,7 +41,7 @@
omdelMian = JsonConvert.DeserializeObject<Sc_WorkBillSortBillMain>(sWhere);
ds = oCN.RunProcReturn($"exec h_p_JIT_Sc_WorkBillSortBill_Query '{omdelMian.HPlanBeginDate}',{(omdelMian.HProdORGID == null ? 0 : omdelMian.HProdORGID)},'{omdelMian.HSeOrderBillNo}'" +
- $",'{omdelMian.HPlanEndDate.AddDays(1).AddSeconds(-1)}',{omdelMian.HMaterID},'{omdelMian.HICMOBillNo}',{omdelMian.HWorkShopID}", "h_p_JIT_Sc_WorkBillSortBill_Query");
+ $",'{omdelMian.HPlanEndDate.AddDays(1)}',{omdelMian.HMaterID},'{omdelMian.HICMOBillNo}',{omdelMian.HWorkShopID}", "h_p_JIT_Sc_WorkBillSortBill_Query");
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -73,7 +73,7 @@
{
if (num == 1)
{
- ds = oCN.RunProcReturn($"select isnull(DATEDIFF(DAY,GETDATE(),CONVERT(varchar(10),max(HMasterDate),20)),0) DayNum from Sc_WorkBillSortBillSub where HInterID in ({sWhere}) and HMasterDate>=CONVERT(varchar(10),GETDATE(),20) and HLockedSub=1", "Sc_WorkBillSortBillSub");
+ ds = oCN.RunProcReturn($"select isnull(DATEDIFF(DAY,GETDATE(),CONVERT(varchar(10),max(HMasterDate),20))+1,0) DayNum from Sc_WorkBillSortBillSub where HInterID in ({sWhere}) and HMasterDate>=CONVERT(varchar(10),GETDATE(),20) and HLockedSub=1", "Sc_WorkBillSortBillSub");
}
else if (num == 2)
{
@@ -176,7 +176,7 @@
var HMaterModel = list[i]["瑙勬牸鍨嬪彿"].ToString();
var HUnitID = list[i]["HUnitID"].ToString();
var HSeOrderBillQty = list[i]["閿�鍞鍗曟暟閲�"].ToString();
- var HOrderNeedQty = list[i]["璁㈠崟闇�姹傛暟閲�"].ToString();
+ //var HOrderNeedQty = list[i]["璁㈠崟闇�姹傛暟閲�"].ToString();
var HSplitQty = list[i]["鎷嗗崟鏁伴噺"].ToString();
var HDayPlanSumQty = list[i]["鏃ヨ鍒掓暟閲忔�婚噺"].ToString();
var HPlanBeginDate = list[i]["璁″垝寮�濮嬫棩鏈�"].ToString();
@@ -187,8 +187,9 @@
var HOrderLev = list[i]["璁㈠崟绛夌骇"].ToString();
var HMainSourceInterID = list[i]["婧愬崟涓诲唴鐮�"].ToString();
var HMainSourceEntryID = list[i]["婧愬崟瀛愬唴鐮�"].ToString();
+ var HPlanQty = list[i]["璁″垝鏁伴噺"].ToString();
- if (HSourceID == "")
+ if (HSourceID == ""|| HSourceID == "0")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -197,7 +198,7 @@
return objJsonResult;
}
- ds = oCN.RunProcReturn($"select * from Sc_WorkBillSortBillMain where HMainSourceEntryID={HMainSourceEntryID}" +
+ ds = oCN.RunProcReturn($"select * from Sc_WorkBillSortBillMain where HMainSourceInterID={HMainSourceInterID}" +
$" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID}", "Sc_WorkBillSortBillMain");
if (ds.Tables[0].Rows.Count > 0)
{
@@ -218,16 +219,59 @@
"HICMOEntrySEQ,HWorkShopID,HSourceID, HYX, HProdORGID," +
" HMaterID, HMaterName, HMaterModel, HUnitID, HSeOrderBillQty," +
" HOrderNeedQty, HSplitQty, HDayPlanSumQty,HPlanBeginDate," +
- "HSeOrderBillNo,HICMOBillType,HSourceStockInQty,HLeftPlanQty,HOrderLev,HPreparatDate)values" +
+ "HSeOrderBillNo,HICMOBillType,HSourceStockInQty,HLeftPlanQty,HOrderLev,HPreparatDate," +
+ "HMainSourceInterID,HMainSourceEntryID,HICMOInterID_Sec,HICMOEntryID_Sec,HPlanQty)values" +
$"({HInterID},'{HBillNo}',{DateTime.Now.Year},{DateTime.Now.Month},'{BillType}'," +
$"'{BillType}',GETDATE(),1,'{user}',getdate(),'{HICMOBillNo}','{HOrderType}'," +
$"{(HICMOEntrySEQ == "" ? 0.ToString() : HICMOEntrySEQ)},{(HWorkShopID == "" ? 0.ToString() : HWorkShopID)},{(HSourceID == "" ? 0.ToString() : HSourceID)}, {(HYX == "" ? 0.ToString() : HYX)}, {(HProdORGID == "" ? 0.ToString() : HProdORGID)}," +
$" {(HMaterID == "" ? 0.ToString() : HMaterID)}, '{HMaterName}', '{HMaterModel}', {(HUnitID == "" ? 0.ToString() : HUnitID)}, {(HSeOrderBillQty == "" ? 0.ToString() : HSeOrderBillQty)}," +
- $" {(HOrderNeedQty == "" ? 0.ToString() : HOrderNeedQty)}, {(HSplitQty == "" ? 0.ToString() : HSplitQty)}, {(HDayPlanSumQty == "" ? 0.ToString() : HDayPlanSumQty)},'{HPlanBeginDate}'," +
- $"'{HSeOrderBillNo}','{HICMOBillType}',{(HSourceStockInQty == "" ? 0.ToString() : HSourceStockInQty)},{(HLeftPlanQty == "" ? 0.ToString() : HLeftPlanQty)},'{HOrderLev}',getdate())");
+ $" 0, {(HSplitQty == "" ? 0.ToString() : HSplitQty)}, {(HDayPlanSumQty == "" ? 0.ToString() : HDayPlanSumQty)},'{HPlanBeginDate}'," +
+ $"'{HSeOrderBillNo}','{HICMOBillType}',{(HSourceStockInQty == "" ? 0.ToString() : HSourceStockInQty)},{(HLeftPlanQty == "" ? 0.ToString() : HLeftPlanQty)},'{HOrderLev}',getdate()," +
+ $"{HMainSourceInterID},{HMainSourceEntryID},{HMainSourceInterID},{HMainSourceEntryID},{HPlanQty})");
+ }
+ else
+ {
+ var HMainSourceInterID = list[i]["婧愬崟涓诲唴鐮�"].ToString();
+ var HMainSourceEntryID = list[i]["婧愬崟瀛愬唴鐮�"].ToString();
+ var HICMOBillNo = list[i]["鐢熶骇璁㈠崟鍙�"].ToString();
+ var HICMOEntrySEQ = list[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"].ToString();
+ var HSourceID = list[i]["HSourceID"].ToString();
+ var HYX = list[i]["浼樺厛绾�"].ToString();
+
+ if (HSourceID == "" || HSourceID == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"绗瑊i + 1}琛岀敓浜ц祫婧愪笉鑳戒负绌�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ var str = 0;
+ if (!int.TryParse(HYX, out str))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"绗瑊i + 1}琛屼紭鍏堢骇:{HYX},璇疯緭鍏ユ暟瀛�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn($"select * from Sc_WorkBillSortBillMain where HMainSourceInterID={HMainSourceInterID}" +
+ $" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID}", "Sc_WorkBillSortBillMain");
+
+ if (ds.Tables[0].Rows.Count > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"绗瑊i + 1}琛岀敓浜ц祫婧愭湁閲嶅,璇蜂慨鏀�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc($"update Sc_WorkBillSortBillMain set HSourceID={(HSourceID == "" ? 0.ToString() : HSourceID)},HYX={HYX} where HInterID={list[i]["hmainid"].ToString()} and HBillNo='{list[i]["鍗曟嵁鍙�"].ToString()}'");
}
- oCN.RunProc($"update Sc_WorkBillSortBillMain set HDayPlanSumQty={list[i]["鏃ヨ鍒掓暟閲忔�婚噺"].ToString()} where HInterID={list[i]["hmainid"].ToString()} and HBillNo='{list[i]["鍗曟嵁鍙�"].ToString()}'");
+ oCN.RunProc($"update Sc_WorkBillSortBillMain set HDayPlanSumQty={list[i]["鏃ヨ鍒掓暟閲忔�婚噺"].ToString()} where HInterID={(HInterID==0?int.Parse(list[i]["hmainid"].ToString()):HInterID)} and HBillNo='{(HBillNo==""?list[i]["鍗曟嵁鍙�"].ToString(): HBillNo)}'");
int SumDay = 31; //鍔ㄦ�佷袱鏈堜箣宸� DateTime.Now.AddMonths(1).AddDays(-1).Subtract(DateTime.Now).Days;
@@ -264,6 +308,9 @@
objJsonResult.data = null;
return objJsonResult;
}
+
+ //鍚屾鏃ヨ鍒掑伐鍗�
+ oCN.RunProc("exec REALESE_SC_ICMOBILLSTATUS_TMP");
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -304,7 +351,7 @@
if (count != 1)
{
//鎻掑叆瀛愯〃
- oCN.RunProc("insert into Sc_WorkBillSortBillSub(HInterID,HEntryID," +
+ oCN.RunProc("insert into Sc_WorkBillSortBillSub(HInterID,HSEQ," +
"HMasterDate,HQty)" +
$"values({HInterID}, {(ds.Tables[0].Rows.Count + 1)}," +
$" '{date}', {HQTY})");
@@ -323,7 +370,10 @@
#region 娓呭崟閰嶆枡鏂瑰紡
public class PRD_PPBOM
{
-
+ /// <summary>
+ /// 鏃ヨ鍒掑伐鍗曞彿
+ /// </summary>
+ public string HMainICMOBillNo { get; set; }
/// <summary>
/// 鏃ヨ鍒掑伐鍗旻ID
/// </summary>
@@ -474,6 +524,14 @@
/// 浠撳簱缂栫爜
/// </summary>
public string FStockNumber { get; set; }
+ /// <summary>
+ /// 鎵瑰彿
+ /// </summary>
+ public string HLOT { get; set; }
+ /// <summary>
+ /// id
+ /// </summary>
+ public string HInventoryFID { get; set; }
}
#endregion
@@ -537,6 +595,10 @@
/// 涓荤敓浜ц鍗曞瓙鍐呯爜锛欶HMainICMOEntryID
/// </summary>
public string FHMainICMOEntryID { get; set; }
+ /// <summary>
+ /// 鏃ヨ鍒掕鍗曞崟鍙凤細HMainICMOBillNo
+ /// </summary>
+ public string HMainICMOBillNo { get; set; }
/// <summary>
/// 鏃ヨ鍒掕鍗曚富鍐呯爜锛欶HICMOInterID
/// </summary>
@@ -633,6 +695,9 @@
public string FStock { get; set; }
//杞﹂棿
public string FWorkShop { get; set; }
+ //鎵瑰彿
+ public string HLOT { get; set; }
+ public string HInventoryFID { get; set; }
}
#endregion
@@ -643,7 +708,6 @@
{
try
{
- oCN.BeginTran();
Stopwatch sw = new Stopwatch();
omdelMian = JsonConvert.DeserializeObject<Sc_WorkBillSortBillMain>(sWhere);
string sql = $"exec JIT_qtfx {omdelMian.HProdORGID},{omdelMian.HWorkShopID},'{user}' ";
@@ -653,7 +717,14 @@
DataTable resulTable = ds.Tables[0];
if (resulTable.Rows[0][0].ToString().Contains("澶辫触"))
{
- return resulTable.Rows[0][0].ToString();
+ //閲婃斁榻愬鎿嶄綔 閬垮厤澶氫汉鍚屾椂杩涜榻愬鍒嗘瀽
+ oCN.RunProc($"update T_PRD_QTFX set FSTATUS = 0 where FPRDORGID ={omdelMian.HProdORGID} and FSTATUS = 1 ");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = resulTable.Rows[0][0].ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
}
else
{
@@ -664,7 +735,14 @@
string fDayPlanFEntryids = string.Empty;
if (BomList.Count == 0)
{
- return "娌℃湁闇�瑕佽繘琛岄綈濂楀垎鏋愮殑鏁版嵁";
+ //閲婃斁榻愬鎿嶄綔 閬垮厤澶氫汉鍚屾椂杩涜榻愬鍒嗘瀽
+ oCN.RunProc($"update T_PRD_QTFX set FSTATUS = 0 where FPRDORGID ={omdelMian.HProdORGID} and FSTATUS = 1 ");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "娌℃湁闇�瑕佽繘琛岄綈濂楀垎鏋愮殑鏁版嵁";
+ objJsonResult.data = null;
+ return objJsonResult;
}
else
{
@@ -679,10 +757,11 @@
//鑾峰彇褰撳墠鍗虫椂搴撳瓨 搴撳瓨鏁伴噺+搴撳瓨缁勭粐+鐗╂枡+璐т富+浠撳簱
ds = oCN.RunProcReturn(@"
-select distinct isnull(a.FBASEQTY,0) FBASEQTY,b.FNumber,a.FOwnerTypeId,a.FOwnerId,c.FNUMBER as FOwnerNumber,a.FSTOCKID,d.FNUMBER as FStockNumber from
+select distinct isnull(a.FBASEQTY,0) FBASEQTY,b.FNumber,a.FOwnerTypeId,a.FOwnerId,c.FNUMBER as FOwnerNumber,a.FSTOCKID,d.FNUMBER as FStockNumber ,a.FLOT HLOT,a.FID HInventoryFID
+from
(
-select distinct a.HProdORGID FStockOrgId,T2.FMATERIALID,FNumber from SC_WORKBILLSORTBILLMAIN a
-join SC_WORKBILLSORTBILLSub b on a.HInterID = b.HInterID
+select distinct a.HProdORGID FStockOrgId,T2.FMATERIALID,FNumber from Sc_WorkBillSortBillMain a
+join Sc_WorkBillSortBillSub b on a.HInterID = b.HInterID
join AIS20210811135644..T_PRD_PPBOM T1 on a.HICMOInterID_Sec = t1.FMoId and a.HICMOEntryID_Sec = t1.FMOENTRYID
LEFT JOIN AIS20210811135644..T_PRD_PPBOMENTRY T2 on T1.FID = t2.FID
join AIS20210811135644..T_BD_MATERIAL T3 on T2.FMATERIALID = T3.FMATERIALID
@@ -713,7 +792,7 @@
from
(
select sum(HSourceStockInQty)FCXStockInQty,HICMOEntryID_Sec FPRDMOENTYID from SC_WORKBILLSORTBILLMAIN a
---where a.HInterID IN ({0})
+where a.HInterID IN ({0})
group by HICMOEntryID_Sec
) a
join AIS20210811135644..T_PRD_PPBOM T1 on a.FPRDMOENTYID = t1.FMOENTRYID
@@ -787,6 +866,7 @@
FHStockOrgID = _item.FStockOrgId,
FHPRDORGID = _item.FStockOrgId,
FPRDBillNo = _item.HICMOBillNo,
+ HMainICMOBillNo = _item.HMainICMOBillNo,
FOwnerTypeId = "",
FUnitDosage = _item.dwyl,//鍗曚綅鐢ㄩ噺
FSumPlanCount = planNeed,//璁″垝鎬绘暟閲�
@@ -830,6 +910,7 @@
FHStockOrgID = _item.FStockOrgId,
FHPRDORGID = _item.FStockOrgId,
FPRDBillNo = _item.HICMOBillNo,
+ HMainICMOBillNo = _item.HMainICMOBillNo,
FOwnerTypeId = "",
FUnitDosage = _item.dwyl,//鍗曚綅鐢ㄩ噺
FSumPlanCount = planNeed,//璁″垝鎬绘暟閲�
@@ -881,6 +962,7 @@
FHPRDORGID = _item.FStockOrgId,
FErpClsID = _item.FErpClsID,
FPRDBillNo = _item.HICMOBillNo,
+ HMainICMOBillNo = _item.HMainICMOBillNo,
FOwnerTypeId = Inventory.FOwnerTypeId,
FOwnerId = Inventory.FOwnerId,
FUnitDosage = _item.dwyl,//鍗曚綅鐢ㄩ噺
@@ -894,7 +976,9 @@
FComPlete = jskcQty >= need ? "榻愬" : "鏈綈濂�",
FPlanDate = item.HMasterDate, // 鏃ヨ鍒掓棩鏈�
FStock = Inventory.FSTOCKID,//浠撳簱
- FWorkShop = _item.HWorkShopID //杞﹂棿
+ FWorkShop = _item.HWorkShopID, //杞﹂棿
+ HLOT = Inventory.HLOT, //鎵瑰彿
+ HInventoryFID = Inventory.HInventoryFID //id
});
//鎵ｅ噺鎬诲簱瀛樻暟閲�
jskcQty = jskcQty >= fCompleteCount ? jskcQty - fCompleteCount : 0;
@@ -924,6 +1008,7 @@
FHStockOrgID = _item.FStockOrgId,
FHPRDORGID = _item.FStockOrgId,
FPRDBillNo = _item.HICMOBillNo,
+ HMainICMOBillNo = _item.HMainICMOBillNo,
FOwnerTypeId = "",
FUnitDosage = _item.dwyl,//鍗曚綅鐢ㄩ噺
FSumPlanCount = planNeed,//璁″垝鎬绘暟閲�
@@ -960,6 +1045,7 @@
insertDT.Columns.Add("FUNITDOSAGE", typeof(decimal));
insertDT.Columns.Add("FSUMPLANCOUNT", typeof(decimal));
insertDT.Columns.Add("FPRDBILLNO", typeof(string));
+ insertDT.Columns.Add("HMainICMOBillNo", typeof(string));
insertDT.Columns.Add("FOWNERID", typeof(long));
insertDT.Columns.Add("FOWNERTYPEID", typeof(string));
insertDT.Columns.Add("FPLANDATE", typeof(DateTime));
@@ -971,6 +1057,8 @@
insertDT.Columns.Add("FWORKSHOPID", typeof(long));
insertDT.Columns.Add("FSTOCKID", typeof(long));
insertDT.Columns.Add("FOCCUPYPICKEDCOUNT", typeof(decimal));
+ insertDT.Columns.Add("HLOT", typeof(long));
+ insertDT.Columns.Add("HInventoryFID", typeof(string));
int jdtmmm = 1;
ds = oCN.RunProcReturn("select max(HInterID)FID FROM JIT_MOMaterReadysBill", "JIT_MOMaterReadysBill");
int maxFid = int.Parse(ds.Tables[0].Rows[0][0].ToString() == "" ? "0" : ds.Tables[0].Rows[0][0].ToString());
@@ -991,6 +1079,7 @@
dr["FUNITDOSAGE"] = item.FUnitDosage;
dr["FSUMPLANCOUNT"] = item.FSumPlanCount;
dr["FPRDBILLNO"] = item.FPRDBillNo;
+ dr["HMainICMOBillNo"] = item.HMainICMOBillNo;
dr["FOWNERID"] = item.FOwnerId == null ? "0" : item.FOwnerId;
dr["FOWNERTYPEID"] = item.FOwnerTypeId;
dr["FPLANDATE"] = item.FPlanDate.ToString("yyyy-MM-dd");
@@ -1002,6 +1091,8 @@
dr["FWORKSHOPID"] = item.FWorkShop == null ? "0" : item.FWorkShop;
dr["FSTOCKID"] = item.FStock == null ? "0" : item.FStock;
dr["FOCCUPYPICKEDCOUNT"] = item.FOccupyPickedCount;
+ dr["HLOT"] = item.HLOT == null? "0" : item.HLOT;
+ dr["HInventoryFID"] = item.HInventoryFID == null ? "0" : item.HInventoryFID;
insertDT.Rows.Add(dr);
jdtmmm++;
}
@@ -1017,12 +1108,14 @@
", HICMOEntryID, HMaterID, HStockORGID, HStockQty, HLeftQty" +
", HProdORGID, HUnitDosage, HSumPlanQty, HICMOBillNo, HOwnerID" +
", HOwnerTypeID, HPlanDate, HComplete, HLackQty, HOccupyQty" +
- ", HCompleteQty1, HErpClsID, HWorkShopID, HWHID, HOccupyPickedQTY)values" +
+ ", HCompleteQty1, HErpClsID, HWorkShopID, HWHID, HOccupyPickedQTY,HMainICMOBillNo" +
+ ",HLOT,HInventoryFID)values" +
$"({item["FID"].ToString()}, 1, {item["FHMAINICMOINTERIDR"].ToString()}, {item["FHMAINICMOENTRYID"].ToString()}, {item["FHICMOINTERID"].ToString()}" +
$", {item["FHICMOENTRYID"].ToString()}, {item["FHMATERID"].ToString()}, {item["FHSTOCKORGID"].ToString()}, {item["FHSTOCKQTY"].ToString()}, {item["FHLEFTQTY"].ToString()}" +
$" , {item["FHPRDORGID"].ToString()}, {item["FUNITDOSAGE"].ToString()}, {item["FSUMPLANCOUNT"].ToString()}, '{item["FPRDBILLNO"].ToString()}', {item["FOWNERID"].ToString()}" +
$", '{item["FOWNERTYPEID"].ToString()}', '{item["FPLANDATE"].ToString()}','{item["FCOMPLETE"].ToString()}', {item["FLACKCOUNT"].ToString()}, {item["FOCCUPYCOUNT"].ToString()}" +
- $", {item["FCOMPLETECOUNT1"].ToString()}, {item["FERPCLSID"].ToString()}, {item["FWORKSHOPID"].ToString()}, {item["FSTOCKID"].ToString()}, {item["FOCCUPYPICKEDCOUNT"].ToString()})");
+ $", {item["FCOMPLETECOUNT1"].ToString()}, {item["FERPCLSID"].ToString()}, {item["FWORKSHOPID"].ToString()}, {item["FSTOCKID"].ToString()}, {item["FOCCUPYPICKEDCOUNT"].ToString()}, '{item["HMainICMOBillNo"].ToString()}'" +
+ $",{item["HLOT"].ToString()},'{item["HInventoryFID"].ToString()}')");
}
LogService.Write("鎵归噺鎻掑叆鍒版暟鎹簱鐢ㄦ椂锛�" + sw.Elapsed);
//鎵ц瀹屾垚鍚� 鏇存柊鏃ヨ鍒掑伐鍗曠姸鎬�
@@ -1045,8 +1138,6 @@
sw.Stop();//缁撴潫璁℃椂
LogService.Write("榻愬鍒嗘瀽杩愯鎬绘椂闀匡細" + sw.Elapsed);
- oCN.Commit();
-
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鎿嶄綔鎴愬姛";
@@ -1055,7 +1146,6 @@
}
catch (Exception e)
{
- oCN.RollBack();
LogService.Write("鎿嶄綔澶辫触锛�" + e.Message.ToString());
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -1069,15 +1159,17 @@
#region 鐢熶骇鏃ヨ鍒掑钩鍙� 閿佸畾
[Route("JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHLockedDay")]
[HttpGet]
- public object JIT_DayPlanPlatFormBillHLockedDay(string sWhere, int HLockedDay)
+ public object JIT_DayPlanPlatFormBillHLockedDay(int HLockedDay,int HWorkShopID)
{
try
{
- if (sWhere != null && sWhere != "")
- {
- oCN.RunProc("update Sc_WorkBillSortBillSub set HLockedSub=1" +
- $" where HInterID in ({sWhere}) and HMasterDate between DATEADD(day, -1, getdate()) and DATEADD(day,{(HLockedDay - 1)},getdate()) ");
- }
+ oCN.RunProc("update b set HLockedSub=0 from Sc_WorkBillSortBillMain a join Sc_WorkBillSortBillSub b on a.HInterID = b.HInterID " +
+ $" where a.HWorkShopID={HWorkShopID}");
+
+ oCN.RunProc("update b set HLockedSub=1 from Sc_WorkBillSortBillMain a join Sc_WorkBillSortBillSub b on a.HInterID = b.HInterID " +
+ $" where HMasterDate between DATEADD(day, -1, getdate()) " +
+ $"and DATEADD(day,{(HLockedDay - 1)},getdate()) and a.HWorkShopID={HWorkShopID}");
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
@@ -1098,15 +1190,13 @@
#region 鐢熶骇鏃ヨ鍒掑钩鍙� 瑙ｉ攣
[Route("JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHUnlockDay")]
[HttpGet]
- public object JIT_DayPlanPlatFormBillHUnlockDay(string sWhere, int HLockedDay)
+ public object JIT_DayPlanPlatFormBillHUnlockDay(int HWorkShopID)
{
try
{
- if (sWhere != null && sWhere != "")
- {
- oCN.RunProc("update Sc_WorkBillSortBillSub set HLockedSub=0" +
- $" where HInterID in ({sWhere}) and HMasterDate between DATEADD(day, -1, getdate()) and DATEADD(day,{(HLockedDay - 1)},getdate()) ");
- }
+ oCN.RunProc("update b set HLockedSub=0 from Sc_WorkBillSortBillMain a join Sc_WorkBillSortBillSub b on a.HInterID = b.HInterID " +
+ $" where a.HWorkShopID={HWorkShopID}");
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
@@ -1124,5 +1214,82 @@
}
#endregion
+ #region 鐢熶骇鏃ヨ鍒掑钩鍙� 鐢熶骇璁㈠崟鏌ヨ
+ [Route("JIT_DayPlanPlatFormBill/JIT_ICMOBillList")]
+ [HttpGet]
+ public object JIT_ICMOBillList(string hmainid)
+ {
+ try
+ {
+ var list = hmainid.Split(',');
+ List<DataTable> listdt = new List<DataTable>();
+ DataTable dtable = new DataTable("dt");
+ for (int i = 0; i < list.Length; i++)
+ {
+ var listEvery = list[i].Split('_');
+
+ ds = oCN.RunProcReturn($"exec h_p_ICMOBillList_PrimarySubTable '{listEvery[0]}','{listEvery[1]}'", "h_p_ICMOBillList_PrimarySubTable");
+
+ var dt = oCN.RunProcReturn($"select * from h_v_JIT_Sc_WorkBillSortBillList where 婧愬崟涓诲唴鐮� in({ds.Tables[0].Rows[0]["婧愬崟涓诲唴鐮�"].ToString()}) and 婧愬崟瀛愬唴鐮� in({ds.Tables[0].Rows[0]["婧愬崟瀛愬唴鐮�"].ToString()})", "h_v_JIT_Sc_WorkBillSortBillList");
+ if (dt.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐢熶骇鏄庣粏琛岄噸澶�,閲嶅鐨勭敓浜ц鍗曞彿:" + ds.Tables[0].Rows[i]["鐢熶骇璁㈠崟鍙�"].ToString() + ",鏄庣粏琛屽彿:" + ds.Tables[0].Rows[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"].ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (i == 0)
+ {
+ //娣诲姞鍒楀悕
+ for (int j = 0; j < ds.Tables[0].Columns.Count; j++)
+ {
+ dtable.Columns.Add(ds.Tables[0].Columns[j].ToString());
+ }
+ }
+ listdt.Add(ds.Tables[0]);
+ }
+
+ //鑾峰彇闆嗗悎鏁版嵁
+ for (int i = 0; i < listdt.Count; i++)
+ {
+ DataRow row = dtable.NewRow();
+ for (int j = 0; j < listdt[i].Columns.Count; j++)
+ {
+ if (listdt[i].Columns[j].ColumnName == "璁″垝鏁伴噺")
+ {
+ row[j] = double.Parse(listdt[i].Rows[0][j].ToString()).ToString();
+ }
+ else
+ {
+ row[j] = listdt[i].Rows[0][j].ToString();
+ }
+ }
+ dtable.Rows.Add(row);
+ }
+
+ //娣诲姞鍔ㄦ�佹棩鏈�
+ for (int j = 1; j <= 31; j++)
+ {
+ dtable.Columns.Add(DateTime.Now.AddDays(j - 1).ToString("yyyy-MM-dd"), typeof(Int32));
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = dtable;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1