From 02bc657c618ccf0056a266acaffa51319bcaa020 Mon Sep 17 00:00:00 2001
From: lch <lch  @example.com>
Date: Thu, 2 Sep 2021 03:58:38 +0000
Subject: [PATCH] =?UTF-8?q?=ED=8C=9D=EB=B9=8C=EC=84=B8=EA=B8=88=EA=B3=84?=
 =?UTF-8?q?=EC=82=B0=EC=84=9C=20=EA=B7=9C=EA=B2=A9=EC=97=90=20=EC=82=AC?=
 =?UTF-8?q?=EC=9A=A9=EC=9E=90=20=EC=9D=B4=EB=A6=84=20=EB=93=B1=EB=A1=9D=20?=
 =?UTF-8?q?=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Base/Popbill/PopbillService.cs | 2 +-
 Dao/MyBatis/Maps/CRoom.xml     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Base/Popbill/PopbillService.cs b/Base/Popbill/PopbillService.cs
index de8d30f..6e9ecf3 100644
--- a/Base/Popbill/PopbillService.cs
+++ b/Base/Popbill/PopbillService.cs
@@ -142,7 +142,7 @@ namespace NP.Base.Popbill
                     detail.serialNum = serialNum; // 일련번호, 1부터 순차기재 
                     detail.purchaseDT = payTax.taxdate?.ToString("yyyyMMdd"); // 거래일자
                     detail.itemName = payItem.itemname; // 품목명  
-                    detail.spec = ""; // 규격
+                    detail.spec = payItem.username; // 규격(이름)
                     detail.qty = payItem.pcnt.ToString(); // 수량
                     detail.unitCost = payItem.payamt.ToString(); // 단가
                     detail.supplyCost = payItem.payamt.ToString(); // 공급가액
diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml
index 4af98bc..6ec8fd5 100644
--- a/Dao/MyBatis/Maps/CRoom.xml
+++ b/Dao/MyBatis/Maps/CRoom.xml
@@ -1311,7 +1311,7 @@
         </select>
         <select id="cr.paytaxitem2" parameterClass="hashtable" resultClass="payitem">
             select case pi.ptype when 2 then bk.bkname when 3 then ex.exname else cm.cname end itemname,pi.payamt,pi.pcnt,pi.ptype
-            ,p.isgroup,p.payamt ppayamt,p.payoktime,p.ptype pptype
+            ,p.isgroup,p.payamt ppayamt,p.payoktime,p.ptype pptype,u.username
             from paytax a
             inner join paytaxitem b on b.taxno=a.taxno
             inner join payitem pi on pi.pino=b.pino
@@ -1319,6 +1319,7 @@
             left outer join cm cm on pi.ptype in (0,1,4) and cm.cmno=pi.itemno
             left outer join book bk on pi.ptype=2 and bk.bkno=pi.itemno
             left outer join exam ex on pi.ptype=3 and ex.exno=pi.itemno
+            left outer join users u on u.userno=pi.userno
             <dynamic prepend="where">
               <isNotNull property="payno" prepend="and">a.payno=#payno#</isNotNull>
               <isNotNull property="taxno" prepend="and">a.taxno=#taxno#</isNotNull>