From 773e823e7b9c11cbe61b0ac1f17fc248c436270c Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期一, 04 九月 2023 15:11:39 +0800
Subject: [PATCH] 涤纶半成品生成条码模块，界面增加重量、包号，根据流水号返回工序等信息，生产资源可扫码返回信息等
---
WebAPI/Models/Gy_OrderLevList.cs | 38 +++++++-------------------------------
1 files changed, 7 insertions(+), 31 deletions(-)
diff --git a/WebAPI/Models/Gy_OrderLevList.cs b/WebAPI/Models/Gy_OrderLevList.cs
index 82f4f07..99cc768 100644
--- a/WebAPI/Models/Gy_OrderLevList.cs
+++ b/WebAPI/Models/Gy_OrderLevList.cs
@@ -1,16 +1,8 @@
-<<<<<<< HEAD
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-=======
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
-
->>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
+
namespace WebAPI.Models
{
public class Gy_OrderLevList
@@ -18,35 +10,19 @@
public long HItemID { get; set; } //ID
public string HNumber { get; set; } //浠ｇ爜
public string HName { get; set; } //鍚嶇О
-<<<<<<< HEAD
- public string HShortNumber { get; set; } //鐭唬鐮�
- public long HParentID { get; set; } //鐖剁骇ID
- public long HLevel { get; set; } //灞傜骇
- public long HEndFlag { get; set; } //
-
- public string HHelpCode { get; set; } // 鍔╄鐮�
-
- public string HRemark { get; set; } //澶囨敞
-
- public bool HStopflag { get; set; } //绂佺敤鏍囧織
-
- public bool HUseFlag { 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 bool HStopflag { get; set; } //绂佺敤鏍囧織
-
+
public bool HUseFlag { get; set; } //浣跨敤鐘舵��
-
->>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
+
public string HYX { get; set; }//浼樺厛绾�
}
}
\ No newline at end of file
--
Gitblit v1.9.1