陆晔 2 years ago
parent
commit
4373f7fe66
  1. 82
      ICSSoft.FromERP/ICSSoft.Frame.Data.Entity/Fram.dbml
  2. 1700
      ICSSoft.FromERP/ICSSoft.Frame.Data.Entity/Fram.designer.cs
  3. 23
      ICSSoft.FromERP/ICSSoft.FromERP/ICSDispatchDoc.cs
  4. 150
      ICSSoft.FromERP/ICSSoft.FromERP/ICSSAPDocGet.cs
  5. BIN
      ICSSoft.FromERP/Root/ICSSoft.Frame.Data.Entity.dll
  6. 20
      WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
  7. 10
      WMS-BS/NFine.Web/Properties/PublishProfiles/NFine.Framework.Release.pubxml

82
ICSSoft.FromERP/ICSSoft.Frame.Data.Entity/Fram.dbml

@ -108,6 +108,26 @@
<Column Name="MTIME" Type="System.DateTime" DbType="DateTime NOT NULL" CanBeNull="false" />
<Column Name="WorkPoint" Type="System.String" DbType="NVarChar(50) NOT NULL" CanBeNull="false" />
<Column Name="EATTRIBUTE" Type="System.String" DbType="NVarChar(50)" CanBeNull="true" />
<Column Name="OrderNumber" Type="System.String" DbType="NVarChar(12)" CanBeNull="true" />
<Column Name="Sets" Type="System.Decimal" DbType="Decimal(4,0)" CanBeNull="true" />
<Column Name="OrderInvCode" Type="System.String" DbType="NVarChar(18)" CanBeNull="true" />
<Column Name="OrderInvDescribe" Type="System.String" DbType="NVarChar(40)" CanBeNull="true" />
<Column Name="BillType" Type="System.String" DbType="NVarChar(1)" CanBeNull="true" />
<Column Name="Remarks" Type="System.String" DbType="NVarChar(40)" CanBeNull="true" />
<Column Name="Desks" Type="System.String" DbType="NVarChar(20)" CanBeNull="true" />
<Column Name="DispatchNumber" Type="System.String" DbType="NVarChar(20)" CanBeNull="true" />
<Column Name="DispatcherName" Type="System.String" DbType="NVarChar(20)" CanBeNull="true" />
<Column Name="ReceiverNumber" Type="System.String" DbType="NVarChar(20)" CanBeNull="true" />
<Column Name="ReceiverName" Type="System.String" DbType="NVarChar(20)" CanBeNull="true" />
<Column Name="Urgency" Type="System.String" DbType="NVarChar(20)" CanBeNull="true" />
<Column Name="NeedDate" Type="System.String" DbType="NVarChar(20)" CanBeNull="true" />
<Column Name="NeedTime" Type="System.String" DbType="NVarChar(20)" CanBeNull="true" />
<Column Name="RemarksTerm" Type="System.String" DbType="NVarChar(120)" CanBeNull="true" />
<Column Name="TextNumber" Type="System.String" DbType="NVarChar(7)" CanBeNull="true" />
<Column Name="InvDescribe" Type="System.String" DbType="NVarChar(40)" CanBeNull="true" />
<Column Name="Unit" Type="System.String" DbType="NVarChar(50)" CanBeNull="true" />
<Column Name="StockIndicator" Type="System.String" DbType="NVarChar(1)" CanBeNull="true" />
<Column Name="IsSerialNumber" Type="System.String" DbType="NVarChar(4)" CanBeNull="true" />
</Type>
</Table>
<Table Name="dbo.ICSMOApplyNeg" Member="ICSMOApplyNeg">
@ -171,6 +191,20 @@
<Column Name="MTIME" Type="System.DateTime" DbType="DateTime NOT NULL" CanBeNull="false" />
<Column Name="WorkPoint" Type="System.String" DbType="NVarChar(50) NOT NULL" CanBeNull="false" />
<Column Name="EATTRIBUTE1" Type="System.String" DbType="NVarChar(50)" CanBeNull="true" />
<Column Name="OrderType" Type="System.String" DbType="NVarChar(2)" CanBeNull="true" />
<Column Name="TypeDescribe" Type="System.String" DbType="NVarChar(20)" CanBeNull="true" />
<Column Name="Remarks" Type="System.String" DbType="NVarChar(40)" CanBeNull="true" />
<Column Name="PersonNumber" Type="System.String" DbType="NVarChar(10)" CanBeNull="true" />
<Column Name="InvDescribe" Type="System.String" DbType="NVarChar(40)" CanBeNull="true" />
<Column Name="Unit" Type="System.String" DbType="NVarChar(10)" CanBeNull="true" />
<Column Name="StockIndicator" Type="System.String" DbType="NVarChar(1)" CanBeNull="true" />
<Column Name="ReceiveInvCode" Type="System.String" DbType="NVarChar(18)" CanBeNull="true" />
<Column Name="ReceiveInvDescribe" Type="System.String" DbType="NVarChar(40)" CanBeNull="true" />
<Column Name="ReceiveStock" Type="System.String" DbType="NVarChar(1)" CanBeNull="true" />
<Column Name="ReceiveSales" Type="System.String" DbType="NVarChar(10)" CanBeNull="true" />
<Column Name="ReceiveSequence" Type="System.String" DbType="NVarChar(10)" CanBeNull="true" />
<Column Name="Remark2" Type="System.String" DbType="NVarChar(40)" CanBeNull="true" />
<Column Name="IsSerialNumber" Type="System.String" DbType="NVarChar(4)" CanBeNull="true" />
</Type>
</Table>
<Table Name="dbo.ICSMTDOC" Member="ICSMTDOC">
@ -225,6 +259,16 @@
<Column Name="MTIME" Type="System.DateTime" DbType="DateTime NOT NULL" CanBeNull="false" />
<Column Name="WorkPoint" Type="System.String" DbType="NVarChar(50) NOT NULL" CanBeNull="false" />
<Column Name="EATTRIBUTE" Type="System.String" DbType="NVarChar(50)" CanBeNull="true" />
<Column Name="InvDescribe" Type="System.String" DbType="NVarChar(40)" CanBeNull="true" />
<Column Name="OrderNumber" Type="System.String" DbType="NVarChar(12)" CanBeNull="true" />
<Column Name="OrderInvCode" Type="System.String" DbType="NVarChar(18)" CanBeNull="true" />
<Column Name="OrderInvDescribe" Type="System.String" DbType="NVarChar(40)" CanBeNull="true" />
<Column Name="BillType" Type="System.String" DbType="NVarChar(1)" CanBeNull="true" />
<Column Name="Remarks" Type="System.String" DbType="NVarChar(40)" CanBeNull="true" />
<Column Name="Unit" Type="System.String" DbType="NVarChar(10)" CanBeNull="true" />
<Column Name="StockIndicator" Type="System.String" DbType="NVarChar(1)" CanBeNull="true" />
<Column Name="RemarksTerm" Type="System.String" DbType="NVarChar(120)" CanBeNull="true" />
<Column Name="IsSerialNumber" Type="System.String" DbType="NVarChar(4)" CanBeNull="true" />
</Type>
</Table>
<Table Name="dbo.ICSDeliveryNotice" Member="ICSDeliveryNotice">
@ -282,14 +326,22 @@
<Column Name="CreatePerson" Type="System.String" DbType="NVarChar(50) NOT NULL" CanBeNull="false" />
<Column Name="CreateDateTime" Type="System.DateTime" DbType="DateTime NOT NULL" CanBeNull="false" />
<Column Name="Status" Type="System.String" DbType="NVarChar(50) NOT NULL" CanBeNull="false" />
<Column Name="SDNID" Type="System.String" DbType="NVarChar(50) NOT NULL" CanBeNull="false" />
<Column Name="SDNDetailID" Type="System.String" DbType="NVarChar(50) NOT NULL" CanBeNull="false" />
<Column Name="SDNID" Type="System.String" DbType="NVarChar(50)" CanBeNull="true" />
<Column Name="SDNDetailID" Type="System.String" DbType="NVarChar(50)" CanBeNull="true" />
<Column Name="ExtensionID" Type="System.String" DbType="NVarChar(50) NOT NULL" CanBeNull="false" />
<Column Name="MUSER" Type="System.String" DbType="NVarChar(50) NOT NULL" CanBeNull="false" />
<Column Name="MUSERName" Type="System.String" DbType="NVarChar(50) NOT NULL" CanBeNull="false" />
<Column Name="MTIME" Type="System.DateTime" DbType="DateTime NOT NULL" CanBeNull="false" />
<Column Name="WorkPoint" Type="System.String" DbType="NVarChar(50) NOT NULL" CanBeNull="false" />
<Column Name="EATTRIBUTE1" Type="System.String" DbType="NVarChar(50)" CanBeNull="true" />
<Column Name="Points" Type="System.String" DbType="NVarChar(4)" CanBeNull="true" />
<Column Name="DeliveryType" Type="System.String" DbType="NVarChar(4)" CanBeNull="true" />
<Column Name="DeliveryDescribe" Type="System.String" DbType="NVarChar(20)" CanBeNull="true" />
<Column Name="InvDescribe" Type="System.String" DbType="NVarChar(40)" CanBeNull="true" />
<Column Name="OtherDescribe" Type="System.String" DbType="NVarChar(80)" CanBeNull="true" />
<Column Name="SalesUnit" Type="System.String" DbType="NVarChar(10)" CanBeNull="true" />
<Column Name="StockIndicator" Type="System.String" DbType="NVarChar(1)" CanBeNull="true" />
<Column Name="IsSerialNumber" Type="System.String" DbType="NVarChar(4)" CanBeNull="true" />
</Type>
</Table>
<Table Name="dbo.ICSInventoryLotDetail" Member="ICSInventoryLotDetail">
@ -423,8 +475,8 @@
<Column Name="Status" Type="System.String" DbType="NVarChar(10) NOT NULL" CanBeNull="false" />
<Column Name="CreatePerson" Type="System.String" DbType="NVarChar(50) NOT NULL" CanBeNull="false" />
<Column Name="CreateDateTime" Type="System.DateTime" DbType="DateTime NOT NULL" CanBeNull="false" />
<Column Name="OutID" Type="System.String" DbType="NVarChar(50) NOT NULL" CanBeNull="false" />
<Column Name="OutDetailID" Type="System.String" DbType="NVarChar(50) NOT NULL" CanBeNull="false" />
<Column Name="OutID" Type="System.String" DbType="NVarChar(50)" CanBeNull="true" />
<Column Name="OutDetailID" Type="System.String" DbType="NVarChar(50)" CanBeNull="true" />
<Column Name="TransferID" Type="System.String" DbType="NVarChar(50)" CanBeNull="true" />
<Column Name="TransferDetailID" Type="System.String" DbType="NVarChar(50)" CanBeNull="true" />
<Column Name="ExtensionID" Type="System.String" DbType="NVarChar(50) NOT NULL" CanBeNull="false" />
@ -433,6 +485,15 @@
<Column Name="MTIME" Type="System.DateTime" DbType="DateTime NOT NULL" CanBeNull="false" />
<Column Name="WorkPoint" Type="System.String" DbType="NVarChar(50) NOT NULL" CanBeNull="false" />
<Column Name="EATTRIBUTE1" Type="System.String" DbType="NVarChar(50)" CanBeNull="true" />
<Column Name="OrderType" Type="System.String" DbType="NVarChar(2)" CanBeNull="true" />
<Column Name="TypeDescribe" Type="System.String" DbType="NVarChar(20)" CanBeNull="true" />
<Column Name="CostCenter" Type="System.String" DbType="NVarChar(10)" CanBeNull="true" />
<Column Name="Remarks" Type="System.String" DbType="NVarChar(40)" CanBeNull="true" />
<Column Name="PersonNumber" Type="System.String" DbType="NVarChar(10)" CanBeNull="true" />
<Column Name="InvDescribe" Type="System.String" DbType="NVarChar(18)" CanBeNull="true" />
<Column Name="Unit" Type="System.String" DbType="NVarChar(10)" CanBeNull="true" />
<Column Name="StockIndicator" Type="System.String" DbType="NVarChar(1)" CanBeNull="true" />
<Column Name="IsSerialNumber" Type="System.String" DbType="NVarChar(4)" CanBeNull="true" />
</Type>
</Table>
<Table Name="dbo.ICSOtherIn" Member="ICSOtherIn">
@ -448,8 +509,8 @@
<Column Name="Status" Type="System.String" DbType="NVarChar(10) NOT NULL" CanBeNull="false" />
<Column Name="CreatePerson" Type="System.String" DbType="NVarChar(50) NOT NULL" CanBeNull="false" />
<Column Name="CreateDateTime" Type="System.DateTime" DbType="DateTime NOT NULL" CanBeNull="false" />
<Column Name="InID" Type="System.String" DbType="NVarChar(50) NOT NULL" CanBeNull="false" />
<Column Name="InDetailID" Type="System.String" DbType="NVarChar(50) NOT NULL" CanBeNull="false" />
<Column Name="InID" Type="System.String" DbType="NVarChar(50)" CanBeNull="true" />
<Column Name="InDetailID" Type="System.String" DbType="NVarChar(50)" CanBeNull="true" />
<Column Name="TransferID" Type="System.String" DbType="NVarChar(50)" CanBeNull="true" />
<Column Name="TransferDetailID" Type="System.String" DbType="NVarChar(50)" CanBeNull="true" />
<Column Name="ExtensionID" Type="System.String" DbType="NVarChar(50) NOT NULL" CanBeNull="false" />
@ -458,6 +519,15 @@
<Column Name="MTIME" Type="System.DateTime" DbType="DateTime NOT NULL" CanBeNull="false" />
<Column Name="WorkPoint" Type="System.String" DbType="NVarChar(50) NOT NULL" CanBeNull="false" />
<Column Name="EATTRIBUTE1" Type="System.String" DbType="NVarChar(50)" CanBeNull="true" />
<Column Name="OrderType" Type="System.String" DbType="NVarChar(2)" CanBeNull="true" />
<Column Name="TypeDescribe" Type="System.String" DbType="NVarChar(20)" CanBeNull="true" />
<Column Name="CostCenter" Type="System.String" DbType="NVarChar(10)" CanBeNull="true" />
<Column Name="Remarks" Type="System.String" DbType="NVarChar(40)" CanBeNull="true" />
<Column Name="PersonNumber" Type="System.String" DbType="NVarChar(10)" CanBeNull="true" />
<Column Name="InvDescribe" Type="System.String" DbType="NVarChar(18)" CanBeNull="true" />
<Column Name="Unit" Type="System.String" DbType="NVarChar(10)" CanBeNull="true" />
<Column Name="StockIndicator" Type="System.String" DbType="NVarChar(1)" CanBeNull="true" />
<Column Name="IsSerialNumber" Type="System.String" DbType="NVarChar(4)" CanBeNull="true" />
</Type>
</Table>
</Database>

1700
ICSSoft.FromERP/ICSSoft.Frame.Data.Entity/Fram.designer.cs
File diff suppressed because it is too large
View File

23
ICSSoft.FromERP/ICSSoft.FromERP/ICSDispatchDoc.cs

@ -115,7 +115,7 @@ namespace ICSSoft.FromERP
rcvline = new Frame.Data.Entity.ICSSDN();
rcvline.ID = AppConfig.GetGuid();
rcvline.SDNQuantity = 0;
rcvline.SDNCode = Item.VBELN;//销售出/退货单
rcvline.SDNCode = Item.VBELN;//销售出/退货单(交货单)
rcvline.Sequence = Item.POSNR;//行号
rcvline.InvCode = Item.MATNR;//物料编码
rcvline.SOCode = Item.KDAUF;//销售订单
@ -143,6 +143,27 @@ namespace ICSSoft.FromERP
rcvline.MUSERName = "JOB";
rcvline.MTIME = DateTime.Now;
rcvline.WorkPoint = Item.WERKS;//站点
//新增字段
//装运点
rcvline.Points = HeadInfo.VSTEL;
//交货类型
rcvline.DeliveryType = HeadInfo.LFART;
//交货描述
rcvline.DeliveryDescribe = HeadInfo.VTEXT;
//物料描述
rcvline.InvDescribe = Item.MAKTX;
//辅助描述
rcvline.OtherDescribe = Item.DESCR;
//销售单位
rcvline.SalesUnit = Item.VRKME;
//特殊库存标识
rcvline.StockIndicator = Item.SOBKZ;
//序列号参数
rcvline.IsSerialNumber = Item.SERAIL;
if (isNew == true)
{
db.ICSSDN.InsertOnSubmit(rcvline);

150
ICSSoft.FromERP/ICSSoft.FromERP/ICSSAPDocGet.cs

@ -425,7 +425,7 @@ namespace ICSSoft.FromERP
line.InvCode = Item.MATNR;//物料编码
}
line.Type = "1";
line.WorkPoint = Info.WERKS;//站点
line.WorkPoint = Info.WERKS;//站点(工厂)
line.CreatePerson = Info.XINGMING;
line.CreateDateTime = Convert.ToDateTime(Info.DATE_C);//检验时间
line.SourceCode = Item.EBELN;//采购凭证号
@ -438,7 +438,51 @@ namespace ICSSoft.FromERP
line.MUSERName = "JOB";
line.MTIME = DateTime.Now;
line.ExtensionID = ExtensionID;
line.EATTRIBUTE = Info.LEIXING;
line.EATTRIBUTE = Info.LEIXING;//单据类型
//订单号
line.OrderNumber = Info.AUFNR;
//套数
line.Sets = Info.TAOSHU;
//物料号 父项生产订单物料
line.OrderInvCode = Info.MATNR_FAT;
//物料描述 父项 生产订单主物料
line.OrderInvDescribe = Info.MAKTX_FAT;
//出入库 1.出库 2.入库 3.转移 4.盘点
line.BillType = Info.CHURU;
//备注
line.Remarks = Info.BEIZHU;
//工位
line.Desks = Info.P_GW;
//调度工号
line.DispatchNumber = Info.P_DD;
//调度姓名
line.DispatcherName = Info.P_DDNAME;
//收料人工号
line.ReceiverNumber = Info.P_SL;
//收料人姓名
line.ReceiverName = Info.P_SLNAME;
//紧急程度
line.Urgency = Info.P_JJ;
//需求日期
line.NeedDate = Info.ZXQRQ;
//需求时间
line.NeedTime = Info.ZXQSJ.ToString();
//备注项
line.RemarksTerm = Info.ZBEIZ;
//工艺文本码
line.TextNumber =Info.KTSCH;
//物料描述
line.InvDescribe = Item.MAKTX;
//基本计量单位
line.Unit = Item.MEINS;
//特殊库存标识
line.StockIndicator = Item.SOBKZ;
//序列号参数
line.IsSerialNumber = Item.SERNP;
if (isNew == true)
{
db.ICSMOApply.InsertOnSubmit(line);
@ -688,6 +732,30 @@ namespace ICSSoft.FromERP
line.MTIME = DateTime.Now;
line.ExtensionID = ExtensionID;
line.EATTRIBUTE = Info.LEIXING;
//物料描述
line.InvDescribe = Item.MAKTX;
//订单号
line.OrderNumber = Info.AUFNR;
//物料号 父项生产订单主物料
line.OrderInvCode = Info.MATNR_FAT;
//物料描述 父项生产订单主物料
line.OrderInvDescribe = Info.MAKTX_FAT;
//出入库
line.BillType = Info.CHURU;
//备注
line.Remarks = Info.BEIZHU;
//基本计量单位
line.Unit = Item.MEINS;
//接受特殊库存标识
line.StockIndicator = Item.SOBKZ;
//备注项
line.RemarksTerm = Info.ZBEIZ;
//序列号参数
line.IsSerialNumber = Item.SERNP;
if (isNew == true)
{
db.ICSManufactureReceive.InsertOnSubmit(line);
@ -784,6 +852,41 @@ namespace ICSSoft.FromERP
line.MTIME = DateTime.Now;
line.WorkPoint = Info.WERKS;//站点
line.EATTRIBUTE1 = Item.WERKS_JS;//接收站点
//单据类型
line.OrderType = Info.LEIXING;
//类型描述
line.TypeDescribe = Info.MIAOSHU;
//备注
line.Remarks = Info.BEIZHU;
//人员号
line.PersonNumber = Info.PERNR;
//物料描述
line.InvDescribe = Item.MAKTX;
//基本计量单位
line.Unit = Item.MEINS;
//特殊库存标识
line.StockIndicator = Item.SOBKZ;
//接收物料号
line.ReceiveInvCode = Item.MATNR_JS;
//接受物料描述
line.ReceiveInvDescribe = Item.MAKTX_JS;
//接受库存标识
line.ReceiveStock = Item.SOBKZ_JS;
//接受销售订单
line.ReceiveSales = Item.VBELN_JS;
//接受行号
line.ReceiveSequence = Item.POSNR_JS;
//备注2
line.Remark2 = Item.BEIZHU2;
//序列号参数
line.IsSerialNumber = Item.SERNP;
if (isNew == true)
{
db.ICSTransfer.InsertOnSubmit(line);
@ -1173,6 +1276,29 @@ namespace ICSSoft.FromERP
line.MUSERName = "JOB";
line.MTIME = DateTime.Now;
line.ExtensionID = ExtensionID;
//单据类型
line.OrderType = Info.LEIXING;
//类型描述
line.TypeDescribe = Info.MIAOSHU;
//成本中心
line.CostCenter = Info.KOSTL;
//备注
line.Remarks = Info.BEIZHU;
//人员号
line.PersonNumber = Info.PERNR;
//物料描述
line.InvDescribe = Item.MAKTX;
//基本计量单位
line.Unit = Item.MEINS;
//特殊库存标识
line.StockIndicator = Item.SOBKZ;
//序列号参数
line.IsSerialNumber = Item.SERNP;
if (isNew == true)
{
db.ICSOtherOut.InsertOnSubmit(line);
@ -1203,6 +1329,26 @@ namespace ICSSoft.FromERP
line.MUSERName = "JOB";
line.MTIME = DateTime.Now;
line.ExtensionID = ExtensionID;
//单据类型
line.OrderType = Info.LEIXING;
//类型描述
line.TypeDescribe = Info.MIAOSHU;
//成本中心
line.CostCenter = Info.KOSTL;
//备注
line.Remarks = Info.BEIZHU;
//人员号
line.PersonNumber = Info.PERNR;
//物料描述
line.InvDescribe = Item.MAKTX;
//基本计量单位
line.Unit = Item.MEINS;
//特殊库存标识
line.StockIndicator = Item.SOBKZ;
//序列号参数
line.IsSerialNumber = Item.SERNP;
if (isNew == true)
{
db.ICSOtherIn.InsertOnSubmit(line);

BIN
ICSSoft.FromERP/Root/ICSSoft.Frame.Data.Entity.dll

Binary file not shown.

20
WMS-BS/NFine.Application/WMS/PickMaterialApp.cs

@ -1129,7 +1129,13 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'";
}
if (Type == "2")
{
return GetICSMOPickMergeByWorkorder(ID, WorkPoint);
sqls = @"select
a.ApplyCode as Code, a.InvCode, b.InvName, b.InvStd, b.InvUnit, SUM(ISNULL(a.Quantity, 0)) AS iQuantity, a.WhCode,a.ExtensionID
FROM
ICSMOApply a
LEFT JOIN ICSINVENTORY b ON a.InvCode = b.InvCode AND a.WorkPoint=b.WorkPoint
WHERE a.ApplyCode in ({0}) AND a.WorkPoint = '{1}'
GROUP BY a.ApplyCode,a.InvCode,b.InvName,b.InvStd,b.InvUnit,a.WhCode,a.ExtensionID";
}
if (Type == "3")
{
@ -1304,14 +1310,14 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'";
}
sqls = string.Format(sqls, ID, WorkPoint);
string sql = $@"SELECT row_number() over (order by c.Code,c.InvCode,d.MTIME,d.LotNO) AS rowNo,
string sql = $@"SELECT row_number() over ( order by c.Code,c.InvCode,d.MTIME,d.LotNO) AS rowNo,
c.Code,
c.InvCode,
c.InvName,
c.InvStd,
c.InvUnit,
FLOOR(c.iQuantity) AS iQuantity,
d.WarehouseCode,
c.WHCode AS WarehouseCode,
d.LotNO,
FLOOR(ISNULL(d.Quantity, 0)) AS QTY,
d.LocationCode AS LocationCode,
@ -1324,7 +1330,7 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'";
where d.LotNo=m.LotNo and d.WorkPoint=m.WorkPoint
and d.WorkPoint='{WorkPoint}' AND d.Quantity>0 ) d
on c.InvCode=d.INVCode AND c.WhCode=d.WarehouseCode and d.ExtensionID=c.ExtensionID
LEFT JOIN (SELECT INVCode,WarehouseCode,SUM(Quantity) AS QTYTotal FROM ICSWareHouseLotInfo WHERE WorkPoint='1701' GROUP BY INVCode,WarehouseCode) f ON c.InvCode=f.INVCode AND c.WhCode=f.WarehouseCode
LEFT JOIN (SELECT INVCode,WarehouseCode,SUM(Quantity) AS QTYTotal FROM ICSWareHouseLotInfo WHERE WorkPoint='{WorkPoint}' GROUP BY INVCode,WarehouseCode) f ON c.InvCode=f.INVCode AND c.WhCode=f.WarehouseCode
order by c.Code,c.InvCode,d.MTIME ";
var dataset = Repository().FindDataSetBySql(sql);
@ -1334,11 +1340,13 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'";
decimal qtyCount = 0;
bool remove = false;
List<int> removeList = new List<int>();
for (int i = 0; i < table.Rows.Count; i++)
{
if (i != 0
&& !table.Rows[i]["InvCode"].ToString().Equals(table.Rows[i - 1]["InvCode"].ToString()))
&& (!table.Rows[i]["InvCode"].ToString().Equals(table.Rows[i - 1]["InvCode"].ToString())
|| !table.Rows[i]["Code"].ToString().Equals(table.Rows[i - 1]["Code"].ToString()))
)
{
qtyCount = 0;
remove = false;

10
WMS-BS/NFine.Web/Properties/PublishProfiles/NFine.Framework.Release.pubxml

@ -7,11 +7,11 @@
<PropertyGroup>
<WebPublishMethod>FileSystem</WebPublishMethod>
<SiteUrlToLaunchAfterPublish />
<publishUrl>D:\Send\SHZS</publishUrl>
<DeleteExistingFiles>False</DeleteExistingFiles>
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<publishUrl>D:\智合诚公司文件\项目\纽威\代码发布\BS</publishUrl>
<DeleteExistingFiles>false</DeleteExistingFiles>
<LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<ExcludeApp_Data>False</ExcludeApp_Data>
<LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
<ExcludeApp_Data>false</ExcludeApp_Data>
</PropertyGroup>
</Project>
|||||||
100:0
Loading…
Cancel
Save