From e8401cac9799e310aa3cf7cccd65ce4e9a53b443 Mon Sep 17 00:00:00 2001
From: lilili <webadmin@tedu.com>
Date: Wed, 12 Apr 2023 17:33:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=94=9F=E6=88=90=E6=9D=A1?=
 =?UTF-8?q?=E7=A0=81=E6=97=B6=E9=97=B4=E9=BB=98=E8=AE=A4=E5=BD=93=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WMS-BS/NFine.Application/WMS/PickMaterialApp.cs               | 2 +-
 WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/From.cshtml | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
index 069b25d..1fc3106 100644
--- a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
+++ b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
@@ -688,7 +688,7 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'";
                         from ICSTransfer a
                             left join ICSMOPickMerge e on a.ID = e.SourceID and a.WorkPoint = e.WorkPoint
                             left join ICSExtension f on a.ExtensionID = f.ID and a.WorkPoint = f.WorkPoint
-                        where a.WorkPoint = '{WorkPoint}' and a.Status = '1'");
+                        where a.WorkPoint = '{WorkPoint}' and a.Status = '2'");
              if (!string.IsNullOrWhiteSpace(queryJson))
             {
                 if (!string.IsNullOrWhiteSpace(queryParam["POCode"].ToString()))
diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/From.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/From.cshtml
index f1be8bf..35480f6 100644
--- a/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/From.cshtml
+++ b/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/From.cshtml
@@ -281,6 +281,8 @@
             }
         }
         if (Type == '7') {
+            var myDate = new Date();
+            var nowDate = myDate.getFullYear() + '-' + (myDate.getMonth() + 1) + '-' + myDate.getDate();
             if (!!DNCode && !!Sequence) {
                 $.ajax({
                     url: "/WMS/WMSCreateItemLot/GetSubGridJsonSHDHByCreate?DNCode=" + DNCode + "&Sequence=" + Sequence + "&WorkPoint=" + WorkPoints,
@@ -295,7 +297,7 @@
                         $("#CreatedQty").val(data.rows[0].CreatedQty);
                         $("#thisCreateQty").val(data.rows[0].thisCreateQty);
                         $("#YAmount").val(data.rows[0].Amount);
-
+                        $("#PRODUCTDATE").val(nowDate);
                         $("#EffectiveEnable").val(data.rows[0].EffectiveEnable);
                         $("#EffectiveDays").val(data.rows[0].EffectiveDays);
                         VenCode = data.rows[0].VenCode;