From 9700fa5f390e5b31ff966ce63f5f91ca46eedb72 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 01 十一月 2021 13:31:56 +0800
Subject: [PATCH] nothing
---
WebAPI/Models/Gy_WorkType.cs | 3 +++
WebAPI/Models/Gy_OrderBackInfo.cs | 14 +++++---------
WebAPI/Models/Gy_WorkPayType.cs | 3 ++-
WarM/条码打印/Gy_BarCodeBill.cs | 1 +
WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs | 16 +++++++++++++---
WebAPI/Models/Gy_OrderLevList.cs | 11 +++--------
6 files changed, 27 insertions(+), 21 deletions(-)
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
index d453cfa..bf863fe 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
@@ -2474,6 +2474,7 @@
//鎵规鎸夐挳
private void BatchNo_Click(object sender, EventArgs e)
{
+ lblCaption.Focus();
bool b = false;
for (int i = 0; i < grdMain.RowCount; i++)
{
diff --git a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
index 30db31b..aa4976d 100644
--- a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
+++ b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
@@ -165,6 +165,8 @@
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
@@ -172,6 +174,7 @@
List<Models.ClsGy_EquipFileMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_EquipFileMain>>(msg2);
string hbillno= list[0].HBillNo;
+ string HYear = DateTime.Now.Year.ToString();
DateTime HDate = list[0].HDate;
long HInterID = list[0].HInterID;
string HEquipFileNumber = list[0].HEquipFileNumber;
@@ -197,6 +200,8 @@
string HLogo = list[0].HLogo; //鈭� varchar(50) //鍝佺墝
int HSellSupID = list[0].HSellSupID; // 鈭� int //渚涘簲鍟�(Gy_Supplier)
int HMakeSupID = list[0].HMakeSupID; // int //鍒堕�犲晢 (Gy_Supplier)
+ string HMaker = msg4;
+ string HMakeDate = DateTime.Now.Date.ToString();
if (!DBUtility.ClsPub.AllowNumber(HEquipFileNumber))
{
@@ -212,11 +217,11 @@
oCN.RunProc("Insert into Gy_EquipFileBillMain " +
" (hbillno,HEquipFileNumber,HEquipFileNo,HName,HModel,HModel2,HMaterID,HUnitID,HOutComDate" +
",HOutComNo,HDeptID,HUseEmpID,HRepairEmpID,HAddress,HSetupDate,HStartupDate,HStatus," +
- "HEquipFileTypeID,HProNum,HBarCode,HWorkArea,HLogo,HSellSupID,HMakeSupID,hbilltype,HDate) " +
+ "HEquipFileTypeID,HProNum,HBarCode,HWorkArea,HLogo,HSellSupID,HMakeSupID,hbilltype,HDate,HYear) " +
" Values('" + hbillno + "','" + HEquipFileNumber + "','" + HEquipFileNo + "','" + HName + "','" + HModel + "','" + HModel2 + "'," + HMaterID + "," + HUnitID +
",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HUseEmpID + "," + HRepairEmpID + ",'" + HAddress +
"','" + HSetupDate + "','" + HStartupDate + "','" + HStatus + "'," + HEquipFileTypeID + ",'" + HProNum +
- "','" + HBarCode + "','" + HWorkArea + "','" + HLogo + "'," + HSellSupID + "," + HMakeSupID +",'3308','" + HDate +
+ "','" + HBarCode + "','" + HWorkArea + "','" + HLogo + "'," + HSellSupID + "," + HMakeSupID +",'3308','" + HDate +"','"+ HYear+
"')", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.Commit();
@@ -252,6 +257,7 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
@@ -280,7 +286,9 @@
string HWorkArea = list[0].HWorkArea; //鈭� varchar(50) //浜у湴
string HLogo = list[0].HLogo; //鈭� varchar(50) //鍝佺墝
int HSellSupID = list[0].HSellSupID; // 鈭� int //渚涘簲鍟�(Gy_Supplier)
- int HMakeSupID = list[0].HMakeSupID; // int //鍒堕�犲晢 (Gy_Supplier)
+ int HMakeSupID = list[0].HMakeSupID; // int //鍒堕�犲晢 (Gy_Supplier)
+ string HUpDater = msg4;
+ string HUpDateDate = DateTime.Now.Date.ToString();
if (!DBUtility.ClsPub.AllowNumber(HEquipFileNumber))
{
@@ -330,6 +338,8 @@
",HLogo=" + HLogo +
",HSellSupID=" + HSellSupID +
",HMakeSupID= " + HMakeSupID +
+ ",HUpDater= " + HUpDater +
+ ",HUpDateDate= " + HUpDateDate +
" Where HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_RepairCheck,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
diff --git a/WebAPI/Models/Gy_OrderBackInfo.cs b/WebAPI/Models/Gy_OrderBackInfo.cs
index 2f4e58a..53c3b5d 100644
--- a/WebAPI/Models/Gy_OrderBackInfo.cs
+++ b/WebAPI/Models/Gy_OrderBackInfo.cs
@@ -1,13 +1,8 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
namespace WebAPI.Models
{
public class Gy_OrderBackInfo
@@ -27,5 +22,6 @@
public bool HStopflag { get; set; } //绂佺敤鏍囧織
public bool HUseFlag { get; set; } //浣跨敤鐘舵��
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/Gy_OrderLevList.cs b/WebAPI/Models/Gy_OrderLevList.cs
index ef9ac5d..99cc768 100644
--- a/WebAPI/Models/Gy_OrderLevList.cs
+++ b/WebAPI/Models/Gy_OrderLevList.cs
@@ -1,8 +1,3 @@
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -15,14 +10,14 @@
public long HItemID { get; set; } //ID
public string HNumber { get; set; } //浠ｇ爜
public string HName { get; set; } //鍚嶇О
- public string HShortNumber { get; set; } //鐭唬鐮�
+ public string HShortNumber { get; set; } // 鐭唬鐮�
public long HParentID { get; set; } //鐖剁骇ID
public long HLevel { get; set; } //灞傜骇
- public long HEndFlag { get; set; } //
+ public long HEndFlag { get; set; }
public string HHelpCode { get; set; } // 鍔╄鐮�
- public string HRemark { get; set; } //澶囨敞
+ public string HRemark { get; set; } // 澶囨敞
public bool HStopflag { get; set; } //绂佺敤鏍囧織
diff --git a/WebAPI/Models/Gy_WorkPayType.cs b/WebAPI/Models/Gy_WorkPayType.cs
index c6c566c..f3c0d96 100644
--- a/WebAPI/Models/Gy_WorkPayType.cs
+++ b/WebAPI/Models/Gy_WorkPayType.cs
@@ -16,10 +16,11 @@
public long HLevel { get; set; }
public bool HEndFlag { get; set; } //鏈骇鏍囧織
public bool HStopflag { get; set; } //绂佺敤鏍囧織
-
+
public string HRemark { get; set; } //澶囨敞
public string HUseFlag { get; set; } //浣跨敤鏍囧織
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/Gy_WorkType.cs b/WebAPI/Models/Gy_WorkType.cs
index 8676982..c1a9184 100644
--- a/WebAPI/Models/Gy_WorkType.cs
+++ b/WebAPI/Models/Gy_WorkType.cs
@@ -21,5 +21,8 @@
public string HForEmp { get; set; } //鐭唬鐮�
public string HRemark { get; set; } //澶囨敞
public string HUseFlag { get; set; } //浣跨敤鏍囧織
+
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1