diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
index d09be186..bd411c5d 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
@@ -4224,12 +4224,12 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no);
             string strSQL = $@"SELECT b.RecordNumber as DNNO
                                       ,b.RCLineNO as DNLineNO
 	                                  ,b.ProductID
-	                                  ,a.SoldCustomerID
+	                                  ,b.EmplID as SoldCustomerID
 	                                  ,a.ExpectShipDate
 	                                  ,a.ShipQty
 	                                  ,b.Qty
-                                FROM [dbo].ZDNDetail a right join (select sum(1) as Qty,RecordNumber,RCLineNO,RecordTypeID,ProductID
-                                                    from dbo.[ZWHPickListDetail] where TaskStatus ='Picked' group by RecordTypeID,RecordNumber,RCLineNO,ProductID)b 
+                                FROM [dbo].ZDNDetail a right join (select sum(1) as Qty,RecordNumber,RCLineNO,RecordTypeID,ProductID,EmplID
+                                                    from dbo.[ZWHPickListDetail] where TaskStatus ='Picked' group by RecordTypeID,RecordNumber,RCLineNO,ProductID,EmplID)b 
                                         on (b.RecordNumber = a.DNNO and b.RCLineNO = a.DNLineNO)
                                 where b.RecordNumber = '{recordNumber}' and b.RecordTypeID = '{recordType}'";
             DataTable dtZDNDetail = new DataTable();
@@ -4365,7 +4365,7 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no);
                                                      [CreatorID],[CreateDate],[ModifierID],[ModifyDate],
                                                      [chkflag],[IsBranchCoReceived],[MOID]) VALUES 
                                                     ('{strLatest}','{row["ShipmentSN"]}','{strRecordType}','{SNData.dnno}','{SNData.dnLineNO}','{strRecordDate}',
-                                                     '{SNData.productID}',0,'9000','{SNData.soldCustomerID}',0,
+                                                     '{SNData.productID}',0,'9000','{SNData.soldCustomerID.ToString()}',0,
                                                      '{strWorkCenter}','{strRbu}','{strWorkCenter}','{strRbu}',
                                                      'WH00','{strCreateDate}','WH00','{strCreateDate}',0,0,'')";
                                 colSQL.Add(strSQL);
diff --git a/AMESCoreStudio.WebApi/Models/AMES/PTD101AMESModel.cs b/AMESCoreStudio.WebApi/Models/AMES/PTD101AMESModel.cs
index c0bae964..d825f66f 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/PTD101AMESModel.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/PTD101AMESModel.cs
@@ -112,9 +112,9 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         public string dnno { get; set; }
         public string dnLineNO { get; set; }
         public string productID { get; set; }
-        public string soldCustomerID { get; set; }
-        public string expectShipDate { get; set; }
-        public int shipQty { get; set; }
+        public string? soldCustomerID { get; set; }
+        public string? expectShipDate { get; set; }
+        public int? shipQty { get; set; }
         public int qty { get; set; }
 
     }