From 156f04cafe03b782fd54f955732821427a10e5e3 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <jin982011>
Date: Thu, 14 Nov 2024 11:23:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=B7=A5=E5=88=86=E9=85=8D=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=B7=BB=E5=8A=A0=E6=89=B9=E6=AC=A1=E5=88=97=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../origen/shipping/modifyPickTicketManual2Page.xml       | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/modifyPickTicketManual2Page.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/modifyPickTicketManual2Page.xml
index 92cb021..4783a2d 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipping/modifyPickTicketManual2Page.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipping/modifyPickTicketManual2Page.xml
@@ -16,12 +16,14 @@
  pickTicketDetail.orderQuantity,
  pickTicketDetail.allocatedQuantity,
  pickTicketDetail.item.name,
- pickTicketDetail.item.specs
+ pickTicketDetail.item.specs,
+ ik.lotInfo.propC1
  FROM PickTicketDetail pickTicketDetail
   left join pickTicketDetail.item
   left join pickTicketDetail.item.company
   left join pickTicketDetail.pickTicket
   left join pickTicketDetail.packageUnit
+  left join pickTicketDetail.itemKey ik
  WHERE 1=1   
  /~pickTicket.id: AND pickTicketDetail.pickTicket.id = {pickTicket.id}~/ 
  order by pickTicketDetail.id 
@@ -33,8 +35,8 @@
                 <column id="pickTicketDetail.allocatedQuantity" title="pickTicketDetail.allocatedQuantity" visible="true"  horizonAlign="right"/>
                 <column id="pickTicketDetail.item.name" title="品名（中文）" width="200" visible="true" horizonAlign="left"/>
                 <column id="pickTicketDetail.item.specs" title="item.specs" width="100" visible="true" horizonAlign="center" verticalAlign="middle" />
-                              
-            </columns>
+                <column id="lotInfo.propC1"   title="lotInfo.propC1" visible="true" horizonAlign="left"/>
+        </columns>
         <buttons>
             <popup id="allocate" title="分配" enableType="single" invisible="false" containId="true" pageId="maintainPickTicketDetailManual2Page"/>
        		<commit id="unallocate" title="取消分配" enableType="single" invisible="false" confirmMessage="maintainPickTicketPage.unallocate.confirmMessage">