From 8b018ac3a3830af0ae25bfe094b30dba1a80d720 Mon Sep 17 00:00:00 2001
From: lvzb <35200379@qq.com>
Date: Tue, 17 Nov 2020 13:18:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E8=8E=B7=E5=8F=96=E6=8F=8F?=
=?UTF-8?q?=E8=BF=B0=E4=B8=8D=E5=8C=BA=E5=88=86=E5=A4=A7=E5=B0=8F=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Controller/SCP_PO_CONTROLLER.cs | 3 ++-
Models/ScpCache.cs | 2 +-
Models/UniApiEntity/xxwms_rc_det.cs | 4 ++--
SCP/Web.config | 4 ++--
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Controller/SCP_PO_CONTROLLER.cs b/Controller/SCP_PO_CONTROLLER.cs
index d366f22..33a4963 100644
--- a/Controller/SCP_PO_CONTROLLER.cs
+++ b/Controller/SCP_PO_CONTROLLER.cs
@@ -1772,7 +1772,7 @@ namespace CK.SCP.Controller
_PO_Detail.CreateUser = p_creator;
_PO_Detail.PartCode = itm.零件号.ToUpper();
_PO_Detail.BeginTime = p_time;
- _PO_Detail.EndTime = DateTime.Parse(_entity.要求到货日期);
+ _PO_Detail.EndTime = DateTime.Parse(itm.要求到货日期);
_PO_Detail.PlanQty = decimal.Parse(itm.数量);
_PO_Detail.IsDeleted = false;
_PO_Detail.LocUnit = itm.单位;
@@ -1781,6 +1781,7 @@ namespace CK.SCP.Controller
_PO_Detail.State = (int)PoState.Open;
_PO_Detail.Price = string.IsNullOrEmpty(itm.单价) ? 0 : decimal.Parse(itm.单价);
_PO_Detail.GUID = Guid.NewGuid();
+ _PO_Detail.Site = site;
db.TB_PO_DETAIL.Add(_PO_Detail);
// _number++;
});
diff --git a/Models/ScpCache.cs b/Models/ScpCache.cs
index feb222c..2719b9e 100644
--- a/Models/ScpCache.cs
+++ b/Models/ScpCache.cs
@@ -286,7 +286,7 @@ namespace CK.SCP.Models
public static string GetPartDesc1(string partCode,string p_site)
{
- var _ta = PartList.SingleOrDefault(p => p.PartCode == partCode && p.Site==p_site);
+ var _ta = PartList.SingleOrDefault(p => p.PartCode == partCode && p.Site.ToUpper()==p_site.ToUpper());
if (_ta != null)
{
return _ta.PartDesc1 + _ta.PartDesc2;
diff --git a/Models/UniApiEntity/xxwms_rc_det.cs b/Models/UniApiEntity/xxwms_rc_det.cs
index cd7ddd8..290adee 100644
--- a/Models/UniApiEntity/xxwms_rc_det.cs
+++ b/Models/UniApiEntity/xxwms_rc_det.cs
@@ -51,11 +51,11 @@ namespace CK.SCP.Models.UniApiEntity
public string xxwms_rc_loc { get; set; }
[Required(AllowEmptyStrings = true)]
- [StringLength(2)]
+ [StringLength(8)]
public string xxwms_rc_po_um { get; set; }
[Required(AllowEmptyStrings = true)]
- [StringLength(2)]
+ [StringLength(8)]
public string xxwms_rc_loc_um { get; set; }
public decimal xxwms_rc_conv { get; set; }
diff --git a/SCP/Web.config b/SCP/Web.config
index cad8159..562fb79 100644
--- a/SCP/Web.config
+++ b/SCP/Web.config
@@ -28,12 +28,12 @@
-->
-
+