From 1f3335ba36245461c0db931a5dc3486b7300d5ad Mon Sep 17 00:00:00 2001
From: xusc <xu960413@163.com>
Date: Thu, 28 Dec 2023 15:07:17 +0800
Subject: [PATCH] ..

---
 WMS-BS/NFine.Application/OMAY/OMAYApsApp.cs                | 1 +
 WMS-BS/NFine.Web/Areas/OMAY/Views/Aps/MoProducePlan.cshtml | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/WMS-BS/NFine.Application/OMAY/OMAYApsApp.cs b/WMS-BS/NFine.Application/OMAY/OMAYApsApp.cs
index bd036d5..a743770 100644
--- a/WMS-BS/NFine.Application/OMAY/OMAYApsApp.cs
+++ b/WMS-BS/NFine.Application/OMAY/OMAYApsApp.cs
@@ -37,6 +37,7 @@ select '' isSelect
 ,a.MOCode
 ,a.Sequence MoSeq
 ,a.MODetailID
+,a.EATTRIBUTE1 MoTypeValue
 ,a.DepCode
 ,b.DepName        --生产部门
 ,a.CreateDateTime  --生产日期
diff --git a/WMS-BS/NFine.Web/Areas/OMAY/Views/Aps/MoProducePlan.cshtml b/WMS-BS/NFine.Web/Areas/OMAY/Views/Aps/MoProducePlan.cshtml
index 4fb86ec..c22efdc 100644
--- a/WMS-BS/NFine.Web/Areas/OMAY/Views/Aps/MoProducePlan.cshtml
+++ b/WMS-BS/NFine.Web/Areas/OMAY/Views/Aps/MoProducePlan.cshtml
@@ -129,6 +129,7 @@
                         { label: '业务员', name: 'BusinessName', width: 100, align: 'left' },
                         { label: '工单', name: 'MOCode', width: 100, align: 'left' },
                         { label: '工单行', name: 'MoSeq', width: 100, align: 'left' },
+                        { label: '工单类型', name: 'MoTypeValue', hidden: true, width: 100, align: 'left' },
                         { label: '部门', name: 'DepName', width: 100, align: 'left' },
                         { label: '生产日期', name: 'CreateDateTime', width: 150, align: 'left' },
                         { label: '包装要求', name: 'PackageAsk', width: 100, align: 'left' },
@@ -375,11 +376,12 @@
                         MOCode = $("#gridList").jqGrid('getRowData', ids[i]).MOCode;
                         Sequence = $("#gridList").jqGrid('getRowData', ids[i]).MoSeq;
                         InvCode = $("#gridList").jqGrid('getRowData', ids[i]).ItemCode;
+                        MoTypeValue = $("#gridList").jqGrid('getRowData', ids[i]).MoTypeValue;
                     }
                     $.modalOpen({
                         id: "FormAddItemLot",
                         title: "成品条码产生",
-                        url: "/OMAY/ICSMoCreateLot/From?MOCode=" + encodeURI(encodeURI(MOCode)) + "&Sequence=" + Sequence + "&InvCode=" + InvCode + "&Type=" + 3 + "&MODetailID=" + MODetailID + "&" + Math.random(),
+                        url: "/OMAY/ICSMoCreateLot/From?MOCode=" + encodeURI(encodeURI(MOCode)) + "&Sequence=" + Sequence + "&InvCode=" + InvCode + "&Type=" + 3 + "&MODetailID=" + MODetailID + "&MoTypeValue=" + MoTypeValue + "&" + Math.random(),
                         width: "550px",
                         height: "1000px",
                         callBack: function (iframeId) {