From e1f5bc582953c62ad88552b3f2d016b6b2691127 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 25 八月 2021 20:37:06 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
Model/车间管理/ClsSc_ProcessExchangeBillSub.cs | 6 +-
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 10 +++++
WebAPI/Controllers/LMESController.cs | 13 +-----
DAL/车间管理/ClsSc_ProcessExchangeBill.cs | 65 ++++++++++++++++++++++++++++++++
4 files changed, 80 insertions(+), 14 deletions(-)
diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
index a6c3598..9ca1058 100644
--- "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
@@ -304,6 +304,71 @@
//鎻掑叆瀛愯〃
foreach (Model.ClsSc_ProcessExchangeBillSub oSub in DetailColl)
{
+
+ string HInterID = omodel.HInterID.ToString();
+ string HEntryID = oSub.HEntryID.ToString();
+ string HBillNo = omodel.HBillNo;
+ string HCloseMan = oSub.HCloseMan;
+ string HEntryCloseDate = oSub.HEntryCloseDate.ToString();
+ string HCloseType = Convert.ToString(oSub.HCloseType ? 1 : 0);
+ string HRemark = oSub.HRemark;
+ string HSourceInterID = oSub.HSourceInterID.ToString();
+ string HSourceEntryID = oSub.HSourceEntryID.ToString();
+ string HSourceBillNo = oSub.HSourceBillNo;
+ string HSourceBillType = oSub.HSourceBillType;
+ string HRelationQty = oSub.HRelationQty.ToString();
+ string HRelationMoney = oSub.HRelationMoney.ToString();
+ string HProcNo = oSub.HProcNo.ToString();
+ string HProcID = oSub.HProcID.ToString();
+ string HProcNumber = oSub.HProcNumber;
+ string HWorkRemark = oSub.HWorkRemark;
+ string HCenterID = oSub.HCenterID.ToString();
+ string HDeptID = oSub.HDeptID.ToString();
+ string HDeptNumber = oSub.HDeptNumber;
+ string HGroupID = oSub.HGroupID.ToString();
+ string HGroupNumber = oSub.HGroupNumber;
+ string HWorkerID = oSub.HWorkerID.ToString();
+ string HWorkerNumber = oSub.HWorkerNumber;
+ string HSourceID = oSub.HSourceID.ToString();
+ string HQty = oSub.HQty.ToString();
+ string HTimeUnit = oSub.HTimeUnit;
+ string HPlanWorkTimes = oSub.HPlanWorkTimes.ToString();
+ string HPlanBeginDate = oSub.HPlanBeginDate.ToShortDateString();
+ string HPlanEndDate = oSub.HPlanEndDate.ToShortDateString();
+ string HRelBeginDate = oSub.HRelBeginDate.ToShortDateString();
+ string HRelEndDate = oSub.HRelEndDate.ToShortDateString();
+ string HReadyTime = oSub.HReadyTime.ToString();
+ string HQueueTime = oSub.HQueueTime.ToString();
+ string HMoveTime = oSub.HMoveTime.ToString();
+ string HBeginDayQty = oSub.HBeginDayQty.ToString();
+ string HBeginFixQty = oSub.HBeginFixQty.ToString();
+ string HFixWorkDays = oSub.HFixWorkDays.ToString();
+ string HTrunWorkDays = oSub.HTrunWorkDays.ToString();
+ string HReadyTimes = oSub.HReadyTimes.ToString();
+ string HMyWorkDays = oSub.HMyWorkDays.ToString();
+ string HOutPrice = oSub.HOutPrice.ToString();
+ string HOutMoney = oSub.HOutMoney.ToString();
+ string HPassRate = oSub.HPassRate.ToString();
+ string HLastProc = oSub.HLastProc;
+ string HKeyProc = oSub.HKeyProc;
+ string HFstProc = oSub.HFstProc;
+ string HICMOInterID = oSub.HICMOInterID.ToString();
+ string HICMOBillNo = oSub.HICMOBillNo;
+ string HWWOrderInterID = oSub.HWWOrderInterID.ToString();
+ string HWWOrderEntryID = oSub.HWWOrderEntryID.ToString();
+ string HWWOrderBillNo = oSub.HWWOrderBillNo;
+ string HReportQty = oSub.HReportQty.ToString();
+ string HBackProc = Convert.ToString(oSub.HBackProc ? 1 : 0);
+ string HSupID = oSub.HSupID.ToString();
+ string HSupFlag = Convert.ToString(oSub.HSupFlag ? 1 : 0);
+ string HOverRate = oSub.HOverRate.ToString();
+ string HMaxQty = oSub.HMaxQty.ToString();
+ string HTechnologyParameter = oSub.HTechnologyParameter;
+ string HProcCheckNote = oSub.HProcCheckNote;
+ string HPicNum = oSub.HPicNum;
+ string HMouldNo = oSub.HMouldNo.ToString();
+ string HProcWorkNum = oSub.HProcWorkNum.ToString();
+
oCn.RunProc("Insert into Sc_ProcessExchangeBillSub " +
" (HInterID,HEntryID,HBillNo_bak," +
"HCloseMan,HEntryCloseDate,HCloseType,HRemark," +
diff --git "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub.cs" "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub.cs"
index 924e656..f1b67f1 100644
--- "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub.cs"
+++ "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub.cs"
@@ -65,9 +65,9 @@
public Single HSumPassRate;//累计良率
public double HOverRate;// dec(18,4) --超额比例
public double HMaxQty;// dec(18,4) --最高上限
- public string HProcCheckNote;
- public string HPicNum;
- public string HTechnologyParameter;
+ public string HProcCheckNote;//本工序确认记录
+ public string HPicNum;//图纸编号
+ public string HTechnologyParameter;//工艺参数
public string HMouldNo;//模具编号
public string HProcWorkNum;//程序号
}
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index 65cd472..0b47d2c 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -112,6 +112,14 @@
BillNew.omodel.HMaterIDD = ClsPub.isStrNull(mainList[0].HMaterIDD);
List<Model.ClsSc_ProcessExchangeBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessExchangeBillSub>>(msg3);
BillNew.DetailColl = new List<Model.ClsSc_ProcessExchangeBillSub>();
+ if (BillNew.omodel.HICMOInterID == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇烽�夋嫨浠诲姟鍗曪紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
for (int i = 0; i < subList.ToArray().Length; i++)
{
if (DBUtility.ClsPub.isInt(subList[i].HProcID) != 0)//HQty
@@ -208,6 +216,8 @@
oSub.HTechnologyParameter = DBUtility.ClsPub.isStrNull(subList[i].HTechnologyParameter);
oSub.HPicNum = DBUtility.ClsPub.isStrNull(subList[i].HPicNum);
oSub.HProcCheckNote = DBUtility.ClsPub.isStrNull(subList[i].HProcCheckNote);
+ oSub.HMouldNo = "";
+ oSub.HProcWorkNum = "";
BillNew.DetailColl.Add(oSub);
}
}
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 0321edb..1d9e72a 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -14,6 +14,7 @@
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
/// <summary>
/// 杩斿洖杩涚珯鎵弿鍒楄〃|宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�
///鍙傛暟锛歴tring sql銆�
@@ -221,17 +222,7 @@
DataSet ds;
try
{
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select top 500 * from h_v_IF_ICMOBillList ", "h_v_IF_ICMOBillList");
- }
- else
- {
- string sql1 = "select * from h_v_IF_ICMOBillList where 1 = 1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOBillList");
- }
+ ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where 1 = 1 " + sWhere + " order by hmainid desc", "h_v_IF_ICMOBillList");
}
catch (Exception e)
{
--
Gitblit v1.9.1