From f989e2e3dfb3866b5d9fe271f69c728eb5be242d Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期六, 13 九月 2025 14:58:48 +0800
Subject: [PATCH] 条码生成添加工号，条码日期，流水号获取方式调整；
---
WebAPI/Controllers/MaterialHandingController.cs | 48 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/WebAPI/Controllers/MaterialHandingController.cs b/WebAPI/Controllers/MaterialHandingController.cs
index d287e02..c51e3cc 100644
--- a/WebAPI/Controllers/MaterialHandingController.cs
+++ b/WebAPI/Controllers/MaterialHandingController.cs
@@ -86,12 +86,12 @@
[Route("MaterialHandingController/OpenMaterial")]
[HttpGet]
- public object OpenMaterial(int HInterID, int IsUse, string CurUserName)
+ public object OpenMaterial(int HInterID, int IsUse, string CurUserName,string HMaterID)
{
try
{
-
var ds = oCN.RunProcReturn("select * from Gy_UserMaterRelation where HItemID=" + HInterID, "Gy_UserMaterRelation");
+ var ds_1 = oCN.RunProcReturn("select * from Gy_UserMaterRelation where HMaterID=" + HMaterID+ "order by HItemID desc", "Gy_UserMaterRelation");
if (ds.Tables[0].Rows.Count > 0)
{
IsUse = Convert.ToInt32(ds.Tables[0].Rows[0]["HUseFlag"]) ;
@@ -106,7 +106,19 @@
return objJsonResult;
}
}
+ else
+ {
+ if (ds_1.Tables[0].Rows.Count > 1)
+ {
+ string sql = "update Gy_UserMaterRelation set HUseFlag=0 where HMaterID= " + "'" + HMaterID + "'" + "and HItemID!=" + HInterID;
+ oCN.BeginTran();
+ oCN.RunProc(sql);
+ oCN.Commit();
+
+ }
+ }
}
+
else
{
objJsonResult.code = "0";
@@ -174,10 +186,14 @@
//==================================================================================
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鍚敤鎴愬姛";
- objJsonResult.data = null;
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍚敤鎴愬姛";
+ objJsonResult.data = null;
+
+
+
}
//if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
//{
@@ -257,19 +273,23 @@
#region 鐗╂枡鏍￠獙
[Route("MaterialHandingController/CheckMaterial")]
[HttpGet]
- public object CheckMaterial(string HMaterID, string user, int param,string OrganizationID)
+ public object CheckMaterial(string HMaterID, string user, int param,string OrganizationID,string SupID)
{
try
{
//ds1鑾峰彇鐨剆ql鍚庢湡璁板緱鏀瑰洖渚涘簲鍟嗭紝淇敼浜�->渚涘簲鍟�
- var ds1 = oCN.RunProcReturn("select * from h_v_Gy_UserMaterRelationEdit where 鐗╂枡浠ｇ爜='" + HMaterID + "'" + "and 淇敼浜�='" + user + "'", "h_v_Gy_UserMaterRelationEdit");
- var ds = oCN.RunProcReturn("select * from Gy_Material where HNumber='" + HMaterID+ "'", "Gy_Material");
-
+ var ds1 = oCN.RunProcReturn("select * from h_v_Gy_UserMaterRelationEdit where 鐗╂枡浠ｇ爜='" + HMaterID + "'" + "and 渚涘簲鍟嗕唬鐮�='" + SupID + "'", "h_v_Gy_UserMaterRelationEdit");
+ var ds = oCN.RunProcReturn("select * from Gy_Material where HNumber='" + HMaterID+ "'"+ " and HUSEORGID="+"'"+ OrganizationID+"'", "Gy_Material");
+ if(ds.Tables[0].Rows.Count == 0)
+ {
+ return 2;
+ }
if (param == 0)
{
- if (ds1.Tables[0].Rows.Count > 0)
+ if (ds1.Tables[0].Rows.Count > 0)//鐗╂枡閲嶅锛屽脊鍑鸿闂�
{
return 1;
+
}
else
{
@@ -279,7 +299,7 @@
else
{
oCN.BeginTran();
- string sqlUpd = "UPDATE Gy_UserMaterRelation set HUseFlag=0 where HMaterID="+ ds.Tables[0].Rows[0]["HItemID"];
+ string sqlUpd = "UPDATE Gy_UserMaterRelation set HUseFlag=0 where HItemID=" + ds1.Tables[0].Rows[0]["HItemID"];
oCN.RunProc(sqlUpd);
oCN.Commit();
@@ -365,8 +385,9 @@
msg2 = "[" + msg2.ToString() + "]";
List<Model.Cls_MaterialHandingModel> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.Cls_MaterialHandingModel>>(msg2);
+
var ds = oCN.RunProcReturn("select * from Gy_Material where HNumber='" + list[0].HMaterNumber + "'", "Gy_Material");
-
+
int HItemID =Convert.ToInt32(list[0].HItemID);
string HMaterNumber = list[0].HMaterNumber;
int HMaterID =Convert.ToInt32(ds.Tables[0].Rows[0]["HItemID"]);
@@ -426,6 +447,7 @@
}
catch (Exception e)
{
+ LogService.Write("閫佽揣鐗╂枡淇℃伅淇濆瓨寮傚父锛�" + e.Message);
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
--
Gitblit v1.9.1