From 852cd93a3e65988a2354a0b96b79d5e2d05bf646 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 14 四月 2023 09:23:25 +0800
Subject: [PATCH] 工序流转卡 工艺参数 应该 可编辑； 1.生产资源 有异常； 删除有问题，删除后出来 异常数据( )； 其他信息 里的 几个字段 输入 字符时 报错，应提示； 2.工序 ： 9999的 转工序 ， 有个 转工序 字段，是否没显示出来； 其他信息 里的 几个字段 输入 字符时 报错，应提示； 3.工作中心： 其他信息 里的 几个字段 输入 字符时 报错，应提示； 4.生产班组： 刷新出来 异常数据； 其他信息 里的 几个字段 输入 字符时 报错，应提示； 5.基础资料的 一些 复选框 标题不对； 6. ADMIN 的账号 工艺路线 的模块 无法进行 新增 编辑； 7.工艺路线查询；工序号，工序代码，工序，工艺参数，表体备注， 其他的放后面 子表 的 委外标记 放到最后面去； 并且 把 供应商代码和供应商 放出来（也放在最后几个）； 8.部门有 很多异常数据； 选择的时候 出来了； 9.流转卡维护， 表头 很多没有用的列，单据号 日期 都没有显示； 转工序 是否要打印（跟客户确认）； 10. 流转卡拆分时，一些 列的 排序；
---
WebAPI/Controllers/SCGL/Sc_ComplementGoodsController.cs | 101 ++++++++++++++++++++++++++------------------------
1 files changed, 52 insertions(+), 49 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_ComplementGoodsController.cs b/WebAPI/Controllers/SCGL/Sc_ComplementGoodsController.cs
index 559ea28..2676353 100644
--- a/WebAPI/Controllers/SCGL/Sc_ComplementGoodsController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_ComplementGoodsController.cs
@@ -61,21 +61,8 @@
//鍙嶅簭鍒楀寲浼犻�掔殑鍊�
ComplementGoods com = JsonConvert.DeserializeObject<ComplementGoods>(sWhere.ToString());
- oCN.RunProc($"exec h_p_JIT_ComplementGoodsBillList_Query '{com.MaterialNumber}','{com.MaterialName}','{com.MaterialModel}','{com.HGD}'," +
- $"'{com.HWHName}','{com.HDeptName}','{com.Organization}','{com.user}','{com.HJLStatus}','{com.HBeginDate}','{com.HEndDate}'");
-
- if (com.HJLStatus == "鏈嫞鏂�")
- {
- ds = oCN.RunProcReturn("select * from ##ComplementGoodsBillList_Query1 where 1=1 " + com.Arbitrarily + "", "##ComplementGoodsBillList_Query1");
- }
- else if (com.HJLStatus == "宸叉嫞鏂�")
- {
- ds = oCN.RunProcReturn("select * from ##ComplementGoodsBillList_Query2 where 1=1 " + com.Arbitrarily + "", "##ComplementGoodsBillList_Query2");
- }
- else
- {
- ds = oCN.RunProcReturn("select * from ##ComplementGoodsBillList_Query3 where 1=1 " + com.Arbitrarily + "", "##ComplementGoodsBillList_Query3");
- }
+ ds = oCN.RunProcReturn($"exec h_p_JIT_ComplementGoodsBillList_Query '{com.MaterialNumber}','{com.MaterialName}','{com.MaterialModel}','{com.HGD}'," +
+ $"'{com.HWHName}','{com.HDeptName}','{com.Organization}','{com.user}','{com.HJLStatus}','{com.HBeginDate}','{com.HEndDate}'", "h_p_JIT_ComplementGoodsBillList_Query");
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -332,30 +319,21 @@
DataSet dsTable = new DataSet();
//鏌ヨJIT_ComplementGoodsBillSub_LK
- dsTable = oCN.RunProcReturn($"select * from JIT_ComplementGoodsBillSub_LK where HMaterID={listCa[i].HMaterID} and HInterID={SourceInterID} order by HSourceInterID ", "JIT_ComplementGoodsBillSub_LK");
+ dsTable = oCN.RunProcReturn($"select * from JIT_ComplementGoodsBillSub_LK where HMaterID={listCa[i].HMaterID} and HInterID={SourceInterID} and HCallQTY<>HSendQTY order by HSourceInterID ", "JIT_ComplementGoodsBillSub_LK");
+ var HqtyCount = double.Parse(listCa[i].鏈鎷ｆ枡鏁伴噺.ToString());
for (int j = 0; j < dsTable.Tables[0].Rows.Count; j++)
{
- if (double.Parse(dsTable.Tables[0].Rows[j]["HCallQTY"].ToString()) != double.Parse(dsTable.Tables[0].Rows[j]["HSendQTY"].ToString()))
- {
- if (double.Parse(dsTable.Tables[0].Rows[j]["HSendQTY"].ToString()) + listCa[i].鏈鎷ｆ枡鏁伴噺 > double.Parse(dsTable.Tables[0].Rows[j]["HCallQTY"].ToString()))
- {
- var HCallQTY = double.Parse(dsTable.Tables[0].Rows[j]["HCallQTY"].ToString()) - double.Parse(dsTable.Tables[0].Rows[j]["HSendQTY"].ToString());
- //淇敼璋冩嫧鏁伴噺 瓒呭嚭閮ㄥ垎缁欎簣涓嬩竴鍒楁暟鎹�
- oCN.RunProc($"update JIT_ComplementGoodsBillSub_LK set HSendQTY=HSendQTY+{HCallQTY} where HMaterID={listCa[i].HMaterID} " +
- $" and HSourceInterID={double.Parse(dsTable.Tables[0].Rows[j]["HSourceInterID"].ToString())} and HInterID={SourceInterID} ");
+ var HCallQTY = double.Parse(dsTable.Tables[0].Rows[j]["HCallQTY"].ToString()) - double.Parse(dsTable.Tables[0].Rows[j]["HSendQTY"].ToString());
- oCN.RunProc($"update JIT_ComplementGoodsBillSub_LK set HSendQTY=HSendQTY+{(listCa[i].鏈鎷ｆ枡鏁伴噺 - HCallQTY)} where HMaterID={listCa[i].HMaterID} " +
- $" and HSourceInterID={dsTable.Tables[0].Rows[j + 1]["HSourceInterID"].ToString()} and HInterID={SourceInterID} ");
- break;
- }
- else
- {
- //淇敼璋冩嫧鏁伴噺
- oCN.RunProc($"update JIT_ComplementGoodsBillSub_LK set HSendQTY=HSendQTY+{listCa[i].鏈鎷ｆ枡鏁伴噺} where HMaterID={listCa[i].HMaterID} " +
- $" and HSourceInterID={dsTable.Tables[0].Rows[j]["HSourceInterID"].ToString()} and HInterID={SourceInterID} ");
- break;
- }
+ //淇敼璋冩嫧鏁伴噺
+ oCN.RunProc($"update JIT_ComplementGoodsBillSub_LK set HSendQTY=HSendQTY+{(HCallQTY < HqtyCount ? HCallQTY : HqtyCount)} where HMaterID={listCa[i].HMaterID} " +
+ $" and HSourceInterID={double.Parse(dsTable.Tables[0].Rows[j]["HSourceInterID"].ToString())} and HInterID={SourceInterID} ");
+
+ HqtyCount -= HCallQTY;
+ if (HqtyCount <= 0)
+ {
+ break;
}
}
}
@@ -384,11 +362,9 @@
}
catch (Exception e)
{
- oCN.RollBack();
-
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = e.Message;
+ objJsonResult.Message = objJsonResult.Message;
return objJsonResult;
throw (e);
}
@@ -400,8 +376,6 @@
ds = oCN.RunProcReturn("exec JIT_SendGoodsBillSynChronizAtion '" + HBillNo + "'", "JIT_SendGoodsBillSynChronizAtion");
if (ds.Tables[0].Rows.Count != 0)
{
-
-
foreach (DataRow dr in ds.Tables[0].Rows)
{
JObject model = new JObject();
@@ -458,22 +432,51 @@
return objJsonResult;
}
var result = InvokeHelper.Save("STK_TransferDirect", jsonRoot.ToString());
- if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() == "TRUE")
+ if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = null;
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
+ oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = result;
objJsonResult.data = null;
return objJsonResult;
}
+
+ var json = new
+ {
+ Numbers = HBillNo,
+ };
+ //鎻愪氦
+ var _result = InvokeHelper.Submit("STK_TransferDirect", JsonConvert.SerializeObject(json));
+ var _saveObj = JObject.Parse(_result);
+ if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ LogService.Write("鏀舵枡閫氱煡鍗曟彁浜ゅけ璐sonRoot:" + jsonRoot.ToString());
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閲戣澏鏀舵枡閫氱煡鍗曟彁浜ゅけ璐�" + _result;
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ //瀹℃牳
+ _result = InvokeHelper.Audit("STK_TransferDirect", JsonConvert.SerializeObject(json));
+ _saveObj = JObject.Parse(_result);
+ if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ LogService.Write("鏀舵枡閫氱煡鍗曞鏍稿け璐sonRoot:" + jsonRoot.ToString());
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閲戣澏鏀舵枡閫氱煡鍗曞鏍稿け璐sonRoot" + _result;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎿嶄綔鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
}
}
else
--
Gitblit v1.9.1