Merge branch 'master' of http://119.3.29.177:3000/Jjie/OMAY_WMS

WMS-BS/NFine.Application/OMAY/ICSMoCreateLotApp.cs

@@ -29,7 +29,7 @@ namespace NFine.Application.OMAY
             string sql = @"			select distinct a.ID, a.MODetailID,a.MOCode,a.Sequence,  CAST(a.RCVQuantity AS DECIMAL(18,{0})) as RCVQuantity  ,a.InvCode,b.InvName,b.InvDesc,b.InvStd,b.InvUnit,CAST( a.Quantity AS DECIMAL(18,{0}))  as  Quantity,CAST( a.Amount as DECIMAL(18,{0})) as Amount,a.StartDate
 ,a.DueDate,a.MOStatus,a.ExtensionID,a.MUSERName,a.MTIME ,CAST(c.LOTQTY AS DECIMAL(18,{0}))  as  LOTQTY ,CAST( a.Quantity AS DECIMAL(18,{0})) -CAST(a.RCVQuantity AS DECIMAL(18,{0})) as ERPNum,a.MOMemo
 ,case when a.EATTRIBUTE1='1' then 1 else 0 end MoTypeValue
-,case when a.EATTRIBUTE1='1' then '标准' else '非标准' end MoType
+,case when a.EATTRIBUTE1='1' then '非标准' else '标准' end MoType
 ,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,a.EATTRIBUTE1,a.EATTRIBUTE2,a.EATTRIBUTE3,a.EATTRIBUTE4,a.EATTRIBUTE5,a.EATTRIBUTE6,a.EATTRIBUTE7,a.EATTRIBUTE8,
 a.EATTRIBUTE9,a.EATTRIBUTE10
@@ -153,7 +153,7 @@ from ICSInventoryLot a
             object Figure = GetDecimalDigits();
             List<DbParameter> parameter = new List<DbParameter>();
             string sql = string.Empty;
-            if (MoTypeValue=="1")
+            if (MoTypeValue=="0")
             {
                 sql = @"select
 d.Enable, a.InvCode,b.ClassCode,b.InvName,b.InvStd,b.InvUnit,a.Quantity as Quantity,
@@ -245,7 +245,7 @@ left join  Sys_SRM_ItemsDetail flag  on flag.F_ItemCode='GDCS0001'
 group by MODetailID )a) h on a.MODetailID=h.MODetailID
 								left join ICSConfiguration d on d.Code='CompleteVerification001' and a.WorkPoint =d.WorkPoint 
                                 left join ICSExtension e on a.ExtensionID=e.ID and a.WorkPoint=e.WorkPoint
-            WHERE 1 =1 and a.MOStatus<>'3' and a.EATTRIBUTE1='0'  ";
+            WHERE 1 =1 and a.MOStatus<>'3' and a.EATTRIBUTE1='1'  ";
             }
 
 

WMS-BS/NFine.Application/OMAY/OMAYMoOutboundApp.cs

@@ -24,7 +24,9 @@ namespace NFine.Application.OMAY
             string User = UserName.Substring(0, 2);
             List<DbParameter> parameter = new List<DbParameter>();
             DataTable table = new DataTable();
-            string sql = @"	    select Row_Number() OVER (ORDER BY MOCode desc) AS ID,a.MOCode,a.DepName from (select  distinct a.MOCode,b.DepName from dbo.ICSMO a inner join ICSDepartment b on a.DepCode=b.DepCode and a.WorkPoint=b.WorkPoint)a  where 1=1 ";
+            string sql = @"	    select Row_Number() OVER (ORDER BY MOCode desc) AS ID,a.MOCode,a.DepName from
+  (select  distinct a.MOCode,b.DepName from dbo.ICSMO a 
+  inner join ICSDepartment b on a.DepCode=b.DepCode and a.WorkPoint=b.WorkPoint where a.ApsStatus='Y')a  where 1=1 ";
             if (!string.IsNullOrEmpty(Code))
             {
                 sql += " and a.MOCode like '%" + Code + "%'";
@@ -69,7 +71,7 @@ namespace NFine.Application.OMAY
             List<DbParameter> parameter = new List<DbParameter>();
 
             #region [SQL]
-            string sql = @"	select a.ID,a.MODetailID,a.Sequence,a.InvCode,b.InvName,b.InvDesc,b.InvUnit,b.InvStd,a.Quantity,a.IssueQuantity from dbo.ICSMOPick a
+            string sql = @"	  select a.ID,a.MODetailID,a.Sequence,a.InvCode,b.InvName,b.InvDesc,b.InvUnit,b.InvStd,a.Quantity,a.IssueQuantity,b.EATTRIBUTE1,a.Amount from dbo.ICSMOPick a
 		left join dbo.ICSInventory b on a.InvCode=b.InvCode and a.WorkPoint=b.WorkPoint";
             sql += " WHERE 1=1 and a.EATTRIBUTE1 <> '1' and a.MODetailID='" + queryParam["MODetailID"].ToString() + "'";
             sql = string.Format(sql, DbHelper.GetErpIp(), DbHelper.GetErpName());
@@ -124,7 +126,7 @@ namespace NFine.Application.OMAY
         public string OutboundShipments(string ICSASN)
         {
             string msg = "";
-            string APIURL = ConfigurationManager.ConnectionStrings["APIURL"].ConnectionString + "LOTStockDown/Create";
+            string APIURL = ConfigurationManager.ConnectionStrings["APIURL"].ConnectionString + "LOTStockDownAM/Create";
             string result = HttpPost(APIURL, ICSASN);
             JObject Obj = (JObject)JsonConvert.DeserializeObject(result);//或者JObject jo = JObject.Parse(jsonText);
             string MessAge = Obj["Message"].ToString();

WMS-BS/NFine.Web/Areas/OMAY/Views/OMAYMoOutbound/OMAYMoOutbound.cshtml

@@ -124,6 +124,8 @@
                 { label: '规格型号', name: 'InvStd', width: 100, align: 'left' },
                 { label: '应发数量', name: 'Quantity', width: 100, align: 'left' },
                 { label: '已发数量', name: 'IssueQuantity', width: 100, align: 'left' },
+                { label: '辅计量', name: 'Amount', width: 100, align: 'left' },
+                { label: '转换率', name: 'EATTRIBUTE1', width: 100, align: 'left' },
             ],
             width: "100%",
             autowidth: true,
@@ -329,7 +331,7 @@
                             InvUnit: data.dt[0].InvUnit,
                             ProductDate: data.dt[0].ProductDate,
                             Quantity: data.dt[0].Quantity,
-                            CurrentQuantity: 0,
+                            CurrentQuantity: data.dt[0].Quantity,
                             ProjectCode: data.dt[0].ProjectCode,
                             BatchCode: data.dt[0].BatchCode,
                             Version: data.dt[0].Version,

WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/CreateItemLot.cshtml

@@ -2314,8 +2314,8 @@
             },
             pager: "#gridPager",
             //sortname: 'DNCode,cast(Sequence as int)',
-            sortname: "DNCode,REPLICATE('0',10-len(Sequence))+Sequence ",
-            sortorder: "asc",
+            sortname: "CreateDateTime",
+            sortorder: "desc",
             viewrecords: true,
             multiselect: true,
             //beforeSelectRow: function (rowid, e) {