From f1c107b1ae5f48f2c18c23568bf902c410b564f5 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期一, 01 十二月 2025 13:11:50 +0800
Subject: [PATCH] 优化凯贝桌面端批量下推有的字段没有存入值，优化app条码拆码，增加app条码拆码获取打印数据
---
PayM/bin/x86/Debug/Interop.gregn6Lib.dll | 0
PayM/bin/x86/Debug/SQLHelper.dll | 0
PayM/obj/x86/Debug/PayM.csproj.FileListAbsolute.txt | 1
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 60 +++++++++++++++++++++++++++++-
PayM/bin/x86/Debug/Model.pdb | 0
PayM/bin/x86/Debug/BLL.dll | 0
PayM/bin/x86/Debug/DAL.dll | 0
WebAPI/Controllers/CJGL/Cj_SingleStationController.cs | 2
PayM/bin/x86/Debug/DBUtility.pdb | 0
PayM/bin/x86/Debug/Pub_Control.pdb | 0
WorkM/流转卡管理/Sc_ProcessExchangeBill_DH.cs | 22 +++++-----
PayM/bin/x86/Debug/BLL.pdb | 0
PayM/bin/x86/Debug/DAL.pdb | 0
PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll | 0
PayM/bin/x86/Debug/Pub_Class.pdb | 0
PayM/bin/x86/Debug/PayM.dll | 0
PayM/bin/x86/Debug/Pub_Control.dll | 0
WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml.user | 6 +-
PayM/bin/x86/Debug/PayM.pdb | 0
PayM/bin/x86/Debug/DBUtility.dll | 0
PayM/bin/x86/Debug/Model.dll | 0
PayM/bin/x86/Debug/Pub_Class.dll | 0
PayM/bin/x86/Debug/SQLHelper.pdb | 0
23 files changed, 73 insertions(+), 18 deletions(-)
diff --git a/PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll b/PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll
index 7fb52d0..06c5998 100644
--- a/PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll
+++ b/PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/BLL.dll b/PayM/bin/x86/Debug/BLL.dll
index 15495a7..17deca0 100644
--- a/PayM/bin/x86/Debug/BLL.dll
+++ b/PayM/bin/x86/Debug/BLL.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/BLL.pdb b/PayM/bin/x86/Debug/BLL.pdb
index ab05846..63b3f2b 100644
--- a/PayM/bin/x86/Debug/BLL.pdb
+++ b/PayM/bin/x86/Debug/BLL.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/DAL.dll b/PayM/bin/x86/Debug/DAL.dll
index fea0982..7920168 100644
--- a/PayM/bin/x86/Debug/DAL.dll
+++ b/PayM/bin/x86/Debug/DAL.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/DAL.pdb b/PayM/bin/x86/Debug/DAL.pdb
index 6f192a3..ba0f098 100644
--- a/PayM/bin/x86/Debug/DAL.pdb
+++ b/PayM/bin/x86/Debug/DAL.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/DBUtility.dll b/PayM/bin/x86/Debug/DBUtility.dll
index 0f25648..b34bfde 100644
--- a/PayM/bin/x86/Debug/DBUtility.dll
+++ b/PayM/bin/x86/Debug/DBUtility.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/DBUtility.pdb b/PayM/bin/x86/Debug/DBUtility.pdb
index 823f21c..1248cd5 100644
--- a/PayM/bin/x86/Debug/DBUtility.pdb
+++ b/PayM/bin/x86/Debug/DBUtility.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/Interop.gregn6Lib.dll b/PayM/bin/x86/Debug/Interop.gregn6Lib.dll
index 9dd0542..d77acef 100644
--- a/PayM/bin/x86/Debug/Interop.gregn6Lib.dll
+++ b/PayM/bin/x86/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Model.dll b/PayM/bin/x86/Debug/Model.dll
index bac61cd..063ff8d 100644
--- a/PayM/bin/x86/Debug/Model.dll
+++ b/PayM/bin/x86/Debug/Model.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Model.pdb b/PayM/bin/x86/Debug/Model.pdb
index 549e068..2a3efcd 100644
--- a/PayM/bin/x86/Debug/Model.pdb
+++ b/PayM/bin/x86/Debug/Model.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/PayM.dll b/PayM/bin/x86/Debug/PayM.dll
index eec3a6f..b6c77fe 100644
--- a/PayM/bin/x86/Debug/PayM.dll
+++ b/PayM/bin/x86/Debug/PayM.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/PayM.pdb b/PayM/bin/x86/Debug/PayM.pdb
index 447d9c6..ed8a8a1 100644
--- a/PayM/bin/x86/Debug/PayM.pdb
+++ b/PayM/bin/x86/Debug/PayM.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Class.dll b/PayM/bin/x86/Debug/Pub_Class.dll
index df548db..3dd8718 100644
--- a/PayM/bin/x86/Debug/Pub_Class.dll
+++ b/PayM/bin/x86/Debug/Pub_Class.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Class.pdb b/PayM/bin/x86/Debug/Pub_Class.pdb
index 28fd125..ac6f72a 100644
--- a/PayM/bin/x86/Debug/Pub_Class.pdb
+++ b/PayM/bin/x86/Debug/Pub_Class.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Control.dll b/PayM/bin/x86/Debug/Pub_Control.dll
index 689225f..307f8ac 100644
--- a/PayM/bin/x86/Debug/Pub_Control.dll
+++ b/PayM/bin/x86/Debug/Pub_Control.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Control.pdb b/PayM/bin/x86/Debug/Pub_Control.pdb
index 9bb85bf..1aad3e6 100644
--- a/PayM/bin/x86/Debug/Pub_Control.pdb
+++ b/PayM/bin/x86/Debug/Pub_Control.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/SQLHelper.dll b/PayM/bin/x86/Debug/SQLHelper.dll
index 99cdf4a..2be9791 100644
--- a/PayM/bin/x86/Debug/SQLHelper.dll
+++ b/PayM/bin/x86/Debug/SQLHelper.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/SQLHelper.pdb b/PayM/bin/x86/Debug/SQLHelper.pdb
index aec54db..de47788 100644
--- a/PayM/bin/x86/Debug/SQLHelper.pdb
+++ b/PayM/bin/x86/Debug/SQLHelper.pdb
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.csproj.FileListAbsolute.txt b/PayM/obj/x86/Debug/PayM.csproj.FileListAbsolute.txt
index 4c58320..6e11701 100644
--- a/PayM/obj/x86/Debug/PayM.csproj.FileListAbsolute.txt
+++ b/PayM/obj/x86/Debug/PayM.csproj.FileListAbsolute.txt
@@ -2478,7 +2478,6 @@
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\PayM\bin\x86\Debug\SQLHelper.pdb
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\PayM\bin\x86\Debug\Interop.gregn6Lib.dll
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\PayM\bin\x86\Debug\AxInterop.gregn6Lib.dll
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.AssemblyReference.cache
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\PayM\obj\x86\Debug\Interop.gregn6Lib.dll
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\PayM\obj\x86\Debug\AxInterop.gregn6Lib.dll
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.ResolveComReference.cache
diff --git a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
index 1e76dd7..2ce7e9e 100644
--- a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
@@ -1496,7 +1496,7 @@
sql = "delete from Sc_StationOutBillSub_SN where HInterID = " + HInterID + " and HEntryID = " + HEntryID;
oCN.RunProc(sql);
//鍙嶅啓宸ュ簭鍑虹珯鍗曠殑鍚堟牸鏁伴噺
- oCN.RunProc("update Sc_StationOutBillMain WITH (TABLOCKX) set HQty-=1 where HProcExchInterID='" + HProcExchInterID + "' and HProcExchEntryID=" + HProcExchEntryID+ " and HBillNo='"+ HBillNo_bak + "'");
+ oCN.RunProc("update Sc_StationOutBillMain set HQty-=1 where HProcExchInterID='" + HProcExchInterID + "' and HProcExchEntryID=" + HProcExchEntryID+ " and HBillNo='"+ HBillNo_bak + "'");
oCN.Commit();
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
index 01cff2b..d8bf4c3 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
@@ -2658,7 +2658,7 @@
string sql = "insert into Gy_BarCodeBill (HInterID, HEntryID, HBarCode, HBarCodeType, HBarCodeSubType, HMaterID, HUnitID, HQty, HBatchNo, HSupID, HGroupID, HMaker, HMakeDate, " +
"HPrintQty, HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType, HinitQty, HEndQty, HBarcodeQtys, HBarcodeNo, HDeptID, HWhID, HSPID, HRemark, " +
"HCusID, HCusType, HEndDate, HWorkLineName, HBarCodeDate, HSTOCKORGID, HOWNERID, HSeOrderBillNo, HGiveAwayFlag, HMaterName, HMaterModel, " +
- "HPinfan, HAuxPropID, HMTONo, HInnerBillNo, HCoilNO, HFurnaceNO, HFactory, HAuxQty, HheatNO, HProduceDate, HExpiryDate, HEmpID, HCusModel, HCusMaterName, HCheckEmpName, HZZRQ" +
+ "HPinfan, HAuxPropID, HMTONo, HInnerBillNo, HCoilNO, HFurnaceNO, HFactory, HAuxQty, HheatNO, HProduceDate, HExpiryDate, HEmpID, HCusModel, HCusMaterName, HCheckEmpName, HZZRQ,HSupMaterNumber,HSupBatchNo" +
") values (" +
"'" + ds.Tables[0].Rows[0]["HInterID"].ToString() + "', " +
"'" + (int.Parse(ds.Tables[0].Rows[0]["HEntryID"].ToString()) + 1).ToString() + "', " +
@@ -2711,7 +2711,9 @@
"'" + ds.Tables[0].Rows[0]["HCusModel"].ToString() + "', " +
"'" + ds.Tables[0].Rows[0]["HCusMaterName"].ToString() + "', " +
"'" + ds.Tables[0].Rows[0]["HCheckEmpName"].ToString() + "', " +
- "'" + ds.Tables[0].Rows[0]["HZZRQ"].ToString() + "'" +
+ "'" + ds.Tables[0].Rows[0]["HZZRQ"].ToString() + "', " +
+ "'" + ds.Tables[0].Rows[0]["HSupBatchNo"].ToString() + "', " +
+ "'" + ds.Tables[0].Rows[0]["HSupMaterNumber"].ToString() + "'" +
")";
//鎻掑叆鎷嗗垎鏉＄爜
oCN.RunProc(sql);
@@ -2750,6 +2752,60 @@
}
#endregion
+ #region [app 鏉＄爜鎷嗙爜鑾峰彇鎷嗙爜鎵撳嵃鏁版嵁]
+ [Route("Sc_BarCode/GetSplitBarCode_SubList")]
+ [HttpGet]
+ public object GetSplitBarCode_SubList(string HBarCodeNo)
+ {
+ try
+ {
+ if (string.IsNullOrWhiteSpace(HBarCodeNo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇疯緭鍏ユ潯鐮佺紪鍙�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+
+
+ var sql = "select * from h_v_Gy_BarCodeBillList_APP where 鏉＄爜缂栧彿='"+ HBarCodeNo + "'";
+
+ DataSet ds = oCn.RunProcReturn(sql, "h_v_Gy_BarCodeBillList_APP");
+
+ //鍒ゆ柇鏉＄爜鏄惁瀛樺湪鏉＄爜妗ｆ
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "[0000-1-037]鏌ヨ鎴愬姛";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛佸綋鍓嶆潯鐮佷笉瀛樺湪鏉＄爜妗ｆ";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "寮傚父锛�" + ex.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region [鏉＄爜鐢熸垚鎺ュ彛_灏忓崼闀洉鐮乚
[Route("Sc_BarCode/SaveSNByICMO_XW")]
[HttpGet]
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml.user
index 91589e5..662d16e 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2025-11-26T10:01:50.7863694Z;</History>
+ <History>True|2025-12-01T03:56:35.8710305Z;True|2025-12-01T11:51:32.4665294+08:00;True|2025-12-01T11:06:02.7468456+08:00;False|2025-12-01T11:04:57.6926682+08:00;True|2025-11-30T16:03:44.3971182+08:00;False|2025-11-30T16:03:19.8504844+08:00;True|2025-11-26T18:01:50.7863694+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -294,10 +294,10 @@
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>11/26/2025 18:01:47</publishTime>
+ <publishTime>12/01/2025 11:56:33</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>11/26/2025 18:01:47</publishTime>
+ <publishTime>12/01/2025 11:56:33</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill_DH.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill_DH.cs"
index b29a399..86605d1 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill_DH.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill_DH.cs"
@@ -393,11 +393,11 @@
BillNew.omodel.HMaterIDD = "";
BillNew.omodel.HICMOInterID = HICMOInterID;
BillNew.omodel.HICMOEntryID = HICMOEntryID;
- BillNew.omodel.HPicNumVer = "";
- BillNew.omodel.HPicNumAssemble = "";
- BillNew.omodel.HMaterTexture = "";
- BillNew.omodel.HProductNum = "";
- BillNew.omodel.HVerNum = "";
+ BillNew.omodel.HPicNumVer = ds.Tables[0].Rows[0]["HPicNumVer"].ToString();
+ BillNew.omodel.HPicNumAssemble = ds.Tables[0].Rows[0]["HPicNumAssemble"].ToString();
+ BillNew.omodel.HMaterTexture = ds.Tables[0].Rows[0]["HMaterTexture"].ToString();
+ BillNew.omodel.HProductNum = ds.Tables[0].Rows[0]["HProductNum"].ToString();
+ BillNew.omodel.HVerNum = ds.Tables[0].Rows[0]["HVerNum"].ToString();
BillNew.omodel.HPRDORGID = DBUtility.ClsPub.HOrgID;
BillNew.omodel.HBLFlag = false;
BillNew.omodel.HCusNumber = "";
@@ -502,15 +502,15 @@
oBillSub.HWWOrderBillNo = "";
oBillSub.HReportQty = 0;
oBillSub.HBackProc = false;
- oBillSub.HSupID = 0;
- oBillSub.HSupFlag = false;
+ oBillSub.HSupID = Pub_Class.ClsPub.isLong(ds.Tables[0].Rows[j]["HSupID"]);
+ oBillSub.HSupFlag = DBUtility.ClsPub.isBool(ds.Tables[0].Rows[j]["HSupFlag"]);
oBillSub.HOverRate = 0;
oBillSub.HMaxQty = 0;
- oBillSub.HTechnologyParameter = "";
+ oBillSub.HTechnologyParameter = ds.Tables[0].Rows[j]["HTechnologyParameter"].ToString();
oBillSub.HProcCheckNote = "";
- oBillSub.HPicNum = "";
- oBillSub.HMouldNo = "";
- oBillSub.HProcWorkNum = "";
+ oBillSub.HPicNum = ds.Tables[0].Rows[j]["HPicNum"].ToString();
+ oBillSub.HMouldNo = ds.Tables[0].Rows[j]["HMouldNo"].ToString();
+ oBillSub.HProcWorkNum = ds.Tables[0].Rows[j]["HProcWorkNum"].ToString();
oBillSub.HSeOrderInterID = 0;
oBillSub.HSeOrderEntryID = 0;
oBillSub.HSNCtrl = false;
--
Gitblit v1.9.1