From 6ed0553e8d5bc38b728979c2078d3cbffdc88bf2 Mon Sep 17 00:00:00 2001
From: 杨张扬 <634643841@qq.com>
Date: 星期五, 30 五月 2025 17:10:03 +0800
Subject: [PATCH] 1.双钱-规格时间配置这个，过期时间使用小时
---
api/ApiHelper.cs | 44 ++++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index 9b86ead..3780833 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -235,7 +235,8 @@
CARCODE = cG_Detail.S_CAR_CODE,
WEIGHT = cG_Detail.F_QTY,
REMELTTIME = DateTime.Now,
- TASKNO = taskNo
+ TASKNO = taskNo,
+ SHIFT = model.shift,
};
SpecHelper.InsertRemeltDetail(target);
}
@@ -254,7 +255,7 @@
ITEMSTATE = cG_Detail.S_ITEM_STATE,
ITEMCODE = cG_Detail.S_ITEM_CODE,
LOGINNAME = model.staff,
- SHIFT = "None",
+ SHIFT = model.shift,
};
SpecHelper.InsertInventoryM(target);
}
@@ -275,7 +276,7 @@
catch (Exception ex)
{
result.resultCode = -1;
- result.resultMsg = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
+ result.resultMsg = $"PDA婊℃墭澶嶆鍒ゆ柇锛屽彂鐢熶簡寮傚父锛歿ex.Message}";
LogHelper.Info(result.resultMsg);
return result;
}
@@ -413,7 +414,8 @@
SPEC = cgInfo.S_SPE,
CARCODE = cgInfo.S_CAR_CODE,
WEIGHT = cgInfo.F_QTY,
- REMELTTIME = DateTime.Now
+ REMELTTIME = DateTime.Now,
+ SHIFT = model.shift,
};
SpecHelper.InsertRemeltDetail(target);
});
@@ -464,7 +466,7 @@
var allCount = allCg.Count;
var waittime = SpecHelper.GetExportTime(model.Spe);
- var okCount = allCg.Count(o => o.N_ITEM_STATE == 0 && o.S_ITEM_STATE == "鍚堟牸" && o.T_MODIFY.AddMinutes(waittime) <= System.DateTime.Now);
+ var okCount = allCg.Count(o => o.N_ITEM_STATE == 0 && o.S_ITEM_STATE == "鍚堟牸" && o.T_MODIFY.AddHours(waittime) <= System.DateTime.Now);
return $"婊¤冻{model.Spe}瑙勬牸鐨勬�鎵樼洏鏁伴噺锛歿allCount}锛屽叾涓悎鏍间笖闈欑疆鏃堕棿宸茶繃鐨勬墭鐩樻暟閲忥細{okCount}";
}
catch (Exception ex)
@@ -775,7 +777,7 @@
WEIGHT = modelWeight,
ITEMSTATE = "寰呮",
LOGINNAME = model.staff,
- SHIFT = "None",
+ SHIFT = model.shift,
STARTLOC = startLoc.S_CODE,
};
SpecHelper.InsertEquipProDetail(target);
@@ -791,7 +793,7 @@
WEIGHT = modelWeight,
ITEMSTATE = "寰呮",
LOGINNAME = model.staff,
- SHIFT = "None",
+ SHIFT = model.shift,
};
SpecHelper.InsertInventoryM(target);
});
@@ -1026,6 +1028,7 @@
WEIGHT = cgInfo.F_QTY,
SPEC = model.Spe,
TASKNO = taskNo,
+ SHIFT = model.shift,
};
SpecHelper.InsertComponentDetail(target);
});
@@ -1277,7 +1280,8 @@
CARCODE = cG_Detail.S_CAR_CODE,
WEIGHT = cG_Detail.F_QTY,
REMELTTIME = DateTime.Now,
- TASKNO = taksNo
+ TASKNO = taksNo,
+ SHIFT = model.shift,
};
SpecHelper.InsertSurplusDetail(target);
});
@@ -1293,7 +1297,7 @@
ITEMSTATE = cG_Detail.S_ITEM_STATE,
ITEMCODE = cG_Detail.S_ITEM_CODE,
LOGINNAME = model.staff,
- SHIFT = "None",
+ SHIFT = model.shift,
};
SpecHelper.InsertInventoryM(target);
});
@@ -1677,7 +1681,8 @@
SPEC = cG_old_Detail.S_SPE,
CARCODE = cG_old_Detail.S_CAR_CODE,
WEIGHT = cG_old_Detail.F_QTY,
- REMELTTIME = DateTime.Now
+ REMELTTIME = DateTime.Now,
+ SHIFT = model.shift,
};
SpecHelper.InsertRemeltDetail(target);
}
@@ -1693,7 +1698,8 @@
SPEC = cG_new_Detail_Ins.S_SPE,
CARCODE = cG_new_Detail_Ins.S_CAR_CODE,
WEIGHT = cG_new_Detail_Ins.F_QTY,
- REMELTTIME = DateTime.Now
+ REMELTTIME = DateTime.Now,
+ SHIFT = model.shift,
};
SpecHelper.InsertRemeltDetail(target);
}
@@ -1712,7 +1718,7 @@
ITEMSTATE = cG_old_Detail.S_ITEM_STATE,
ITEMCODE = cG_old_Detail.S_ITEM_CODE,
LOGINNAME = model.staff,
- SHIFT = "None",
+ SHIFT = model.shift,
};
SpecHelper.InsertInventoryM(target);
}
@@ -1727,7 +1733,7 @@
ITEMSTATE = cG_new_Detail_Ins.S_ITEM_STATE,
ITEMCODE = cG_new_Detail_Ins.S_ITEM_CODE,
LOGINNAME = model.staff,
- SHIFT = "None",
+ SHIFT = model.shift,
};
SpecHelper.InsertInventoryM(target);
}
@@ -1801,10 +1807,12 @@
if (startLocCnt == null)
{
- result.resultCode = 3;
- result.resultMsg = $"璧峰浣嶇疆{model.startLoc}鏈粦瀹氬鍣�;
- LogHelper.Info(result.resultMsg);
- return result;
+ startLocCnt = new TN_Loc_Container()
+ {
+ S_LOC_CODE = model.startLoc,
+ S_CNTR_CODE = Guid.NewGuid().ToString("D"),
+ };
+ db.Insertable<TN_Loc_Container>(startLocCnt).ExecuteCommand();
}
//鍒涘缓鐐瑰鐐逛换鍔�@@ -1833,7 +1841,7 @@
ITEMSTATE = cginfo.S_ITEM_STATE,
ITEMCODE = cginfo.S_ITEM_CODE,
LOGINNAME = model.staff,
- SHIFT = "None",
+ SHIFT = model.shift,
};
SpecHelper.InsertInventoryM(target);
}
--
Gitblit v1.9.1