From e3d9a0204b376e61c9821c90d534c4c32a8861f1 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期五, 12 十一月 2021 13:15:47 +0800
Subject: [PATCH] 打印条码功能
---
WebAPI/WebAPI.csproj | 22 ++++-------
WebAPI/Controllers/BarCodeController.cs | 48 ++++++++++--------------
2 files changed, 28 insertions(+), 42 deletions(-)
diff --git a/WebAPI/Controllers/BarCodeController.cs b/WebAPI/Controllers/BarCodeController.cs
index 8184ca0..568d55b 100644
--- a/WebAPI/Controllers/BarCodeController.cs
+++ b/WebAPI/Controllers/BarCodeController.cs
@@ -1377,36 +1377,15 @@
{
HNumber = oItemSub.HMaterID.ToString();
//HNumber = HNumber.Replace(".", "");
- //
-
//HQty = Math.Ceiling(HBQty + ClsPub.isDoule(oItemSub.HWBQty));
-
- HQty = ClsPub.isDoule(oItemSub.HWBQty);
- HBQty = ClsPub.isInt(oItemSub.HWBQty);//鍐呯鏁伴噺
+ HQty = ClsPub.isDoule(oItemSub.HWBQty);//鍐呯鏁�
+ HBQty = ClsPub.isInt(oItemSub.HWBQty);//鍐呯鏁�
HMinQty = ClsPub.isDoule(oItemSub.HWXQty);//澶栫鍖呰鏁�
- HSumQty = ClsPub.isDoule(oItemSub.HQty); //HWXQtyCol
+ HSumQty = ClsPub.isDoule(oItemSub.HQty); //浜у搧鏁伴噺
for (int i = 0; i < HBQty; i++)
{
- LSH = LSH + 1;
- LSH2 = LSH.ToString();
- while (LSH2.Length < LSHlen) //濡傛灉娴佹按鍙峰皬浜�6浣嶆暟鍓嶉潰琛�0
- {
- LSH2 = "0" + LSH2;
- }
- sDate = ClsPub.GetServerDate(0);
- sYear = ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
- sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
- sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
- sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
- sDay = sDay.Substring(sDay.Length - 2, 2);
- //==================================
- TM = HNumber + sYear + sPeriod + sDay + LSH2;
- while (TM.Length < SumLen) //濡傛灉鏉＄爜灏忎簬12浣嶆暟鍓嶉潰琛�0
- {
- TM = "0" + TM;
- }
- //TM = "B" + TM;
- TM = "SRM" + "B" + TM;
+ // 瀹夌憺鏉＄爜瑙勫垯锛氱墿鏂欑紪鐮侊紙绯荤粺浠ｅ叆锛堾鐗╂枡鍚嶇О锛堢郴缁熶唬鍏ワ級@瑙勬牸鍨嬪彿锛堢郴缁熶唬鍏ワ級@鐢熶骇鏃ユ湡锛堟墜宸ヨ緭鍏ワ級@鏁伴噺锛堟墜宸ヨ緭鍏ワ級@澶辨晥鏃ユ湡锛堟墜宸ヨ緭鍏ワ級@鎵规鍙凤紙鎵嬪伐浠ｅ叆锛堾渚涘簲鍟嗗悕绉帮紙绯荤粺浠ｅ叆锛堾閲囪喘璁㈠崟鍙凤紙绯荤粺浠ｅ叆锛�
+ TM =$"{oItemSub.HMaterNumber}@{oItemSub.HMaterName}@{oItemSub.HMaterModel}@{oItemSub.HKFDate}@{oItemSub.HQty}@{oItemSub.HKFDQDate}@{oItemSub.HBatchNo}@{oItemSub.HSupName}@{oItemSub.HSourceBillNo}";
if (HSumQty - HMinQty > 0)
{
@@ -1433,11 +1412,9 @@
//bar.HMaterName = oItemSub.HMaterName;
//bar.HMaterModel = oItemSub.HMaterModel;
// bar.HModel2 = oItemSub.HModel;
-
bar.HUnitID = oItemSub.HUnitID;
//bar.HUnitNumber2 = oItemSub.HUnitNumber;
//bar.HUnitName2 = oItemSub.HUnitName;
-
bar.HQty = HMinQty;
bar.HBatchNo = oItemSub.HBatchNo;
bar.HKFDate = oItemSub.HKFDate;
@@ -1584,6 +1561,13 @@
+ "','" + HBatchNo + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"
+ "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "')");
oCn.RunProc("exec setLSH '" + DateTime.Today + "'");
+ LogService.Write("insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +
+ ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HEndQty,HSupflag" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HMTONO " +
+ ") values ("
+ + linterid.ToString() + ",'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID + "," + HUnitID + "," + HQty2 + ",'" + HKFDate + "'," + HKFPeriod + ",'" + HKFDQDate
+ + "','" + HBatchNo + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"
+ + "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "')");
}
}
foreach (Model.ClsGy_BarCodeBill_WMS_Model oItemSub in ls3)
@@ -1613,6 +1597,14 @@
+ linterid.ToString() + ",'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID + "," + HUnitID + "," + HQty2 + ",'" + HKFDate + "'," + HKFPeriod + ",'" + HKFDQDate
+ "','" + HBatchNo + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"
+ "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "')");
+ LogService.Write("insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +
+ ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HEndQty,HSupflag" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HMTONO " +
+ ") values ("
+ + linterid.ToString() + ",'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID + "," + HUnitID + "," + HQty2 + ",'" + HKFDate + "'," + HKFPeriod + ",'" + HKFDQDate
+ + "','" + HBatchNo + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"
+ + "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "')");
+
}
}
//鏆傛椂鍙洖濉叧鑱旀暟閲�
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 6622480..e994c68 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -43,17 +43,13 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
- <Reference Include="BLL, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>E:\閲戠\椤圭洰\鑷富渚涘簲鍟嗗钩鍙癨渚涘簲鍟嗗崗鍚屽钩鍙癨DLL\BLL.dll</HintPath>
- </Reference>
<Reference Include="DAL, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>DLL\DAL.dll</HintPath>
+ <HintPath>..\..\SRM-MES\SRM-MES\DAL\bin\Debug\DAL.dll</HintPath>
</Reference>
<Reference Include="DBUtility, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>E:\閲戠\椤圭洰\鑷富渚涘簲鍟嗗钩鍙癨渚涘簲鍟嗗崗鍚屽钩鍙癨DLL\DBUtility.dll</HintPath>
+ <HintPath>..\..\SRM-MES\SRM-MES\DAL\bin\Debug\DBUtility.dll</HintPath>
</Reference>
<Reference Include="Kingdee.BOS.WebApi.Client, Version=7.2.904.6, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -94,9 +90,8 @@
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>DLL\Model.dll</HintPath>
+ <Reference Include="Model">
+ <HintPath>..\..\SRM-MES\SRM-MES\Model\bin\Debug\Model.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -107,15 +102,15 @@
</Reference>
<Reference Include="Pub_Class, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>E:\閲戠\椤圭洰\鑷富渚涘簲鍟嗗钩鍙癨渚涘簲鍟嗗崗鍚屽钩鍙癨DLL\Pub_Class.dll</HintPath>
+ <HintPath>..\..\SRM-MES\SRM-MES\DAL\bin\Debug\Pub_Class.dll</HintPath>
</Reference>
- <Reference Include="Pub_Control, Version=1.0.6632.19241, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Pub_Control, Version=1.0.7754.30316, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>E:\閲戠\椤圭洰\鑷富渚涘簲鍟嗗钩鍙癨渚涘簲鍟嗗崗鍚屽钩鍙癨DLL\Pub_Control.dll</HintPath>
+ <HintPath>..\..\SRM-MES\SRM-MES\DAL\bin\Debug\Pub_Control.dll</HintPath>
</Reference>
<Reference Include="SQLHelper, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>E:\閲戠\椤圭洰\鑷富渚涘簲鍟嗗钩鍙癨渚涘簲鍟嗗崗鍚屽钩鍙癨DLL\SQLHelper.dll</HintPath>
+ <HintPath>..\..\SRM-MES\SRM-MES\DAL\bin\Debug\SQLHelper.dll</HintPath>
</Reference>
<Reference Include="Swashbuckle.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cd1bb07a5ac7c7bc, processorArchitecture=MSIL">
<HintPath>..\packages\Swashbuckle.Core.5.0.0\lib\net40\Swashbuckle.Core.dll</HintPath>
@@ -170,7 +165,6 @@
<Content Include="DLL\Kingdee.BOS.WebApi.Client.dll" />
<Content Include="DLL\Kingdee.BOS.WebApi.FormService.dll" />
<Content Include="DLL\Kingdee.BOS.WebApi.ServicesStub.dll" />
- <Content Include="DLL\Model.dll" />
<Content Include="DLL\Newtonsoft.Json.Net35.dll" />
<Content Include="DLL\Pub_Class.dll" />
<Content Include="DLL\Pub_Control.dll" />
--
Gitblit v1.9.1