1

wwwroot/mes/rpt/rpt365/rpt.ashx

@@ -65,13 +65,13 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                       ,expectedqty
                                       ,receivedqty
                                      -- ,plantolocation
-                                      ,case when plantolocation is null then receivinglocation else plantolocation end plantolocation
+                                      ,case when a.plantolocation is null or a.plantolocation = '' then a.receivinglocation else a.plantolocation end plantolocation
                                       ,lgort
                                       ,lgort_desc
                                       ,umlgo
                                       ,umlgo_desc
-                                      ,receivinglocation
-                                  FROM wms_hg.ycd_details
+                                      --,receivinglocation
+                                  FROM wms_hg.ycd_details a
                                  WHERE 1 = 1  ";
 
                 string asnno = context.Request["asnno"].ToString();//asn单号
@@ -250,7 +250,20 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 OracleCommand cmd = new OracleCommand();
                 OracleCommand cmd1 = new OracleCommand();
                 CDAParameters psp = CDAParameters.Create();
-                string sql = "select a.receivinglocation, b.* from wms_hg.ycd_details a inner join wms_hg.YCD_SERIALNO_DETAILS b on a.matnr=b.matnr and a.asnno=b.asnno where 1=1";
+                string sql = @"select case when a.plantolocation is null or a.plantolocation = '' then a.receivinglocation else a.plantolocation end plantolocation
+,b.ASNNO
+,b.WERKS
+,b.MATNR
+,b.MAKTX
+,b.SERIALNO
+,b.CODEI
+,b.TRACEID
+,b.LPN
+,b.SCANTIME
+,b.ADDWHO
+,b.VBELN
+,b.VBPOS
+from wms_hg.ycd_details a inner join wms_hg.YCD_SERIALNO_DETAILS b on a.matnr=b.matnr and a.asnno=b.asnno where 1=1";
                 //string sku = context.Request["matnr"].ToString();
                 string barcode = context.Request["barcode"] + "";
                 string outbarcode = context.Request["outbarcode"] + "";

wwwroot/mes/rpt/rpt365/rpt_index.html

@@ -91,7 +91,8 @@
             { field: 'EXPECTEDQTY', title: '移仓发出数量', width: '150px', resizable: true, align: 'center' },
             { field: 'RECEIVEDQTY', title: '实际收货数量', width: '150px', resizable: true, align: 'center' },
             /*{ field: 'RECEIVINGLOCATION', title: '订单收货库位', width: '150px', resizable: true, align: 'center' },*/
-            { field: 'PLANTOLOCATION', title: '上架库位（货架）', width: '150px', resizable: true, align: 'center' },
+            //{ field: 'PLANTOLOCATION', title: '上架库位（货架）', width: '150px', resizable: true, align: 'center' },
+            { field: 'PLANTOLOCATION', title: '订单上架库位', width: '150px', resizable: true, align: 'center' },
             { field: 'LGORT', title: '移出库存地', width: '150px', resizable: true, align: 'center' },
             { field: 'LGORT_DESC', title: '移出库存地描述', width: '200px', resizable: true, align: 'center' },
             { field: 'UMLGO', title: '移入库存地', width: '150px', resizable: true, align: 'center' },
@@ -105,7 +106,7 @@
         var dColumns = [[
             { field: 'ASNNO', title: 'ASN单号（WMS）', width: '160px', sortable: false, align: 'center' },
             { field: 'WERKS', title: '工厂', width: '150px', resizable: true, align: 'center' },
-            { field: 'RECEIVINGLOCATION', title: '订单收货库位', width: '150px', resizable: true, align: 'center' },
+            { field: 'PLANTOLOCATION', title: '订单上架库位', width: '150px', resizable: true, align: 'center' },
             { field: 'MATNR', title: '物料编码', width: '150px', resizable: true, align: 'center' },
             { field: 'MAKTX', title: '物料描述', width: '300px', resizable: true, align: 'center' },
             { field: 'SERIALNO', title: '外包装箱码', width: '300px', resizable: true, align: 'center' },