diff --git a/WMS-BS/NFine.Application/WMS/BlitemApp.cs b/WMS-BS/NFine.Application/WMS/BlitemApp.cs
index bf4e525..411b4f7 100644
--- a/WMS-BS/NFine.Application/WMS/BlitemApp.cs
+++ b/WMS-BS/NFine.Application/WMS/BlitemApp.cs
@@ -70,11 +70,12 @@ a.ReplayAmount,
a.CheckQuantity,
a.CheckAmount
- FROM ICSCheckDetail a
+ FROM ICSCheck f
+ LEFT JOIN ICSCheckDetail a ON f.CheckCode=a.CheckCode
left join ICSInventoryLot c on a.LotNo=c.LotNO and a.WorkPoint=c.WorkPoint
left join ICSInventory b on c.InvCode=b.InvCode AND c.WorkPoint=b.WorkPoint
left join ICSWareHouseLotInfo d on c.LotNO=d.LotNO AND c.WorkPoint=d.WorkPoint
- WHERE a.CheckID='" + ID + "' and a.WorkPoint in ('" + WorkPoint + "')";
+ WHERE f.ID='" + ID + "' and a.WorkPoint in ('" + WorkPoint + "')";
return Repository().FindTablePageBySql(sql.ToString(), parameter.ToArray(), ref jqgridparam);
}
diff --git a/WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs b/WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs
index aebb83a..7c26963 100644
--- a/WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs
+++ b/WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs
@@ -556,7 +556,12 @@ CAST( (a.Quantity-ISNULL(c.LOTQTY,0)) as DECIMAL(18,{0})) as thisCreateQty,isnu
}
-
+ ///
+ /// 销售退货单
+ ///
+ ///
+ ///
+ ///
public DataTable GetGridJsonXiaoShou(string queryJson, ref Pagination jqgridparam)
{
DataTable dt = new DataTable();
@@ -1988,7 +1993,7 @@ CAST( (a.Quantity-ISNULL(c.LOTQTY,0)) as DECIMAL(18,{0})) as thisCreateQty,isnu
#region [SQL]
string sql = @"
select a.ID,a.ApplyNegCode,a.Sequence,a.SourceDetailID,a.InvCode,b.InvName,b.InvDesc,b.InvStd,b.InvUnit,
-CAST(a.Quantity AS DECIMAL(18,{0})) as Quantity
+CAST(a.Quantity AS DECIMAL(18,{0})) as Quantity,
CAST(a.Amount AS DECIMAL(18,{0})) as Amount,CAST(a.IssueNegQuantity AS DECIMAL(18,{0})) as IssueNegQuantity ,a.ExtensionID,a.MUSERName,a.MTIME ,CAST(c.LOTQTY AS DECIMAL(18,{0})) as LOTQTY
,f.Colspan ,f.ProjectCode ,f.BatchCode ,f.Version ,f.Brand ,f.cFree1 ,f.cFree2 ,f.cFree3 ,f.cFree4
,f.cFree5 ,f.cFree6 ,f.cFree7 ,f.cFree8 ,f.cFree9 ,f.cFree10
diff --git a/WMS-BS/NFine.Web/Areas/WMS/Controllers/WMSCreateItemLotController.cs b/WMS-BS/NFine.Web/Areas/WMS/Controllers/WMSCreateItemLotController.cs
index 9203d40..aca546e 100644
--- a/WMS-BS/NFine.Web/Areas/WMS/Controllers/WMSCreateItemLotController.cs
+++ b/WMS-BS/NFine.Web/Areas/WMS/Controllers/WMSCreateItemLotController.cs
@@ -38,7 +38,12 @@ namespace NFine.Web.Areas.WMS.Controllers
return Content(data.ToJson());
}
-
+ ///
+ /// 生产退料单
+ ///
+ ///
+ ///
+ ///
[HttpGet]
[HandlerAjaxOnly]
public ActionResult GetGridJson(Pagination pagination, string queryJson)
@@ -478,6 +483,12 @@ where a.ID IN (" + keyValue.TrimEnd(',') + ") and a.WorkPoint in ('" + WorkPoin
};
return Content(JsonData.ToJson());
}
+ ///
+ /// 销售退货生成条码
+ ///
+ ///
+ ///
+ ///
[HttpGet]
[HandlerAjaxOnly]