From 9d93f219367a57659c6641319922dee224e68d39 Mon Sep 17 00:00:00 2001
From: jhz <jinghz@oceic.com>
Date: 星期二, 09 八月 2022 16:57:32 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
NETERPNoWin/obj/x86/Debug/Interop.gregn6Lib.dll | 0
NETERPNoWin/bin/x86/Debug/Pub_Class.pdb | 0
WarM/条码打印/Sc_ICMOToBarCode.cs | 69 ++
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs | 75 +-
WebAPI/Controllers/SCGL/日计划管理/JIT_CompleteController..cs | 43 +
Kanban/Sc_CJKB.cs | 19
WebAPI/Controllers/基础资料/基础资料/Gy_RepairBillController.cs | 13
NETERPNoWin/bin/x86/Debug/Pub_Class.dll | 0
NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe | 0
WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs | 2
NETERPNoWin/bin/x86/Debug/Pub_Control.dll | 0
NETERPNoWin/bin/x86/Debug/SQLHelper.dll | 0
WebAPI/DLL/ClsSc_PHPCruxBillBill.cs | 25
LMES/bin/x86/Debug.zip | 0
NETERPNoWin/bin/x86/Debug/Model.pdb | 0
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 16
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 21
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 10
WebAPI/Controllers/WebAPIController.cs | 2
WebAPI/Sc_MouldProdInBill/Log/637953187498644386.log | 3
WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs | 2
NETERPNoWin/bin/x86/Debug/Pub_Control.pdb | 0
WebAPI/Controllers/Sc_MouldOtherInBillController.cs | 2
WebAPI/Controllers/POStockInBillController.cs | 620 +++++++++++++++++------
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs | 2
WebAPI/Controllers/生产管理/报工台工序/Sc_MESBeginStepWorkBillController.cs | 8
NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb | 0
WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs | 2
WebAPI/Controllers/SCGL/日计划管理/JIT_ICMOSortBillController.cs | 56 ++
WebAPI/ListModels.cs | 23
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | 22
NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb | 0
NETERPNoWin/bin/x86/Debug/WarM.pdb | 0
NETERPNoWin/bin/x86/Debug/OAM.dll | 0
WebAPI/Controllers/博日自动扫码线/ScanlineAPIController.cs | 3
NETERPNoWin/bin/x86/Debug/WarM.dll | 0
WebAPI/Config/kdapi.config | 5
NETERPNoWin/bin/x86/Debug/WorkM.pdb | 0
NETERPNoWin/bin/x86/Debug/Model.dll | 0
WebAPI/Models/ClsSc_AssemblyBillSub.cs | 24
WebAPI/WebAPI.csproj | 5
NETERPNoWin/bin/x86/Debug/grdWidth.wyini | 2
WebAPI/Sc_MouldProdInBill/Log/637953187497864324.log | 3
.gitignore | 2
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 36
NETERPNoWin/bin/x86/Debug/Kanban.dll | 0
NETERPNoWin/bin/x86/Debug/WorkM.dll | 0
NETERPNoWin/bin/x86/Debug/BaseSet.dll | 0
NETERPNoWin/bin/x86/Debug/OAM.pdb | 0
WebAPI/Controllers/LMESController.cs | 2
NETERPNoWin/bin/x86/Debug/BaseSet.pdb | 0
NETERPNoWin/bin/x86/Debug/DBUtility.dll | 0
NETERPNoWin/bin/x86/Debug/Kanban.pdb | 0
WebAPI/Controllers/基础资料/基础资料/Gy_DotCheckBillController.cs | 24
NETERPNoWin/bin/x86/Debug/BLL.dll | 0
WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs | 2
NETERPNoWin/bin/x86/Debug/DBUtility.pdb | 0
NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll | 0
WebAPI/Web.config | 4
NETERPNoWin/bin/x86/Debug/BLL.pdb | 0
WorkM/报表分析/MES_ICMOBillStatusReport.designer.cs | 84 ++-
WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs | 2
NETERPNoWin/bin/x86/Debug/DAL.pdb | 0
WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs | 2
NETERPNoWin/bin/x86/Debug.zip | 0
WebAPI/Controllers/Sc_PckSplitBillController.cs | 206 +++++++
NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe | 0
NETERPNoWin/bin/x86/Debug/SQLHelper.pdb | 0
WebAPI/Sc_MouldProdInBill/Log/637953187498594383.log | 3
NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache | 0
WebAPI/Models/ClsSc_AssemblyBillMain.cs | 28 +
/dev/null | 0
WorkM/报表分析/MES_ICMOBillStatusReport.cs | 5
NETERPNoWin/bin/x86/Debug/PlanM.dll | 0
NETERPNoWin/bin/x86/Debug/DAL.dll | 0
WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs | 2
WebAPI/DLL/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs | 4
NETERPNoWin/bin/x86/Debug/HXERP.ini | 43 -
WebAPI/Controllers/Sc_ProcessMangementController.cs | 4
WebAPI/Vlog/webapi20220805.txt | 1
NETERPNoWin/bin/x86/Debug/PlanM.pdb | 0
81 files changed, 1,156 insertions(+), 375 deletions(-)
diff --git a/.gitignore b/.gitignore
index 60fedd0..d02851a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -133,3 +133,5 @@
/NETERPNoWin/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs
/NETERPNoWin/bin/Debug
/NETERPNoWin/obj/Debug
+/WebAPI/Sc_MouldProdInBill/Log
+/WebAPI/Vlog
diff --git a/Kanban/Sc_CJKB.cs b/Kanban/Sc_CJKB.cs
index 055ee65..384539a 100644
--- a/Kanban/Sc_CJKB.cs
+++ b/Kanban/Sc_CJKB.cs
@@ -101,15 +101,16 @@
//-----------棰勮鐘舵��
//寮�宸ユ椂闂村皬浜庡綋澶╂椂闂达紝浣嗘槸浠诲姟鍗曠姸鎬佽繕鏄� 寰呯敓浜э紝绯荤粺鑷姩榛勮壊璀︾ず锛�
//瀹屽伐鏃堕棿灏忎簬褰撳ぉ鏃堕棿锛屼絾鏄换鍔″崟杩樻槸寰呯敓浜ф垨鑰呭湪鎵ц鐨勶紝绯荤粺鑷姩绾㈣壊璀︾ず锛�
- int HEDateCol = Fun_GetCol("璁″垝瀹屽伐鏃ユ湡");
- DateTime oNow = DateTime.Today.Date;
- for (int i = 0; i < grdMain.Rows.Count; i++)
- {
- if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
- {
- grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
- }
- }
+
+ //int HEDateCol = Fun_GetCol("璁″垝瀹屽伐鏃ユ湡");
+ //DateTime oNow = DateTime.Today.Date;
+ //for (int i = 0; i < grdMain.Rows.Count; i++)
+ //{
+ // if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
+ // {
+ // grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
+ // }
+ //}
//璁剧疆鍚堣鍒�
string sTotalCol = "";
diff --git a/LMES/bin/x86/Debug.rar b/LMES/bin/x86/Debug.rar
deleted file mode 100644
index aa8ea7a..0000000
--- a/LMES/bin/x86/Debug.rar
+++ /dev/null
Binary files differ
diff --git a/LMES/bin/x86/Debug.zip b/LMES/bin/x86/Debug.zip
new file mode 100644
index 0000000..cc0f1b0
--- /dev/null
+++ b/LMES/bin/x86/Debug.zip
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug.zip b/NETERPNoWin/bin/x86/Debug.zip
index a62cd05..5916d45 100644
--- a/NETERPNoWin/bin/x86/Debug.zip
+++ b/NETERPNoWin/bin/x86/Debug.zip
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BLL.dll b/NETERPNoWin/bin/x86/Debug/BLL.dll
index 62a197f..d606545 100644
--- a/NETERPNoWin/bin/x86/Debug/BLL.dll
+++ b/NETERPNoWin/bin/x86/Debug/BLL.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BLL.pdb b/NETERPNoWin/bin/x86/Debug/BLL.pdb
index 90ab76e..049b722 100644
--- a/NETERPNoWin/bin/x86/Debug/BLL.pdb
+++ b/NETERPNoWin/bin/x86/Debug/BLL.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BaseSet.dll b/NETERPNoWin/bin/x86/Debug/BaseSet.dll
index c2f29ef..37b94d2 100644
--- a/NETERPNoWin/bin/x86/Debug/BaseSet.dll
+++ b/NETERPNoWin/bin/x86/Debug/BaseSet.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/BaseSet.pdb b/NETERPNoWin/bin/x86/Debug/BaseSet.pdb
index bbb7b1f..e1cb8a6 100644
--- a/NETERPNoWin/bin/x86/Debug/BaseSet.pdb
+++ b/NETERPNoWin/bin/x86/Debug/BaseSet.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DAL.dll b/NETERPNoWin/bin/x86/Debug/DAL.dll
index f51a1e5..ffbcc5d 100644
--- a/NETERPNoWin/bin/x86/Debug/DAL.dll
+++ b/NETERPNoWin/bin/x86/Debug/DAL.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DAL.pdb b/NETERPNoWin/bin/x86/Debug/DAL.pdb
index 1f3ab8d..248e5b2 100644
--- a/NETERPNoWin/bin/x86/Debug/DAL.pdb
+++ b/NETERPNoWin/bin/x86/Debug/DAL.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DBUtility.dll b/NETERPNoWin/bin/x86/Debug/DBUtility.dll
index b1aeb55..d2e6638 100644
--- a/NETERPNoWin/bin/x86/Debug/DBUtility.dll
+++ b/NETERPNoWin/bin/x86/Debug/DBUtility.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/DBUtility.pdb b/NETERPNoWin/bin/x86/Debug/DBUtility.pdb
index 4314e15..d228415 100644
--- a/NETERPNoWin/bin/x86/Debug/DBUtility.pdb
+++ b/NETERPNoWin/bin/x86/Debug/DBUtility.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/HXERP.ini b/NETERPNoWin/bin/x86/Debug/HXERP.ini
index 44f071a..ec3c589 100644
--- a/NETERPNoWin/bin/x86/Debug/HXERP.ini
+++ b/NETERPNoWin/bin/x86/Debug/HXERP.ini
@@ -1,46 +1,25 @@
-[po]
-Server=47.96.97.237,15127
[Erp]
-Server=47.96.97.237,15127
+Server=192.168.0.88
DataBase=HX_LMESsys
-DataBaseNumber=001-智云LMES管理系统
+DataBaseNumber=001-WMS条码系统
UserName=HX_USER
PassWord=lc@841022
-UserPsd=
-Remember=
-[Srm]
-Server=47.96.97.237,15127
-DataBase=HX_LMESsys
-DataBaseNumber=001-ERP供应商协同平台
-UserName=HX_USER
-PassWord=lc@841022
-UserPsd=
-Remember=
[K3Erp]
-Server=47.96.97.237,15127
-DataBase=
-UserName=HX_USER
-PassWord=lc@841022
-[K32Erp]
-Server=47.96.97.237,15127
+Server=192.168.0.88
DataBase=HX_LMESsys
UserName=HX_USER
PassWord=lc@841022
[UserInfo]
-UserName=admin,33.995,001,宁波海关驻慈溪办事处,景焕章
+UserName=admin,王平,测试人员,jhz,001,景焕章,周黄阳,没有找到！
UserPsd=
Remember=1
-HOrgName=蓝海实业集团
-[CLOUDINFO]
-
-sCLOUDUrl=http://47.96.97.237/k3cloud/
-sCLOUDAcc=6204a70eba35fc
-sCLOUDUseName=demo
-sCLOUDPsd=888888
+HOrgName=宁波奥邦喷雾器有限公司
+[K32Erp]
+Server=没有找到！
+DataBase=没有找到！
+UserName=没有找到！
+PassWord=没有找到！
[OPenWin]
gnbm=Sc9910
gnsy=Sc_WorkBillPlanSumReportKB
-gnmc=车间看板
-[Dept]
-DeptID=没有找到！
-DeptName=没有找到！
+gnmc=车间看板
\ No newline at end of file
diff --git a/NETERPNoWin/bin/x86/Debug/HX_Update.exe b/NETERPNoWin/bin/x86/Debug/HX_Update.exe
deleted file mode 100644
index 29fcf96..0000000
--- a/NETERPNoWin/bin/x86/Debug/HX_Update.exe
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll b/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll
index c844bc0..d625ca8 100644
--- a/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll
+++ b/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Kanban.dll b/NETERPNoWin/bin/x86/Debug/Kanban.dll
index 57cbc56..d605821 100644
--- a/NETERPNoWin/bin/x86/Debug/Kanban.dll
+++ b/NETERPNoWin/bin/x86/Debug/Kanban.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Kanban.pdb b/NETERPNoWin/bin/x86/Debug/Kanban.pdb
index c52e58b..63385c6 100644
--- a/NETERPNoWin/bin/x86/Debug/Kanban.pdb
+++ b/NETERPNoWin/bin/x86/Debug/Kanban.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Model.dll b/NETERPNoWin/bin/x86/Debug/Model.dll
index 96d03cf..30a24ed 100644
--- a/NETERPNoWin/bin/x86/Debug/Model.dll
+++ b/NETERPNoWin/bin/x86/Debug/Model.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Model.pdb b/NETERPNoWin/bin/x86/Debug/Model.pdb
index 5d28b9a..05bdb7b 100644
--- a/NETERPNoWin/bin/x86/Debug/Model.pdb
+++ b/NETERPNoWin/bin/x86/Debug/Model.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe
index e6efcd5..4aa1843 100644
--- a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe
+++ b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb
index c0443f4..fbb3a51 100644
--- a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb
+++ b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/OAM.dll b/NETERPNoWin/bin/x86/Debug/OAM.dll
index a3e94e3..a07b9c1 100644
--- a/NETERPNoWin/bin/x86/Debug/OAM.dll
+++ b/NETERPNoWin/bin/x86/Debug/OAM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/OAM.pdb b/NETERPNoWin/bin/x86/Debug/OAM.pdb
index 21fb289..6b4fc0c 100644
--- a/NETERPNoWin/bin/x86/Debug/OAM.pdb
+++ b/NETERPNoWin/bin/x86/Debug/OAM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/PlanM.dll b/NETERPNoWin/bin/x86/Debug/PlanM.dll
index db17776..5f95d5d 100644
--- a/NETERPNoWin/bin/x86/Debug/PlanM.dll
+++ b/NETERPNoWin/bin/x86/Debug/PlanM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/PlanM.pdb b/NETERPNoWin/bin/x86/Debug/PlanM.pdb
index c1b1523..92cec6a 100644
--- a/NETERPNoWin/bin/x86/Debug/PlanM.pdb
+++ b/NETERPNoWin/bin/x86/Debug/PlanM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Class.dll b/NETERPNoWin/bin/x86/Debug/Pub_Class.dll
index cbd4d70..e068e61 100644
--- a/NETERPNoWin/bin/x86/Debug/Pub_Class.dll
+++ b/NETERPNoWin/bin/x86/Debug/Pub_Class.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb b/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb
index 9cd4514..18cf7d7 100644
--- a/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb
+++ b/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Control.dll b/NETERPNoWin/bin/x86/Debug/Pub_Control.dll
index 86efcc3..19b77bb 100644
--- a/NETERPNoWin/bin/x86/Debug/Pub_Control.dll
+++ b/NETERPNoWin/bin/x86/Debug/Pub_Control.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb b/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb
index 447350a..f1df76b 100644
--- a/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb
+++ b/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/SQLHelper.dll b/NETERPNoWin/bin/x86/Debug/SQLHelper.dll
index 1ff113f..551218a 100644
--- a/NETERPNoWin/bin/x86/Debug/SQLHelper.dll
+++ b/NETERPNoWin/bin/x86/Debug/SQLHelper.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb b/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb
index 75254ae..0b3ac68 100644
--- a/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb
+++ b/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WarM.dll b/NETERPNoWin/bin/x86/Debug/WarM.dll
index 3707c6f..8904b9a 100644
--- a/NETERPNoWin/bin/x86/Debug/WarM.dll
+++ b/NETERPNoWin/bin/x86/Debug/WarM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WarM.pdb b/NETERPNoWin/bin/x86/Debug/WarM.pdb
index e88e2bb..2607b3e 100644
--- a/NETERPNoWin/bin/x86/Debug/WarM.pdb
+++ b/NETERPNoWin/bin/x86/Debug/WarM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WorkM.dll b/NETERPNoWin/bin/x86/Debug/WorkM.dll
index 81022db..ed2dfb9 100644
--- a/NETERPNoWin/bin/x86/Debug/WorkM.dll
+++ b/NETERPNoWin/bin/x86/Debug/WorkM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/WorkM.pdb b/NETERPNoWin/bin/x86/Debug/WorkM.pdb
index 82305d4..1dac6d9 100644
--- a/NETERPNoWin/bin/x86/Debug/WorkM.pdb
+++ b/NETERPNoWin/bin/x86/Debug/WorkM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/x86/Debug/grdWidth.wyini b/NETERPNoWin/bin/x86/Debug/grdWidth.wyini
index 836addf..124a15b 100644
--- a/NETERPNoWin/bin/x86/Debug/grdWidth.wyini
+++ b/NETERPNoWin/bin/x86/Debug/grdWidth.wyini
@@ -54,4 +54,4 @@
Sc_WorkBillProcProdReportKB=193,556,523,112
Sc_HZQLCGKB=11,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100
frmDownMenu任务单设置=100,135,100
-Sc_CJKB=
+Sc_CJKB=100,428,301,100,273,372
diff --git a/NETERPNoWin/obj/x86/Debug/Interop.gregn6Lib.dll b/NETERPNoWin/obj/x86/Debug/Interop.gregn6Lib.dll
index c844bc0..d625ca8 100644
--- a/NETERPNoWin/obj/x86/Debug/Interop.gregn6Lib.dll
+++ b/NETERPNoWin/obj/x86/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache
index 4ae63c9..2cedffa 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe
index e6efcd5..4aa1843 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb
index c0443f4..fbb3a51 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb
Binary files differ
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
index 83a651c..27b3428 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
@@ -781,6 +781,8 @@
DataSet Ds;
int LSH = 0; //娴佹按鍙�
string LSH2 = ""; //娴佹按鍙疯浆鎹㈡垚瀛楃
+
+
double HZXQty = 0; //瑁呯鏁伴噺
double HDDQty = 0; //璁㈠崟鏁伴噺
double HBQty = 0; //绠辨暟
@@ -792,10 +794,18 @@
string sPackBarCode = "";
string HPrdDate = "";
string HBC = "";
+ string HDate1 = "";
+ DataSet Ds99;
+ //绠卞彿
+ string HXH = "";
+ //绠卞彿娴佹按鍙�
+ int LSH3 = 0; //娴佹按鍙�
+ string LSH4 = ""; //娴佹按鍙疯浆鎹㈡垚瀛楃
+ //鏈哄彴
+ string HJT = "";
-
- HDate = dtpHBeginDate.Value.ToShortDateString();
+ HDate = DateTime.Now.ToString();
//鍒ゆ柇褰撳墠鏃堕棿鏄惁鍦ㄥ伐浣滄椂闂存鍐�
string _strWorkingDayAM = "07:30";//宸ヤ綔鏃堕棿涓婂崍08:30
@@ -811,11 +821,13 @@
DateTime t1 = Convert.ToDateTime(HDate);
TimeSpan dspNow = t1.TimeOfDay;
+ HDate1 = Convert.ToDateTime(HDate).ToShortDateString();
//1.姝ｅ父涓婄彮鏃堕棿 灏辨槸鐧界彮 濡傛灉涓嶆槸绀兼嫓澶� 灏卞線鍓嶆彁鍓嶄竴澶�
if (dspNow > dspWorkingDayAM && dspNow < dspWorkingDayPM)
{
HBC = "鐧界彮";
- DataSet DSet2 = oCn.RunProcReturn("select * from Gy_FactoryDayOff Where HFactoryDayOffDate='" + HDate.ToString() + "'", "Gy_FactoryDayOff", ref DBUtility.ClsPub.sExeReturnInfo);
+
+ DataSet DSet2 = oCn.RunProcReturn("select * from Gy_FactoryDayOff Where HFactoryDayOffDate='" + HDate1.ToString() + "'", "Gy_FactoryDayOff", ref DBUtility.ClsPub.sExeReturnInfo);
if (DSet2 == null || DSet2.Tables[0].Rows.Count == 0)
{
HPrdDate = HDate;
@@ -829,7 +841,7 @@
if (dspNow > dspWorkingDayPM && dspNow < dspWorkingDaySM)
{
HBC = "澶滅彮";
- DataSet DSet2 = oCn.RunProcReturn("select * from Gy_FactoryDayOff Where HFactoryDayOffDate='" + HDate.ToString() + "'", "Gy_FactoryDayOff", ref DBUtility.ClsPub.sExeReturnInfo);
+ DataSet DSet2 = oCn.RunProcReturn("select * from Gy_FactoryDayOff Where HFactoryDayOffDate='" + HDate1.ToString() + "'", "Gy_FactoryDayOff", ref DBUtility.ClsPub.sExeReturnInfo);
if (DSet2 == null || DSet2.Tables[0].Rows.Count == 0)
{
HPrdDate = HDate;
@@ -857,15 +869,38 @@
}
HYear = ClsPub.isDate(HPrdDate).Year.ToString().Substring(2, 2);
HPeriod = "0" + ClsPub.isDate(HPrdDate).Month.ToString();
- HPeriod = HPeriod.Substring(HPrdDate.Length - 2, 2);
+ HPeriod = HPeriod.Substring(HPeriod.Length - 2, 2);
HDay = "0" + ClsPub.isDate(HPrdDate).Day.ToString();
- HDay = HDay.Substring(HPrdDate.Length - 2, 2);
+ HDay = HDay.Substring(HDay.Length - 2, 2);
long HTMaterID = 0;
HTMaterID = ClsPub.isLong(grdMain.Rows[0].Cells[Fun_GetCol("HMaterID")].Value);
string sPackStr = "ZXM" + HYear + HPeriod + HDay + HTMaterID; //澶栫鐮� 鍓嶇紑
+
+
+ //鑾峰彇澶勭悊杩囩殑鏃ユ湡璺熶粖澶╁樊鍑犲ぉ 鐒跺悗鍔犲嚑涓�+鍙�
+ TimeSpan HCY = Convert.ToDateTime(HPrdDate) - Convert.ToDateTime(DateTime.Now.ToString());
+ int a = 1;
+ while (a <= HCY.Days) //褰揳 灏忎簬 宸紓澶╂暟 寰幆鍔犱笂 + 鍙�
+ {
+ HPrdDate = HPrdDate + "+";
+ a = a + 1;
+ }
DataSet DsTM = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sPackStr + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿 //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
Int64 TTM_LSH = ClsPub.isInt(DsTM.Tables[0].Rows[0][0]) + 1;
- sPackBarCode = sPackStr + TTM_LSH.ToString() + "+";
+
+
+ sPackBarCode = sPackStr + TTM_LSH.ToString();
+ //DataSet DSet3 = oCn.RunProcReturn("select * from Gy_FactoryDayOff Where HFactoryDayOffDate='" + HDate1.ToString() + "'", "Gy_FactoryDayOff", ref DBUtility.ClsPub.sExeReturnInfo);
+ //if (DSet3 == null || DSet3.Tables[0].Rows.Count == 0)
+ //{
+ // sPackBarCode = sPackStr + TTM_LSH.ToString() ;
+ //}
+ //else
+ //{
+ // sPackBarCode = sPackStr + TTM_LSH.ToString() + "+";
+ //}
+
+
oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sPackStr + "'");
@@ -952,6 +987,15 @@
HBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("鎵规")].Value);
HOrgNumber = ClsPub.HOrgNumber;
+
+
+ //绠卞彿鐢熸垚瑙勫垯 鏃ユ湡 + 鏈哄彴 + 鐝 + 鐗╂枡 鍙鑾峰彇鏈�澶х殑娴佹按鍙�
+ HJT = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("璁惧")].Value);
+ HXH = HYear + HPeriod + HDay + HBC + HJT + HMaterNumber;
+ Ds99 = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HXH + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH3 = ClsPub.isInt(Ds99.Tables[0].Rows[0][0]) + 1;
+ LSH4 = LSH3.ToString();
+
//HBQty = HBQty + ClsPub.isInt(txtHBQty.Text);
@@ -1047,7 +1091,7 @@
",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HSourceID,HInterID " +
- ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
+ ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HPrdDate,HBC,HXH,HInnerBillNo " +
") values ("
+ "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID1.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString() + ", " + HMZQty.ToString()
+ ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
@@ -1055,22 +1099,23 @@
+ ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
+ ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + HDate + "'"
+ ", " + ClsPub.HOrgID.ToString() + "," + ClsPub.HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HSourceID.ToString() + "," + HInterID.ToString()
- + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "')");
+ + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HPrdDate + "','" + HBC + "','" + LSH4 + "','" + HInnerBillNo + "')");
oCn.RunProc("exec h_p_WMS_SetMaxNo '" + HTMNumber + "'");
+ oCn.RunProc("exec h_p_WMS_SetMaxNo '" + HXH + "'");
DisplayTM();
}
}
//2.寰幆缁撴潫鍚庯紝鏍规嵁 鏈鐢熸垚鐨� 涓诲唴鐮侊紝浠庡悗鍙版暟鎹簱鑾峰彇 鏉＄爜鍒楄〃锛岀敓鎴� 缁勬墭鍗� 鍜� 鎵樻潯鐮侊紝 鐩存帴璋冪敤瀛樺偍杩囩▼
//鏍规嵁澶栫鐮� 鍐欏叆 缁勬墭鍗曚富琛紝缁勬墭鍗曞瓙琛紝SUM锛屽绠辩爜妗ｆ锛孲UM妗ｆ
- oCn.RunProc("exec h_p_WMS_PackUnionBill_AddNew '" + sPackBarCode + "'," + HInterID_TTM.ToString() + ",'" + DBUtility.ClsPub.CurUserName + "','" + HDate + "'," + HInterID.ToString()); //鏍规嵁绠辨潯鐮侊紝鍐欏叆 涓昏〃锛屽瓙琛� 锛岀鏉＄爜妗ｆ
+ oCn.RunProc("exec h_p_WMS_PackUnionBill_AddNew_test '" + sPackBarCode + "'," + HInterID_TTM.ToString() + ",'" + DBUtility.ClsPub.CurUserName + "'," + HInterID.ToString()); //鏍规嵁绠辨潯鐮侊紝鍐欏叆 涓昏〃锛屽瓙琛� 锛岀鏉＄爜妗ｆ
oCn.RunProc("exec h_p_WMS_PackUnionBill_SumSubBill " + HInterID_TTM.ToString() + ",'" + sPackBarCode + "','3783','" + DBUtility.ClsPub.CurUserName + "'," + HInterID.ToString()); //鏍规嵁绠辨潯鐮侊紝鍐欏叆 SUM琛紝SUM鏉＄爜妗ｆ
sPackBarCode = "";
- DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList_CS Where HInterID=" + HInterID.ToString() + " and 鏉＄爜绫诲瀷 = '鎵樼洏鏉＄爜'", "h_v_IF_BarCodeBillList_CS", ref DBUtility.ClsPub.sExeReturnInfo);
+ DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList_CS_Test Where HInterID=" + HInterID.ToString() + " and 鏉＄爜绫诲瀷 = '鎵樼洏鏉＄爜'", "h_v_IF_BarCodeBillList_CS_Test", ref DBUtility.ClsPub.sExeReturnInfo);
//鐢熸垚棣栬鏍囬
if (DSet == null)
{
@@ -1603,7 +1648,7 @@
private void DisplayTM()
{
//HInterID = DBUtility.ClsPub.isInt(txtHMaterID.Tag);
- DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " and 鏉＄爜绫诲瀷 = '鎵樼洏鏉＄爜' order by HItemID", "h_v_IF_BarCodeBillList", ref DBUtility.ClsPub.sExeReturnInfo);
+ DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList_test Where HinterID=" + HInterID.ToString() + " and 鏉＄爜绫诲瀷 = '鎵樼洏鏉＄爜' order by HItemID", "h_v_IF_BarCodeBillList_test", ref DBUtility.ClsPub.sExeReturnInfo);
//鐢熸垚棣栬鏍囬
if (DSet == null)
{
diff --git a/WebAPI/Config/kdapi.config b/WebAPI/Config/kdapi.config
index 5811655..897fcfa 100644
--- a/WebAPI/Config/kdapi.config
+++ b/WebAPI/Config/kdapi.config
@@ -4,6 +4,7 @@
<add key="DbId" value="6204a70eba35fc"></add>
<add key="UserName" value="Administrator"></add>
<add key="PassWord" value="qaz!@#123"></add>
- <add key="KDApiUrl" value="http://localhost/K3Cloud/"></add>
- </appSettings>
+ <add key="KDApiUrl" value="http://47.96.97.237/K3Cloud/"></add>
+ <add key="DataBaseName" value="AIS20210811135644"></add>
+ </appSettings>
</configuration>
\ No newline at end of file
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 2073b09..dd4cfe1 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -181,14 +181,14 @@
objJsonResult.data = null;
return objJsonResult;
}
- if (HQCCheckID == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "妫�楠屽憳娌℃湁閫夋嫨锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //if (HQCCheckID == 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "妫�楠屽憳娌℃湁閫夋嫨锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
//if (HSourceID == 0)
//{
// objJsonResult.code = "0";
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index 8c801b9..fd02fef 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -501,7 +501,7 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
string sql = string.Format(@"select 娴佹按鍙� HProcNo,HProcID,宸ュ簭浠ｇ爜 HProcNumber,宸ュ簭鍚嶇О HProcName,鍔犲伐璇存槑 HWorkRemark,HCenterID,宸ヤ綔涓績浠ｇ爜 HCenterNumber,
宸ヤ綔涓績 HCenterName,HSupID,渚涘簲鍟嗕唬鐮� HSupNumber,渚涘簲鍟� HSupName,isEntrust,璁″垝鏁伴噺 HQty,鍔犲伐鍗曚环 HOutPrice, 琛ㄤ綋澶囨敞 HRemark,
- 杩涚珯鏁伴噺 HRelationQty_In,鍑虹珯鏁伴噺 HRelationQty_Out,濮斿宸ュ崟鏁伴噺 HRelationQty_WWOrder,涓嶅悎鏍兼暟閲� HRelationQty_Bad,瓒呴姣斾緥 HOverRate,
+ 杩涚珯鍏宠仈鏁伴噺 HRelationQty_In,鍑虹珯鍏宠仈鏁伴噺 HRelationQty_Out,濮斿宸ュ崟鏁伴噺 HRelationQty_WWOrder,涓嶅悎鏍兼暟閲� HRelationQty_Bad,瓒呴姣斾緥 HOverRate,
鑹巼 HPassRate,绱鑹巼 HSumPassRate,鍥剧焊缂栧彿 HPicNum,鏈伐搴忕‘璁よ褰� HProcCheckNote,宸ヨ壓鍙傛暟 HTechnologyParameter,HDeptID,
鍔犲伐杞﹂棿浠ｇ爜 HDeptNumber,鍔犲伐杞﹂棿 HDeptName
from h_v_Sc_ProcessExchangeBillQuerySub");
@@ -552,6 +552,25 @@
objJsonResult.data = null;
return objJsonResult;
}
+
+
+ //鍒犻櫎鍓嶅垽鏂叧鑱旀暟閲�
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ DataSet ds;
+ ds = oCn.RunProcReturn("select ct from ( " +
+ " select 1 ct from Sc_StationInBillMain Where HProcExchInterID=" + lngBillKey + " " +
+ " union all " +
+ " select 1 from Sc_StationOutBillMain Where HProcExchInterID=" + lngBillKey + " ) as a ", "Sc_ProcExchReportSub");
+ if (ds.Tables[0].Rows.Count != 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佽浆鍗″凡缁忔湁涓嬫父杩涘嚭绔欏崟鍚庯紝涓嶅厑璁稿垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
DAL.ClsSc_ProcessExchangeBill oBill = new DAL.ClsSc_ProcessExchangeBill();
DBUtility.ClsPub.HOrgID = HPRDORGID;
if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index a213858..aab3a29 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -119,9 +119,9 @@
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
- int hentryid = int.Parse(sArray[2].ToString());//瀛愯〃鐨勯『搴廼d
- int OperationType = int.Parse(sArray[3].ToString());//鏁版嵁绫诲瀷 1娣诲姞 3淇敼
- string user = sArray[4].ToString();//鐢ㄦ埛鍚�
+ //int hentryid = int.Parse(sArray[2].ToString());//瀛愯〃鐨勯『搴廼d
+ int OperationType = int.Parse(sArray[2].ToString());//鏁版嵁绫诲瀷 1娣诲姞 3淇敼
+ string user = sArray[3].ToString();//鐢ㄦ埛鍚�
try
{
//鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
@@ -162,7 +162,7 @@
double HStdSourceQty = mainList[0].HStdSourceQty;//鏍囧噯璧勬簮鏁�
double HAddSourceRate = mainList[0].HAddSourceRate;//鍔犺祫婧愬閲�
double HDelSourceRate = mainList[0].HDelSourceRate;//鍑忚祫婧愬噺閲�
- int HPRDORGID = mainList[0].HPRDORGID; //鐢熶骇缁勭粐
+ int HPRDORGID = mainList[0].HOrgID; //鐢熶骇缁勭粐
int HOrgID = mainList[0].HOrgID; //缁勭粐
string HPicNumVer = mainList[0].HPicNumVer;//鍥惧彿鐗堟湰
string HPicNumAssemble = mainList[0].HPicNumAssemble;//鎬昏鍥惧彿
@@ -170,7 +170,9 @@
string HProductNum = mainList[0].HProductNum;//鎴愬搧缂栧彿
string HVerNum = mainList[0].HVerNum;//鐗堟湰
- if (OperationType == 1)//鏂板
+ ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_Gy_RoutingBillList");
+
+ if (OperationType == 1 && ds.Tables[0].Rows.Count == 0)//鏂板
{
//涓昏〃
oCN.RunProc("Insert Into Gy_RoutingBillMain " +
@@ -184,9 +186,9 @@
"," + HRoutingGroupID + "," + HUnitID + ",'" + HMaterNumber + "','" + HUnitNumber + "'," + Convert.ToString(HStandard ? 1 : 0) +
"," + HMainGroupID + "," + HMainProcID + "," + HMainCenterID + ",'" + HMainTimeUnit + "'," + HMainUnitTime + "," + HMainWorkQty +
"," + HMainPrice + "," + HStdSourceQty + "," + HAddSourceRate + "," + HPRDORGID + "," + HDelSourceRate +
- ",'"+ HPicNumVer + "','" + HPicNumAssemble + "','" + HMaterTexture + "','" + HProductNum + "','" + HVerNum + "',"+ HOrgID + ") ");
+ ",'" + HPicNumVer + "','" + HPicNumAssemble + "','" + HMaterTexture + "','" + HProductNum + "','" + HVerNum + "'," + HOrgID + ") ");
}
- else if (OperationType == 3)
+ else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
{ //淇敼
oCN.RunProc("update Gy_RoutingBillMain set " +
"HDate='" + HDate +
@@ -200,10 +202,10 @@
",HProductNum='" + HProductNum + "',HVerNum='" + HVerNum + "' where HInterID='" + HInterID + "'");
//鍒犻櫎瀛愯〃
- oCN.RunProc("delete from Gy_RoutingBillSub where HInterID='" + HInterID + "' and HEntryID='" + hentryid + "'");
+ oCN.RunProc("delete from Gy_RoutingBillSub where HInterID='" + HInterID+ "' and HProcNo!='9999'");
}
//淇濆瓨瀛愯〃
- objJsonResult = AddBillSub(msg3, HInterID, hentryid);
+ objJsonResult = AddBillSub(msg3, HInterID);
if (objJsonResult.code == "0")
{
objJsonResult.code = "0";
@@ -255,7 +257,7 @@
}
}
- public json AddBillSub(string msg3, long HInterID, int hentryid)
+ public json AddBillSub(string msg3, long HInterID)
{
List<Gy_RoutingBillSub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_RoutingBillSub>>(msg3);
int i = 0;
@@ -271,31 +273,34 @@
return objJsonResult;
}
- oCN.RunProc("Insert into Gy_RoutingBillSub " +
- "(HInterID,HEntryID,HProcID,HProcNO,HSupID,HSupFlag" +
- ",HWorkQty,HCenterID,HTimeUnit,HUnitTime" +
- ",HReadyTime,HQueueTime,HMoveTime" +
- ",HCloseMan,HCloseType,HRemark,HProcType,HNextProcFlag,HFlowProc" +
- ",HFixPrice,HProcPrice,HBadPrice,HWasterPrice,HStdFlag,HBeginDayQty,HBeginFixQty" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HAutoTrunFlag" +
- ",HFixWorkDays,HTrunWorkDays,HReadyTimes,HICMOReadyTimes,HSubStdEmpQty,HSubCanUseSourceQty" +
- ",HProcID_S,HCenterID_S,HWorkQty_S,HSubStdEmpQty_S,HMouldNo,HChangeMould" +
- ",HPackStd,HPack,HPutArea,HMyWorkDays,HMyFixWorkDays,HPassRate" +
- ",HTechnologyParameter,HPicNum,HProcCheckNote" +
- ",HOverRate,HProcWorkNum" +
- ") values("
- + HInterID + "," + (hentryid==-1?i: hentryid) + "," + oSub.HProcID.ToString() + ",'" + (hentryid == -1 ? i : hentryid) + "'," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "" +
- "," + oSub.HWorkQty.ToString() + "," + oSub.HCenterID.ToString() + ",'" + oSub.HTimeUnit.ToString() + "'," + oSub.HUnitTime.ToString() +
- "," + oSub.HReadyTime.ToString() + "," + oSub.HQueueTime.ToString() + "," + oSub.HMoveTime.ToString() +
- ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "','" + oSub.HProcType + "'," + Convert.ToString(oSub.HNextProcFlag ? 1 : 0) + "," + Convert.ToString(oSub.HFlowProc ? 1 : 0) +
- "," + oSub.HFixPrice.ToString() + "," + oSub.HProcPrice.ToString() + "," + oSub.HBadPrice.ToString() + "," + oSub.HWasterPrice.ToString() + "," + Convert.ToString(oSub.HStdFlag ? 1 : 0) + "," + oSub.HBeginDayQty.ToString() + "," + oSub.HBeginFixQty.ToString() +
- "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + Convert.ToString(oSub.HAutoTrunFlag ? 1 : 0) +
- "," + oSub.HFixWorkDays.ToString() + "," + oSub.HTrunWorkDays.ToString() + "," + oSub.HReadyTimes.ToString() + "," + oSub.HICMOReadyTimes.ToString() + "," + oSub.HSubStdEmpQty.ToString() + "," + oSub.HSubCanUseSourceQty.ToString() +
- "," + oSub.HProcID_S.ToString() + "," + oSub.HCenterID_S.ToString() + "," + oSub.HWorkQty_S.ToString() + ", " + oSub.HSubStdEmpQty_S.ToString() + ",'" + oSub.HMouldNo + "'," + oSub.HChangeMould.ToString() +
- ",'" + oSub.HPackStd + "','" + oSub.HPack + "','" + oSub.HPutArea + "'," + oSub.HMyWorkDays.ToString() + "," + oSub.HMyFixWorkDays.ToString() + "," + oSub.HPassRate.ToString() +
- ",'" + oSub.HTechnologyParameter.ToString() + "','" + oSub.HPicNum.ToString() + "','" + oSub.HProcCheckNote.ToString() +
- "', " + oSub.HOverRate.ToString() + ",'" + oSub.HProcWorkNum.ToString() + "'" +
- ") ");
+ if (oSub.HProcNo!="9999")
+ {
+ oCN.RunProc("Insert into Gy_RoutingBillSub " +
+ "(HInterID,HEntryID,HProcID,HProcNO,HSupID,HSupFlag" +
+ ",HWorkQty,HCenterID,HTimeUnit,HUnitTime" +
+ ",HReadyTime,HQueueTime,HMoveTime" +
+ ",HCloseMan,HCloseType,HRemark,HProcType,HNextProcFlag,HFlowProc" +
+ ",HFixPrice,HProcPrice,HBadPrice,HWasterPrice,HStdFlag,HBeginDayQty,HBeginFixQty" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HAutoTrunFlag" +
+ ",HFixWorkDays,HTrunWorkDays,HReadyTimes,HICMOReadyTimes,HSubStdEmpQty,HSubCanUseSourceQty" +
+ ",HProcID_S,HCenterID_S,HWorkQty_S,HSubStdEmpQty_S,HMouldNo,HChangeMould" +
+ ",HPackStd,HPack,HPutArea,HMyWorkDays,HMyFixWorkDays,HPassRate" +
+ ",HTechnologyParameter,HPicNum,HProcCheckNote" +
+ ",HOverRate,HProcWorkNum" +
+ ") values("
+ + HInterID + "," + i + "," + oSub.HProcID.ToString() + ",'" + oSub.HProcNo + "'," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "" +
+ "," + oSub.HWorkQty.ToString() + "," + oSub.HCenterID.ToString() + ",'" + oSub.HTimeUnit.ToString() + "'," + oSub.HUnitTime.ToString() +
+ "," + oSub.HReadyTime.ToString() + "," + oSub.HQueueTime.ToString() + "," + oSub.HMoveTime.ToString() +
+ ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "','" + oSub.HProcType + "'," + Convert.ToString(oSub.HNextProcFlag ? 1 : 0) + "," + Convert.ToString(oSub.HFlowProc ? 1 : 0) +
+ "," + oSub.HFixPrice.ToString() + "," + oSub.HProcPrice.ToString() + "," + oSub.HBadPrice.ToString() + "," + oSub.HWasterPrice.ToString() + "," + Convert.ToString(oSub.HStdFlag ? 1 : 0) + "," + oSub.HBeginDayQty.ToString() + "," + oSub.HBeginFixQty.ToString() +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + Convert.ToString(oSub.HAutoTrunFlag ? 1 : 0) +
+ "," + oSub.HFixWorkDays.ToString() + "," + oSub.HTrunWorkDays.ToString() + "," + oSub.HReadyTimes.ToString() + "," + oSub.HICMOReadyTimes.ToString() + "," + oSub.HSubStdEmpQty.ToString() + "," + oSub.HSubCanUseSourceQty.ToString() +
+ "," + oSub.HProcID_S.ToString() + "," + oSub.HCenterID_S.ToString() + "," + oSub.HWorkQty_S.ToString() + ", " + oSub.HSubStdEmpQty_S.ToString() + ",'" + oSub.HMouldNo + "'," + oSub.HChangeMould.ToString() +
+ ",'" + oSub.HPackStd + "','" + oSub.HPack + "','" + oSub.HPutArea + "'," + oSub.HMyWorkDays.ToString() + "," + oSub.HMyFixWorkDays.ToString() + "," + oSub.HPassRate.ToString() +
+ ",'" + oSub.HTechnologyParameter.ToString() + "','" + oSub.HPicNum.ToString() + "','" + oSub.HProcCheckNote.ToString() +
+ "', " + oSub.HOverRate.ToString() + ",'" + oSub.HProcWorkNum.ToString() + "'" +
+ ") ");
+ }
}
objJsonResult.code = "1";
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 89db549..f71a2bc 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -389,7 +389,7 @@
return objJsonResult;
}
- ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where 1 = 1 " + sWhere + " order by HEntryID", "h_v_IF_ICMOBillList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where 1 = 1 " + sWhere + " order by 鍗曟嵁鍙� desc", "h_v_IF_ICMOBillList");
}
catch (Exception e)
{
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs
index aac2550..9c84d7a 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs
@@ -322,7 +322,7 @@
}
if (bResult)
{
- string sql = $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ";
+ string sql =string.Format( $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ");
oCn.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs
index 08f4336..fa75bcd 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs
@@ -323,7 +323,7 @@
}
if (bResult)
{
- string sql = $"exec h_p_Sc_MouldChangeFileStatus 'out','{oBill.omodel.HInterID.ToString()}' ";
+ string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'out','{oBill.omodel.HInterID.ToString()}' ") ;
oCn.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs
index 6dd5bbd..45c636a 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs
@@ -321,7 +321,7 @@
}
if (bResult)
{
- string sql = $"exec h_p_Sc_MouldChangeFileStatus 'out','{oBill.omodel.HInterID.ToString()}' ";
+ string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'out','{oBill.omodel.HInterID.ToString()}' ");
oCn.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
index 4f3054e..a12cc8c 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
@@ -634,7 +634,7 @@
}
if (bResult)
{
- string sql = $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ";
+ string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ");
DataSet db=oCn.RunProcReturn(sql, "h_p_Sc_MouldChangeFileStatus");
if (db.Tables[0].Rows[0]["issuccess"].ToString()=="0")
{
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs
index 60c6fa1..28e2ece 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs
@@ -323,7 +323,7 @@
}
if (bResult)
{
- string sql = $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ";
+ string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ") ;
oCn.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs
index 1e9d0dd..ce400bd 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs
@@ -328,7 +328,7 @@
}
if (bResult)
{
- string sql = $"exec h_p_Sc_MouldChangeFileStatus 'out',{oBill.omodel.HInterID.ToString()} ";
+ string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'out',{oBill.omodel.HInterID.ToString()} ") ;
oCn.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
diff --git a/WebAPI/Controllers/POStockInBillController.cs b/WebAPI/Controllers/POStockInBillController.cs
index e180af3..17ea1cf 100644
--- a/WebAPI/Controllers/POStockInBillController.cs
+++ b/WebAPI/Controllers/POStockInBillController.cs
@@ -15,6 +15,8 @@
using WebAPI;
using WebAPI.Code;
using WebAPI.Models;
+using WebAPI.Utility;
+
namespace WebAPI.Controllers
{
/**
@@ -109,11 +111,11 @@
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = e.Message+";"+e.StackTrace;
+ objJsonResult.Message = e.Message + ";" + e.StackTrace;
objJsonResult.data = null;
return objJsonResult;
}
-
+
}
@@ -766,7 +768,7 @@
lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
string sSourceBillType = lsmain[0].HBillType;
-
+
WebAPI.WebS.ClsSc_ICMOReportBillMain websLsmain = new WebS.ClsSc_ICMOReportBillMain();
websLsmain.HInterID = lsmain[0].HInterID;
@@ -991,18 +993,16 @@
}
- #region 鍒拌揣鐐规暟
- [Route("POStockInBillList/get_InfoByBillNo")]
+ #region 鍒拌揣纭
+ [Route("POStockInBillList/Get_ReciveBill")]
[HttpGet]
public object get_InfoByBillNo(string HBillno)
{
try
{
- string sqlwhere = " where 1=1 ";
- if (!String.IsNullOrEmpty(HBillno))
- sqlwhere += "and 鍗曟嵁鍙�='" + HBillno + "'";
- string sql = $"select * from h_v_Cg_POInStockBillList {sqlwhere} ";
- ds = oCn.RunProcReturn(sql, "h_v_Cg_POInStockBillList");
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ string sql = $"select * from H_v_SRM_POInStockBillList where 鍗曟嵁鍙� ='{HBillno}'";
+ ds = oCn.RunProcReturn(sql, "H_v_SRM_POInStockBillList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -1013,141 +1013,11 @@
}
else
{
- objJsonResult.code = "0";
+ objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
- }
- }
- catch (Exception)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "澶辫触 锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
- }
-
-
- //[Route("POStockInBillList/confirm")]
- //public object confirm(string hmainid)
- //{
- // try
- // {
- // JObject model = new JObject();
- // model.Add("FBILLTYPEID", new JObject() { ["Fnumber"] = "SLD01_SYS" }); //鍗曟嵁绫诲瀷
- // model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //閫氱煡鏃ユ湡
- // model.Add("FStockOrgId", new JObject() { ["Fnumber"] = (this.Model.GetValue("FHPURCHASEORGID") as DynamicObject)?["Number"].ToString() ?? "" }); // 鏀舵枡缁勭粐
- // model.Add("FPurOrgId", new JObject() { ["Fnumber"] = (this.Model.GetValue("FHPURCHASEORGID") as DynamicObject)?["Number"].ToString() ?? "" }); //閲囪喘缁勭粐
- // model.Add("FSupplierId", new JObject() { ["Fnumber"] = (this.Model.GetValue("FSupplierID") as DynamicObject)?["Number"].ToString() ?? "" }); //渚涘簲鍟�
- // model.Add("FOwnerTypeIdHead", "BD_OwnerOrg");// 璐т富绫诲瀷
- // model.Add("FOwnerIdHead", new JObject() { ["Fnumber"] = (this.Model.GetValue("FHPURCHASEORGID") as DynamicObject)?["Number"].ToString() ?? "" });//璐т富
- // //瀛愯〃 鏁版嵁妯″瀷
- // JArray Fentity = new JArray();
- // foreach (var item in entityRows)
- // {
- // if (Convert.ToBoolean(item["FCloseStatus"]))
- // continue;
- // JObject FentityModel = new JObject();
- // FentityModel.Add("FMaterialId", new JObject() { ["Fnumber"] = (item["FHMaterID"] as DynamicObject)?["Number"].ToString() ?? "" }); // 鐗╂枡缂栫爜
- // FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = (item["FUnitID"] as DynamicObject)?["Number"].ToString() ?? "" }); // 鍗曚綅
- // FentityModel.Add("FPreDeliveryDate", this.Model.GetValue("FHDate").ToString()); //棰勮鍒拌揣鏃ユ湡
- // FentityModel.Add("FPriceUnitId", new JObject() { ["Fnumber"] = (item["FUnitID"] as DynamicObject)?["Number"].ToString() ?? "" }); // 璁′环鍗曚綅
- // FentityModel.Add("FStockUnitID", new JObject() { ["Fnumber"] = (item["FUnitID"] as DynamicObject)?["Number"].ToString() ?? "" }); // 搴撳瓨鍗曚綅
- // FentityModel.Add("FActReceiveQty", Convert.ToDecimal(item["FHQty"]) - Convert.ToDecimal(item["FReciveCount"])); // 渚涘簲鍟嗛�佽揣鏁伴噺锛堟彁鏂欒鍒掓暟閲� - 宸茬敓鎴愰�佽揣鍗曟暟閲忥級
- // FentityModel.Add("FOwnerTypeId", "BD_OwnerOrg");//璐т富绫诲瀷
- // FentityModel.Add("FOwnerID", new JObject() { ["Fnumber"] = (this.Model.GetValue("FHPURCHASEORGID") as DynamicObject)?["Number"].ToString() ?? "" });//璐т富
- // FentityModel.Add("FSrcId", item["FHPOOrderInterID"].ToString());//婧愬崟鍐呯爜
- // FentityModel.Add("FSRCFORMID", "PUR_PurchaseOrder");//婧愬崟绫诲瀷
- // FentityModel.Add("FSrcBillNo", item["FHPOOrderBillNo"].ToString());//婧愬崟鍗曞彿
- // FentityModel.Add("FSRCENTRYID", item["FHPOOrderEntryID"].ToString());//婧愬崟鍒嗗綍鍐呯爜
- // FentityModel.Add("FORDERBILLNO", item["FHPOOrderBillNo"].ToString());//婧愬崟鍗曞彿
- // FentityModel.Add("FPOORDERENTRYID", item["FHPOOrderEntryID"].ToString());//婧愬崟鍒嗗綍鍐呯爜
-
-
- // JArray Fentity2 = new JArray();
- // JObject FentityModel2 = new JObject();
- // FentityModel2.Add("FDetailEntity_Link_FRULEID", "a8c6b6e5-a8c0-4fc1-8592-6b76c2136cf9");
- // FentityModel2.Add("FDetailEntity_Link_FSTableName", "t_PUR_POOrderEntry");
- // FentityModel2.Add("FDetailEntity_Link_FSBillId", item["FHPOOrderInterID"].ToString());
- // FentityModel2.Add("FDetailEntity_Link_FSId", item["FHPOOrderEntryID"].ToString());
- // Fentity2.Add(FentityModel2);
- // FentityModel.Add("FDetailEntity_Link", Fentity2);
- // Fentity.Add(FentityModel);
- // }
- // model.Add("FDetailEntity", Fentity); //鏄庣粏淇℃伅
-
- // JObject _FentityModel = new JObject();
- // _FentityModel.Add("FSettleOrgId", new JObject() { ["Fnumber"] = (this.Model.GetValue("FHPURCHASEORGID") as DynamicObject)?["Number"].ToString() ?? "" }); // 缁撶畻缁勭粐
- // _FentityModel.Add("FSettleCurrId", new JObject() { ["Fnumber"] = (this.Model.GetValue("FSettleCurrId") as DynamicObject)?["Number"].ToString() ?? "" }); // 缁撶畻甯佸埆
- // _FentityModel.Add("FPricePoint", 0); // 瀹氫环鏃剁偣
- // model.Add("FinanceEntity ", _FentityModel);//璐㈠姟淇℃伅
- // JObject jsonRoot = new JObject()
- // {
- // ["Creator"] = "",
- // ["NeedUpDateFields"] = new JArray(),
- // ["NeedReturnFields"] = new JArray(),
- // ["IsDeleteEntry"] = "false",
- // ["SubSystemId"] = "",
- // ["IsVerifyBaseDataField"] = "false",
- // //["IsAutoSubmitAndAudit"] = true,//鑷姩璋冪敤鎻愪氦鍜屽鏍稿姛鑳�
- // ["Model"] = model
- // };
- // var result = cloudClient.Save("PUR_ReceiveBill", jsonRoot.ToString());
- // JObject saveObj = JObject.Parse(result);
- // string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
- // }
- // catch (Exception)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "澶辫触 锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
-
- //}
- #endregion
-
- #region [鏀舵枡閫氱煡鍗曞鏍竇
- //鏀舵枡閫氱煡鍗曞鏍� 鎵潯鐮�
- [Route("POStockInBillList/Get_ReciveBillCheckDate")]
- [HttpGet]
- public object Get_ReciveBillCheckDate(string HBarCode)
- {
- try
- {
- SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
- DataSet Ds = oCn.RunProcReturn("exec h_p_KF_PonderationBillMain_Temp_Add_POInStockCheck2 '" + HBarCode + "'", "h_p_KF_PonderationBillMain_Temp_Add_POInStockCheck2");
- if (Ds == null || Ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 0)
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = Ds.Tables[0];
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
- objJsonResult.data = null;
- return objJsonResult;
- }
}
}
catch (Exception e)
@@ -1158,14 +1028,438 @@
objJsonResult.data = null;
return objJsonResult;
}
+ }
+ [Route("POStockInBillList/AuditPOInStockBill")]
+ [HttpGet]
+ public object AuditPOInStockBill(string HInterID, string CurUserName, string HBillNo)
+ {
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ json objjson = new json();
+ try
+ {
+ SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ //閲囪喘璁㈠崟 鐢熸垚閫佽揣鍗曞垪琛�
+ if (!String.IsNullOrEmpty(HBillNo))
+ HInterID = GetHinterIDByBillNo(HBillNo, "Aduit").ToString();
+ if (HInterID == "0")
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鎿嶄綔澶辫触,璇峰厛淇濆瓨璁㈠崟";
+ objjson.data = null;
+ return objjson;
+ }
+ string parameterSql = $"select HValue from Xt_SystemParameter where HKey ='Cg_POInStockBill_ErpAduit'";
+ var HValue = oCn.RunProcReturn(parameterSql, "dt").Tables[0].Rows[0][0].ToString();
+ string sql = string.Empty;
+ if (HValue == "Y")
+ {
+ var kdTbaleName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");
+ string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
+ DataTable dt = new DataTable();
+ List<string> fidList = new List<string>();
+ if (FCusName == "鐟炰笌绁�" || FCusName == "")
+ {
+ sql = string.Format(@"
+SELECT T3.FNAME AS FTYPENAME,M.HBILLNO,B.HINTERID,B.HENTRYID,C.FID,C.FENTRYID, D.FBILLNO,B.HQTY,CD.FRECEIVEORGID,CDOO.FNUMBER AS FRECEIVENUMBER
+,D.FSUPPLIERID,DS.FNUMBER AS FSUPPLIERNUMBER,D.FPURCHASEORGID,DOO.FNUMBER AS FPURCHASEORGNUMBER,CROO.FNUMBER AS FSETTLEORGNUMBER,
+E.FPRICETIMEPOINT,E.FSETTLECURRID,EC.FNUMBER AS FSETTLECURRNUMBER,C.FMATERIALID,CM.FNUMBER AS FMATERIALNUMBER ,C.FUNITID
+,CU.FNUMBER AS FUNITNUMBER,CR.FPRICE,CR.FTAXPRICE,CR.FTAXRATE,D.FPURCHASERID,isnull(T4.FNUMBER,'') AS FPURCHASERNUMBER
+FROM CG_POINSTOCKBILLSUB B
+JOIN CG_POINSTOCKBILLMAIN M ON B.HINTERID = M.HINTERID
+JOIN {0}..T_PUR_POORDERENTRY C ON B.HSOURCEINTERID = C.FID AND B.HSOURCEENTRYID = C.FENTRYID
+LEFT JOIN {0}..T_BD_MATERIAL CM ON C.FMATERIALID =CM.FMATERIALID
+LEFT JOIN {0}..T_BD_UNIT CU ON C.FUNITID =CU.FUNITID
+JOIN {0}..T_PUR_POORDERENTRY_D CD ON C.FENTRYID = CD.FENTRYID
+LEFT JOIN {0}..T_ORG_ORGANIZATIONS CDOO ON CD.FRECEIVEORGID = CDOO.FORGID
+JOIN {0}..T_PUR_POORDERENTRY_F CR ON C.FENTRYID = CR.FENTRYID
+LEFT JOIN {0}..T_ORG_ORGANIZATIONS CROO ON CR.FSETTLEORGID = CROO.FORGID
+LEFT JOIN {0}..T_PUR_POORDER D ON C.FID =D.FID
+LEFT JOIN {0}..T_BAS_BILLTYPE T2 ON D.FBILLTYPEID = T2.FBILLTYPEID
+LEFT JOIN {0}..T_BAS_BILLTYPE_L T3 ON T2.FBILLTYPEID = T3.FBILLTYPEID and FLOCALEID=2052
+LEFT JOIN {0}..V_BD_BUYER T4 ON D.FPURCHASERID =T4.FID
+LEFT JOIN {0}..T_BD_SUPPLIER DS ON D.FSUPPLIERID = DS.FSUPPLIERID
+LEFT JOIN {0}..T_ORG_ORGANIZATIONS DOO ON D.FPURCHASEORGID = DOO.FORGID
+JOIN {0}..T_PUR_POORDERFIN E ON C.FID =E.FID
+LEFT JOIN {0}..T_BD_CURRENCY EC ON E. FSETTLECURRID =EC.FCURRENCYID
+ WHERE b.hinterid in ({1}) and M.HERPInterID = 0
+", kdTbaleName, HInterID);
+ //LEFT JOIN {0}..T_HR_EMPINFO T5 ON D.F_XBKF_BASE1 = T5.FID
+ dt = oCn.RunProcReturn(sql, "sltz").Tables[0];
+ if (dt.Rows.Count > 0)
+ {
+ foreach (DataRow dr in dt.Rows)
+ {
+ if (fidList.Contains(dr["FID"].ToString() + dr["HINTERID"].ToString()))
+ continue;
+ else
+ fidList.Add(dr["FID"].ToString() + dr["HINTERID"].ToString());
+ DataRow[] drs = dt.Select("FID = " + dr["FID"].ToString() + " and HINTERID = " + dr["HINTERID"].ToString());
+
+ JObject model = new JObject();
+ string fTypeName = "SLD01_SYS";//鏍囧噯閲囪喘璁㈠崟绫诲瀷
+ string ywTypeName = "CG";//鏍囧噯涓氬姟绫诲瀷
+ if (dr["FTYPENAME"].ToString().Contains("濮斿"))
+ {
+ fTypeName = "SLD03_SYS";
+ ywTypeName = "WW";
+ }
+ if (dr["FTYPENAME"].ToString().Contains("璧勪骇"))
+ {
+ fTypeName = "SLD04_SYS";
+ ywTypeName = "ZCCG";
+ }
+ model.Add("FBILLTYPEID", new JObject() { ["Fnumber"] = fTypeName }); //鍗曟嵁绫诲瀷
+ model.Add("FBusinessType", ywTypeName); //涓氬姟绫诲瀷
+ model.Add("FBILLNO", dr["HBillNo"].ToString()); //鍗曟嵁缂栧彿
+ model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //閫氱煡鏃ユ湡
+ model.Add("FStockOrgId", new JObject() { ["Fnumber"] = dr["FRECEIVENUMBER"].ToString() }); // 鏀舵枡缁勭粐
+ model.Add("FPurOrgId", new JObject() { ["Fnumber"] = dr["FPURCHASEORGNUMBER"].ToString() }); //閲囪喘缁勭粐
+ model.Add("FSupplierId", new JObject() { ["Fnumber"] = dr["FSUPPLIERNUMBER"].ToString() }); //渚涘簲鍟�
+ model.Add("FPURCHASERID", new JObject() { ["Fnumber"] = dr["FPURCHASERNUMBER"].ToString() }); //閲囪喘鍛�
+ model.Add("FOwnerTypeIdHead", "BD_Supplier");// 璐т富绫诲瀷
+ model.Add("FOwnerIdHead", new JObject() { ["Fnumber"] = dr["FSUPPLIERNUMBER"].ToString() });//璐т富 渚涘簲鍟�
+ JArray Fentity = new JArray();
+ foreach (var item in drs)
+ {
+ JObject FentityModel = new JObject();
+ FentityModel.Add("FMaterialId", new JObject() { ["Fnumber"] = item["FMATERIALNUMBER"].ToString() }); // 鐗╂枡缂栫爜
+ FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // 鍗曚綅
+ FentityModel.Add("FPreDeliveryDate", DateTime.Now.ToString("yyyy-MM-dd")); //棰勮鍒拌揣鏃ユ湡
+ FentityModel.Add("FPriceUnitId", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // 璁′环鍗曚綅
+ FentityModel.Add("FStockUnitID", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // 搴撳瓨鍗曚綅
+ FentityModel.Add("FActReceiveQty", Convert.ToDecimal(item["HQTY"])); // 渚涘簲鍟嗛�佽揣鏁伴噺锛堟彁鏂欒鍒掓暟閲� - 宸茬敓鎴愰�佽揣鍗曟暟閲忥級
+ FentityModel.Add("FOwnerTypeId", "BD_OwnerOrg");//璐т富绫诲瀷
+ FentityModel.Add("FOwnerID", new JObject() { ["Fnumber"] = dr["FPURCHASEORGNUMBER"].ToString() });//璐т富
+ FentityModel.Add("FSrcId", item["FID"].ToString());//婧愬崟鍐呯爜
+ FentityModel.Add("FSRCFORMID", "PUR_PurchaseOrder");//婧愬崟绫诲瀷
+ FentityModel.Add("FSrcBillNo", item["FBILLNO"].ToString());//婧愬崟鍗曞彿
+ FentityModel.Add("FSRCENTRYID", item["FENTRYID"].ToString());//婧愬崟鍒嗗綍鍐呯爜
+ FentityModel.Add("FORDERBILLNO", item["FBILLNO"].ToString());//婧愬崟鍗曞彿
+ FentityModel.Add("FPOORDERENTRYID", item["FENTRYID"].ToString());//婧愬崟鍒嗗綍鍐呯爜
+ FentityModel.Add("FSRMENTRYID", item["HENTRYID"].ToString());//SRM hentryid
+ FentityModel.Add("FPrice", item["FPRICE"].ToString());//鍗曚环
+ FentityModel.Add("FTaxPrice", item["FTAXPRICE"].ToString());//鍚◣鍗曚环
+ FentityModel.Add("FEntryTaxRate", item["FTAXRATE"].ToString());//绋庣巼
+
+ JArray Fentity2 = new JArray();
+ JObject FentityModel2 = new JObject();
+ FentityModel2.Add("FDetailEntity_Link_FRULEID", "PUR_PurchaseOrder-PUR_ReceiveBill");
+ FentityModel2.Add("FDetailEntity_Link_FSTableName", "t_PUR_POOrderEntry");
+ FentityModel2.Add("FDetailEntity_Link_FSBillId", item["FID"].ToString());
+ FentityModel2.Add("FDetailEntity_Link_FSId", item["FEntryID"].ToString());
+ Fentity2.Add(FentityModel2);
+ FentityModel.Add("FDetailEntity_Link", Fentity2);
+ Fentity.Add(FentityModel);
+ }
+ model.Add("FDetailEntity", Fentity); //鏄庣粏淇℃伅
+
+ JObject _FentityModel = new JObject();
+ _FentityModel.Add("FSettleOrgId", new JObject() { ["Fnumber"] = dr["FSETTLEORGNUMBER"].ToString() }); // 缁撶畻缁勭粐
+ _FentityModel.Add("FSettleCurrId", new JObject() { ["Fnumber"] = dr["FSETTLECURRNUMBER"].ToString() }); // 缁撶畻甯佸埆
+ _FentityModel.Add("FPricePoint", 0); // 瀹氫环鏃剁偣
+ model.Add("FinanceEntity ", _FentityModel);//璐㈠姟淇℃伅
+ JObject jsonRoot = new JObject()
+ {
+ ["Creator"] = "",
+ ["NeedUpDateFields"] = new JArray(),
+ ["NeedReturnFields"] = new JArray(),
+ ["IsDeleteEntry"] = "false",
+ ["SubSystemId"] = "",
+ ["IsVerifyBaseDataField"] = "false",
+ ["Model"] = model
+ };
+ var loginRet = InvokeHelper.Login();
+ var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+ if (isSuccess <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = loginRet;
+ objjson.data = null;
+ return objjson;
+ }
+ //LogService.Write("jsonRoot:" + jsonRoot.ToString());
+ var result = InvokeHelper.Save("PUR_ReceiveBill", jsonRoot.ToString());
+ //LogService.Write(result);
+ if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() == "TRUE")
+ {
+ //鏇存柊閫佽揣鍗� 涓昏〃 ERP鍗曟嵁鍙� 浠ュ強 ERP涓诲唴鐜�
+ string FBillNo = JObject.Parse(result)["Result"]["Number"].ToString();
+ string FID = JObject.Parse(result)["Result"]["Id"].ToString();
+
+ string updateSql = string.Format(@"
+ update a set
+ a.HERPInterID = {0} ,
+ a.HERPBillNO ='{1}'
+ from Cg_POInStockBillMain a
+ join Cg_POInStockBillSub b on a.hinterid = b.hinterid
+ where b.HInterID = ({2})
+ and b. HSOURCEINTERID = {3}
+ and a.HERPInterID = 0
+ ", FID, FBillNo, dr["HINTERID"].ToString(), dr["FID"].ToString());
+ oCn.RunProc(updateSql);
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = result;
+ objjson.data = null;
+ return objjson;
+ }
+ }
+ }
+ }
+ else if (FCusName == "澶忓疂鐢靛櫒")
+ {
+ sql = string.Format(@"
+SELECT T3.FNAME AS FTYPENAME,M.HBILLNO,B.HINTERID,B.HENTRYID,C.FID,C.FENTRYID, D.FBILLNO,B.HQTY,CD.FRECEIVEORGID,CDOO.FNUMBER AS FRECEIVENUMBER
+,D.FSUPPLIERID,DS.FNUMBER AS FSUPPLIERNUMBER,D.FPURCHASEORGID,DOO.FNUMBER AS FPURCHASEORGNUMBER,CROO.FNUMBER AS FSETTLEORGNUMBER,
+E.FPRICETIMEPOINT,E.FSETTLECURRID,EC.FNUMBER AS FSETTLECURRNUMBER,C.FMATERIALID,CM.FNUMBER AS FMATERIALNUMBER ,C.FUNITID
+,CU.FNUMBER AS FUNITNUMBER,D.F_XBKF_COMBO1,CR.FPRICE,CR.FTAXPRICE,CR.FTAXRATE,D.FPURCHASERID,isnull(T4.FNUMBER,'') AS FPURCHASERNUMBER,D.F_XBKF_BASE1,isnull(T5.FNUMBER,'') AS FRECEIVEMENNUMBER
+FROM CG_POINSTOCKBILLSUB B
+JOIN CG_POINSTOCKBILLMAIN M ON B.HINTERID = M.HINTERID
+JOIN {0}..T_PUR_POORDERENTRY C ON B.HSOURCEINTERID = C.FID AND B.HSOURCEENTRYID = C.FENTRYID
+LEFT JOIN {0}..T_BD_MATERIAL CM ON C.FMATERIALID =CM.FMATERIALID
+LEFT JOIN {0}..T_BD_UNIT CU ON C.FUNITID =CU.FUNITID
+JOIN {0}..T_PUR_POORDERENTRY_D CD ON C.FENTRYID = CD.FENTRYID
+LEFT JOIN {0}..T_ORG_ORGANIZATIONS CDOO ON CD.FRECEIVEORGID = CDOO.FORGID
+JOIN {0}..T_PUR_POORDERENTRY_F CR ON C.FENTRYID = CR.FENTRYID
+LEFT JOIN {0}..T_ORG_ORGANIZATIONS CROO ON CR.FSETTLEORGID = CROO.FORGID
+LEFT JOIN {0}..T_PUR_POORDER D ON C.FID =D.FID
+LEFT JOIN {0}..T_BAS_BILLTYPE T2 ON D.FBILLTYPEID = T2.FBILLTYPEID
+LEFT JOIN {0}..T_BAS_BILLTYPE_L T3 ON T2.FBILLTYPEID = T3.FBILLTYPEID and FLOCALEID=2052
+LEFT JOIN {0}..V_BD_BUYER T4 ON D.FPURCHASERID =T4.FID
+LEFT JOIN {0}..T_HR_EMPINFO T5 ON D.F_XBKF_BASE1 = T5.FID
+LEFT JOIN {0}..T_BD_SUPPLIER DS ON D.FSUPPLIERID = DS.FSUPPLIERID
+LEFT JOIN {0}..T_ORG_ORGANIZATIONS DOO ON D.FPURCHASEORGID = DOO.FORGID
+JOIN {0}..T_PUR_POORDERFIN E ON C.FID =E.FID
+LEFT JOIN {0}..T_BD_CURRENCY EC ON E. FSETTLECURRID =EC.FCURRENCYID
+ WHERE b.hinterid in ({1}) and M.HERPInterID = 0
+", kdTbaleName, HInterID);
+ dt = oCn.RunProcReturn(sql, "sltz").Tables[0];
+ if (dt.Rows.Count > 0)
+ {
+ foreach (DataRow dr in dt.Rows)
+ {
+ if (fidList.Contains(dr["FID"].ToString() + dr["HINTERID"].ToString()))
+ continue;
+ else
+ fidList.Add(dr["FID"].ToString() + dr["HINTERID"].ToString());
+
+ DataRow[] drs = dt.Select("FID = " + dr["FID"].ToString() + " and HINTERID = " + dr["HINTERID"].ToString());
+
+ JObject model = new JObject();
+ string fTypeName = "SLD01_SYS";//鏍囧噯閲囪喘璁㈠崟绫诲瀷
+ string ywTypeName = "CG";//鏍囧噯涓氬姟绫诲瀷
+ if (dr["FTYPENAME"].ToString().Contains("濮斿"))
+ {
+ fTypeName = "SLD03_SYS";
+ ywTypeName = "WW";
+ }
+ if (dr["FTYPENAME"].ToString().Contains("璧勪骇"))
+ {
+ fTypeName = "SLD04_SYS";
+ ywTypeName = "ZCCG";
+ }
+ model.Add("FBILLTYPEID", new JObject() { ["Fnumber"] = fTypeName }); //鍗曟嵁绫诲瀷
+ model.Add("FBusinessType", ywTypeName); //涓氬姟绫诲瀷
+ model.Add("FBILLNO", dr["HBillNo"].ToString()); //鍗曟嵁缂栧彿
+ model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //閫氱煡鏃ユ湡
+ model.Add("FStockOrgId", new JObject() { ["Fnumber"] = dr["FRECEIVENUMBER"].ToString() }); // 鏀舵枡缁勭粐
+ model.Add("FPurOrgId", new JObject() { ["Fnumber"] = dr["FPURCHASEORGNUMBER"].ToString() }); //閲囪喘缁勭粐
+ model.Add("FSupplierId", new JObject() { ["Fnumber"] = dr["FSUPPLIERNUMBER"].ToString() }); //渚涘簲鍟�
+ model.Add("FPURCHASERID", new JObject() { ["Fnumber"] = dr["FPURCHASERNUMBER"].ToString() }); //閲囪喘鍛�
+ model.Add("F_xbkf_Base", new JObject() { ["Fnumber"] = dr["FRECEIVEMENNUMBER"].ToString() }); //鏀舵枡鍛�
+ model.Add("FOwnerTypeIdHead", "BD_Supplier");// 璐т富绫诲瀷
+ model.Add("FOwnerIdHead", new JObject() { ["Fnumber"] = dr["FSUPPLIERNUMBER"].ToString() });//璐т富 渚涘簲鍟�
+ model.Add("F_XBKF_COMBO", dr["F_xbkf_Combo1"].ToString());//鏄惁鏈夌エ
+ JArray Fentity = new JArray();
+ foreach (var item in drs)
+ {
+ JObject FentityModel = new JObject();
+ FentityModel.Add("FMaterialId", new JObject() { ["Fnumber"] = item["FMATERIALNUMBER"].ToString() }); // 鐗╂枡缂栫爜
+ FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // 鍗曚綅
+ FentityModel.Add("FPreDeliveryDate", DateTime.Now.ToString("yyyy-MM-dd")); //棰勮鍒拌揣鏃ユ湡
+ FentityModel.Add("FPriceUnitId", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // 璁′环鍗曚綅
+ FentityModel.Add("FStockUnitID", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // 搴撳瓨鍗曚綅
+ FentityModel.Add("FActReceiveQty", Convert.ToDecimal(item["HQTY"])); // 渚涘簲鍟嗛�佽揣鏁伴噺锛堟彁鏂欒鍒掓暟閲� - 宸茬敓鎴愰�佽揣鍗曟暟閲忥級
+ FentityModel.Add("FOwnerTypeId", "BD_OwnerOrg");//璐т富绫诲瀷
+ FentityModel.Add("FOwnerID", new JObject() { ["Fnumber"] = dr["FPURCHASEORGNUMBER"].ToString() });//璐т富
+ FentityModel.Add("FSrcId", item["FID"].ToString());//婧愬崟鍐呯爜
+ FentityModel.Add("FSRCFORMID", "PUR_PurchaseOrder");//婧愬崟绫诲瀷
+ FentityModel.Add("FSrcBillNo", item["FBILLNO"].ToString());//婧愬崟鍗曞彿
+ FentityModel.Add("FSRCENTRYID", item["FENTRYID"].ToString());//婧愬崟鍒嗗綍鍐呯爜
+ FentityModel.Add("FORDERBILLNO", item["FBILLNO"].ToString());//婧愬崟鍗曞彿
+ FentityModel.Add("FPOORDERENTRYID", item["FENTRYID"].ToString());//婧愬崟鍒嗗綍鍐呯爜
+ FentityModel.Add("FSRMENTRYID", item["HENTRYID"].ToString());//SRM hentryid
+ FentityModel.Add("FPrice", item["FPRICE"].ToString());//鍗曚环
+ FentityModel.Add("FTaxPrice", item["FTAXPRICE"].ToString());//鍚◣鍗曚环
+ FentityModel.Add("FEntryTaxRate", item["FTAXRATE"].ToString());//绋庣巼
+
+ JArray Fentity2 = new JArray();
+ JObject FentityModel2 = new JObject();
+ FentityModel2.Add("FDetailEntity_Link_FRULEID", "PUR_PurchaseOrder-PUR_ReceiveBill");
+ FentityModel2.Add("FDetailEntity_Link_FSTableName", "t_PUR_POOrderEntry");
+ FentityModel2.Add("FDetailEntity_Link_FSBillId", item["FID"].ToString());
+ FentityModel2.Add("FDetailEntity_Link_FSId", item["FEntryID"].ToString());
+ Fentity2.Add(FentityModel2);
+ FentityModel.Add("FDetailEntity_Link", Fentity2);
+ Fentity.Add(FentityModel);
+ }
+ model.Add("FDetailEntity", Fentity); //鏄庣粏淇℃伅
+
+ JObject _FentityModel = new JObject();
+ _FentityModel.Add("FSettleOrgId", new JObject() { ["Fnumber"] = dr["FSETTLEORGNUMBER"].ToString() }); // 缁撶畻缁勭粐
+ _FentityModel.Add("FSettleCurrId", new JObject() { ["Fnumber"] = dr["FSETTLECURRNUMBER"].ToString() }); // 缁撶畻甯佸埆
+ _FentityModel.Add("FPricePoint", 0); // 瀹氫环鏃剁偣
+ model.Add("FinanceEntity ", _FentityModel);//璐㈠姟淇℃伅
+ JObject jsonRoot = new JObject()
+ {
+ ["Creator"] = "",
+ ["NeedUpDateFields"] = new JArray(),
+ ["NeedReturnFields"] = new JArray(),
+ ["IsDeleteEntry"] = "false",
+ ["SubSystemId"] = "",
+ ["IsVerifyBaseDataField"] = "false",
+ ["Model"] = model
+ };
+ var loginRet = InvokeHelper.Login();
+ var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+ if (isSuccess == 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = loginRet;
+ objjson.data = null;
+ return objjson;
+ }
+ LogService.Write("jsonRoot:" + jsonRoot.ToString());
+ var result = InvokeHelper.Save("PUR_ReceiveBill", jsonRoot.ToString());
+ //LogService.Write(result);
+ if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() == "TRUE")
+ {
+ //鏇存柊閫佽揣鍗� 涓昏〃 ERP鍗曟嵁鍙� 浠ュ強 ERP涓诲唴鐜�
+ string FBillNo = JObject.Parse(result)["Result"]["Number"].ToString();
+ string FID = JObject.Parse(result)["Result"]["Id"].ToString();
+
+ string updateSql = string.Format(@"
+ update a set
+ a.HERPInterID = {0} ,
+ a.HERPBillNO ='{1}'
+ from Cg_POInStockBillMain a
+ join Cg_POInStockBillSub b on a.hinterid = b.hinterid
+ where b.HInterID = ({2})
+ and b. HSOURCEINTERID = {3}
+ and a.HERPInterID = 0
+ ", FID, FBillNo, dr["HINTERID"].ToString(), dr["FID"].ToString());
+ oCn.RunProc(updateSql);
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = result;
+ objjson.data = null;
+ return objjson;
+ }
+ }
+ }
+ }
+ }
+ var check = Exec_ReciveBillCheck(HBillNo);
+ if (check.code == "0")
+ return check;
+ //if(check)
+ //鏇存柊涓昏〃鐘舵�� 瀹℃牳
+ sql = string.Format(@"update Cg_POInStockBillMain set
+HBillStatus = 2 ,
+HChecker ='{0}',
+HCheckDate = getdate()
+where HInterID in ({1})", CurUserName, HInterID);
+ oCn.RunProc(sql);
+ objjson.code = "1";
+ objjson.count = 1;
+ objjson.Message = "鎿嶄綔鎴愬姛";
+ objjson.data = null;
+ return objjson;
+ }
+ catch (Exception ex)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鎿嶄綔澶辫触" + ex.Message.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+ public int GetHinterIDByBillNo(string HBillNo, string type)
+ {
+ SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ int HInterID = 0;
+ string sql = "select HInterID from CG_POINSTOCKBILLMAIN where HBILLNO = '" + HBillNo + "'";
+ if (type == "Print")
+ sql += " and HBillStatus = '2' ";//鎵撳嵃鍒ゆ柇鏄惁瀹℃牳
+ DataTable dt = oCn.RunProcReturn(sql, "HInterID").Tables[0];
+ if (dt.Rows.Count > 0)
+ HInterID = Convert.ToInt32(dt.Rows[0]["HInterID"]);
+ return HInterID;
+ }
+
+ public json Get_ReciveBillCheckDate(string HBarCode)
+ {
+ json objjson = new json();
+ try
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ DataSet Ds = oCn.RunProcReturn("exec h_p_KF_PonderationBillMain_Temp_Add_POInStockCheck2 '" + HBarCode + "'", "h_p_KF_PonderationBillMain_Temp_Add_POInStockCheck2");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 0)
+ {
+ objjson.code = "1";
+ objjson.count = 1;
+ objjson.Message = "Sucess锛�";
+ objjson.data = Ds.Tables[0];
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
+ objjson.data = null;
+ return objjson;
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objjson.data = null;
+ return objjson;
+
+ }
}
//鏀舵枡閫氱煡鍗曞鏍� 瀹℃牳鎻愪氦
[Route("POStockInBillList/Exec_ReciveBillCheck")]
[HttpGet]
- public object Exec_ReciveBillCheck(string HBarCode)
+ public json Exec_ReciveBillCheck(string HBarCode)
{
+ json objjson = new json();
try
{
//淇敼閲戣澏鐢熶骇鍗曠殑鐘舵��
@@ -1175,11 +1469,11 @@
if (isSuccess == 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鎿嶄綔澶辫触,閲戣澏璐﹀彿鐧诲綍寮傚父銆�" + loginRet;
- objJsonResult.data = null;
- return objJsonResult;
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鎿嶄綔澶辫触,閲戣澏璐﹀彿鐧诲綍寮傚父銆�" + loginRet;
+ objjson.data = null;
+ return objjson;
}
var json = new
{
@@ -1190,9 +1484,9 @@
};
string result1 = string.Empty;
string result2 = string.Empty;
- DataSet Ds = oCn.RunProcReturn("select FDOCUMENTSTATUS,FID from AIS20210811135644..T_PUR_RECEIVE where FBILLNO='" + HBarCode+"'", "AIS20210811135644..T_PUR_RECEIVE");
+ DataSet Ds = oCn.RunProcReturn("select FDOCUMENTSTATUS,FID from AIS20210811135644..T_PUR_RECEIVE where FBILLNO='" + HBarCode + "'", "AIS20210811135644..T_PUR_RECEIVE");
//鍒ゆ柇褰撳墠鏀舵枡閫氱煡鍗曠姸鎬佲�斺�斿凡鍒涘缓鍒欏厛鎻愪氦鍐嶅鏍搞�佷互鎻愪氦鍒欏彧瀹℃牳
- if (Ds.Tables[0].Rows[0][0].ToString() == "A"|| Ds.Tables[0].Rows[0][0].ToString() == "D")
+ if (Ds.Tables[0].Rows[0][0].ToString() == "A" || Ds.Tables[0].Rows[0][0].ToString() == "D")
{
result1 = InvokeHelper.Submit("PUR_ReceiveBill", JsonConvert.SerializeObject(json));
result2 = InvokeHelper.Audit("PUR_ReceiveBill", JsonConvert.SerializeObject(json));
@@ -1204,25 +1498,25 @@
//鍒ゆ柇瀹℃牳鏄惁鎴愬姛
if (JObject.Parse(result2)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "瀹℃牳鏀舵枡閫氱煡鍗曞け璐ワ紒鍗曟嵁鍙凤細" + HBarCode;
- objJsonResult.data = null;
- return objJsonResult;
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "瀹℃牳鏀舵枡閫氱煡鍗曞け璐ワ紒鍗曟嵁鍙凤細" + HBarCode;
+ objjson.data = null;
+ return objjson;
}
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "瀹℃牳鎴愬姛锛�";
objJsonResult.data = 1;
- return objJsonResult;
+ return objjson;
}
catch (Exception e)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objjson.data = null;
+ return objjson;
}
}
@@ -1232,15 +1526,15 @@
//PDA閿�鍞嚭搴撴暣鎵樺垹闄�
[Route("POStockInBillList/SellOutBillSDeleCode")]
[HttpGet]
- public object SellOutBillSDeleCode(string HBarCode,string HInterID)
+ public object SellOutBillSDeleCode(string HBarCode, string HInterID)
{
try
{
//鏍规嵁鏉＄爜鍦ㄦ潯鐮佹。妗堜腑鎵惧埌瀵瑰簲鐨勬墭鏉＄爜锛屽啀鍦ㄤ复鏃惰〃涓垹闄よ鎵樻潯鐮佺殑鍏ㄩ儴璁板綍
string sql = string.Format(@"delete from KF_PonderationBillMain_Temp where HBillType=1205 and HInterID=" + HInterID + " and HBarCode" +
- " in (select HBarCode from Gy_BarCodeBill where HBarCode_Pack = (select HBarCode_Pack from Gy_BarCodeBill where HBarCode = '"+ HBarCode + "'))");
+ " in (select HBarCode from Gy_BarCodeBill where HBarCode_Pack = (select HBarCode_Pack from Gy_BarCodeBill where HBarCode = '" + HBarCode + "'))");
oCn.RunProc(sql);
-
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鏁存墭鍒犻櫎鎴愬姛锛�";
diff --git a/WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs b/WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs
index 5212abd..52f2db6 100644
--- a/WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs
+++ b/WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs
@@ -131,7 +131,7 @@
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
- string msg4 = sArray[2].ToString();
+ string msg4 = sArray[1].ToString();
if (!DBUtility.ClsPub.Security_Log("Gy_EquipType_Edit", 1, false, msg4))
{
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_CompleteController..cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_CompleteController..cs"
index fc8ad92..f3e8764 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_CompleteController..cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_CompleteController..cs"
@@ -1,4 +1,5 @@
锘縰sing DBUtility;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -115,5 +116,47 @@
}
}
#endregion
+
+ #region 榻愬鍒嗘瀽鎶ヨ〃
+ public class ReportMOMaterReadysBill
+ {
+ public int? HORGID;//缁勭粐
+ public int? HMATERIALID;//鐗╂枡
+ public int? HDeptID;//鐢熶骇杞﹂棿
+ public int? HSCZYID;//鐢熶骇璧勬簮
+ public string HXQD;//闇�姹傚崟鍙�
+ public string HMOBILLNO;//鐢熶骇璁㈠崟鍙�
+ }
+ /// <summary>
+ ///
+ /// </summary>
+ /// <returns></returns>
+ [Route("JIT_Complete/ReportMOMaterReadysBillList")]
+ [HttpGet]
+ public object ReportMOMaterReadysBillList(string sWhere)
+ {
+ try
+ {
+
+ ReportMOMaterReadysBill Report = JsonConvert.DeserializeObject<ReportMOMaterReadysBill>(sWhere);
+
+ ds = oCN.RunProcReturn($"exec PR_Complete_Report '{Report.HXQD}','{Report.HMOBILLNO}',{Report.HORGID},{Report.HDeptID},{Report.HSCZYID},{Report.HMATERIALID}", "PR_Complete_Report");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
index b8be0ad..625ae2d 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
@@ -265,6 +265,9 @@
return objJsonResult;
}
+ //鍚屾鏃ヨ鍒掑伐鍗�
+ oCN.RunProc("exec REALESE_SC_ICMOBILLSTATUS_TMP");
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = null;
@@ -323,7 +326,10 @@
#region 娓呭崟閰嶆枡鏂瑰紡
public class PRD_PPBOM
{
-
+ /// <summary>
+ /// 鏃ヨ鍒掑伐鍗曞彿
+ /// </summary>
+ public string HMainICMOBillNo { get; set; }
/// <summary>
/// 鏃ヨ鍒掑伐鍗旻ID
/// </summary>
@@ -537,6 +543,10 @@
/// 涓荤敓浜ц鍗曞瓙鍐呯爜锛欶HMainICMOEntryID
/// </summary>
public string FHMainICMOEntryID { get; set; }
+ /// <summary>
+ /// 鏃ヨ鍒掕鍗曞崟鍙凤細HMainICMOBillNo
+ /// </summary>
+ public string HMainICMOBillNo { get; set; }
/// <summary>
/// 鏃ヨ鍒掕鍗曚富鍐呯爜锛欶HICMOInterID
/// </summary>
@@ -800,6 +810,7 @@
FHStockOrgID = _item.FStockOrgId,
FHPRDORGID = _item.FStockOrgId,
FPRDBillNo = _item.HICMOBillNo,
+ HMainICMOBillNo = _item.HMainICMOBillNo,
FOwnerTypeId = "",
FUnitDosage = _item.dwyl,//鍗曚綅鐢ㄩ噺
FSumPlanCount = planNeed,//璁″垝鎬绘暟閲�
@@ -843,6 +854,7 @@
FHStockOrgID = _item.FStockOrgId,
FHPRDORGID = _item.FStockOrgId,
FPRDBillNo = _item.HICMOBillNo,
+ HMainICMOBillNo = _item.HMainICMOBillNo,
FOwnerTypeId = "",
FUnitDosage = _item.dwyl,//鍗曚綅鐢ㄩ噺
FSumPlanCount = planNeed,//璁″垝鎬绘暟閲�
@@ -894,6 +906,7 @@
FHPRDORGID = _item.FStockOrgId,
FErpClsID = _item.FErpClsID,
FPRDBillNo = _item.HICMOBillNo,
+ HMainICMOBillNo = _item.HMainICMOBillNo,
FOwnerTypeId = Inventory.FOwnerTypeId,
FOwnerId = Inventory.FOwnerId,
FUnitDosage = _item.dwyl,//鍗曚綅鐢ㄩ噺
@@ -937,6 +950,7 @@
FHStockOrgID = _item.FStockOrgId,
FHPRDORGID = _item.FStockOrgId,
FPRDBillNo = _item.HICMOBillNo,
+ HMainICMOBillNo = _item.HMainICMOBillNo,
FOwnerTypeId = "",
FUnitDosage = _item.dwyl,//鍗曚綅鐢ㄩ噺
FSumPlanCount = planNeed,//璁″垝鎬绘暟閲�
@@ -973,6 +987,7 @@
insertDT.Columns.Add("FUNITDOSAGE", typeof(decimal));
insertDT.Columns.Add("FSUMPLANCOUNT", typeof(decimal));
insertDT.Columns.Add("FPRDBILLNO", typeof(string));
+ insertDT.Columns.Add("HMainICMOBillNo", typeof(string));
insertDT.Columns.Add("FOWNERID", typeof(long));
insertDT.Columns.Add("FOWNERTYPEID", typeof(string));
insertDT.Columns.Add("FPLANDATE", typeof(DateTime));
@@ -1004,6 +1019,7 @@
dr["FUNITDOSAGE"] = item.FUnitDosage;
dr["FSUMPLANCOUNT"] = item.FSumPlanCount;
dr["FPRDBILLNO"] = item.FPRDBillNo;
+ dr["HMainICMOBillNo"] = item.HMainICMOBillNo;
dr["FOWNERID"] = item.FOwnerId == null ? "0" : item.FOwnerId;
dr["FOWNERTYPEID"] = item.FOwnerTypeId;
dr["FPLANDATE"] = item.FPlanDate.ToString("yyyy-MM-dd");
@@ -1030,12 +1046,12 @@
", HICMOEntryID, HMaterID, HStockORGID, HStockQty, HLeftQty" +
", HProdORGID, HUnitDosage, HSumPlanQty, HICMOBillNo, HOwnerID" +
", HOwnerTypeID, HPlanDate, HComplete, HLackQty, HOccupyQty" +
- ", HCompleteQty1, HErpClsID, HWorkShopID, HWHID, HOccupyPickedQTY)values" +
+ ", HCompleteQty1, HErpClsID, HWorkShopID, HWHID, HOccupyPickedQTY,HMainICMOBillNo)values" +
$"({item["FID"].ToString()}, 1, {item["FHMAINICMOINTERIDR"].ToString()}, {item["FHMAINICMOENTRYID"].ToString()}, {item["FHICMOINTERID"].ToString()}" +
$", {item["FHICMOENTRYID"].ToString()}, {item["FHMATERID"].ToString()}, {item["FHSTOCKORGID"].ToString()}, {item["FHSTOCKQTY"].ToString()}, {item["FHLEFTQTY"].ToString()}" +
$" , {item["FHPRDORGID"].ToString()}, {item["FUNITDOSAGE"].ToString()}, {item["FSUMPLANCOUNT"].ToString()}, '{item["FPRDBILLNO"].ToString()}', {item["FOWNERID"].ToString()}" +
$", '{item["FOWNERTYPEID"].ToString()}', '{item["FPLANDATE"].ToString()}','{item["FCOMPLETE"].ToString()}', {item["FLACKCOUNT"].ToString()}, {item["FOCCUPYCOUNT"].ToString()}" +
- $", {item["FCOMPLETECOUNT1"].ToString()}, {item["FERPCLSID"].ToString()}, {item["FWORKSHOPID"].ToString()}, {item["FSTOCKID"].ToString()}, {item["FOCCUPYPICKEDCOUNT"].ToString()})");
+ $", {item["FCOMPLETECOUNT1"].ToString()}, {item["FERPCLSID"].ToString()}, {item["FWORKSHOPID"].ToString()}, {item["FSTOCKID"].ToString()}, {item["FOCCUPYPICKEDCOUNT"].ToString()}, '{item["HMainICMOBillNo"].ToString()}')");
}
LogService.Write("鎵归噺鎻掑叆鍒版暟鎹簱鐢ㄦ椂锛�" + sw.Elapsed);
//鎵ц瀹屾垚鍚� 鏇存柊鏃ヨ鍒掑伐鍗曠姸鎬�
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_ICMOSortBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_ICMOSortBillController.cs"
new file mode 100644
index 0000000..8bcdabe
--- /dev/null
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_ICMOSortBillController.cs"
@@ -0,0 +1,56 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Models;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System.Diagnostics;
+
+namespace WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�
+{
+ public class JIT_ICMOSortBillController : ApiController
+ {
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public WebServer webserver = new WebServer();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ #region 鐢熶骇鏃ヨ鍒� 鏌ヨ
+ [Route("JIT_ICMOSortBill/JIT_ICMOSortBillList")]
+ [HttpGet]
+ public object JIT_ICMOSortBillList(string sWhere, string user)
+ {
+ try
+ {
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Sc_WorkBillSortBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOSortBillList", "h_v_Sc_ICMOSortBillList");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
index c5f7462..23aa0b5 100644
--- a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
+++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
@@ -4486,7 +4486,7 @@
}
if (bResult)
{
- string sql = $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ";
+ string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ");
oCn.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
diff --git a/WebAPI/Controllers/Sc_MouldOtherInBillController.cs b/WebAPI/Controllers/Sc_MouldOtherInBillController.cs
index e053b18..fa1d35a 100644
--- a/WebAPI/Controllers/Sc_MouldOtherInBillController.cs
+++ b/WebAPI/Controllers/Sc_MouldOtherInBillController.cs
@@ -320,7 +320,7 @@
}
if (bResult)
{
- string sql = $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ";
+ string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ") ;
oCn.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index a90c3b5..be692fd 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -3804,7 +3804,7 @@
}
if (bResult)
{
- string sql = $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ";
+ string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ");
oCn.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -4214,7 +4214,7 @@
}
if (bResult)
{
- string sql = $"exec h_p_Sc_MouldChangeFileStatus 'out','{oBill.omodel.HInterID.ToString()}' ";
+ string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'out','{oBill.omodel.HInterID.ToString()}' ");
oCn.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -4791,9 +4791,9 @@
}
if (bResult)
{
- string sql = $"exec h_p_Sc_MouldProdBackBillList '{oBill.omodel.HBillNo}' ";
+ string sql =string.Format($"exec h_p_Sc_MouldProdBackBillList '{oBill.omodel.HBillNo}' ") ;
oCn.RunProc(sql);
- string sql1 = $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ";
+ string sql1 =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ");
oCn.RunProc(sql1);
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -5230,7 +5230,7 @@
}
if (bResult)
{
- string sql = $"exec h_p_Sc_MouldChangeFileStatus 'out','{oBill.omodel.HInterID.ToString()}' ";
+ string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'out','{oBill.omodel.HInterID.ToString()}' ");
oCn.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
diff --git a/WebAPI/Controllers/Sc_PckSplitBillController.cs b/WebAPI/Controllers/Sc_PckSplitBillController.cs
index a123d40..9cdd59d 100644
--- a/WebAPI/Controllers/Sc_PckSplitBillController.cs
+++ b/WebAPI/Controllers/Sc_PckSplitBillController.cs
@@ -374,13 +374,13 @@
{
try
{
- string sql1 = string.Format(@"select * from h_v_Kf_ICStockBillList where HBillType='1204' " + sWhere);
+ string sql1 = string.Format(@"select * from h_v_Kf_ICStockBillList where 1=1 " + sWhere);
DataSet ds=oCn.RunProcReturn(sql1, "h_v_Kf_ICStockBillList");
if (ds.Tables[0].Rows.Count == 0 || ds == null)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏌ヨ澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.Message = "鏆傛棤鏁版嵁" + DBUtility.ClsPub.sErrInfo;
objJsonResult.data = null;
return objJsonResult;
}
@@ -388,7 +388,7 @@
{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鏆傛棤鏁版嵁";
+ objJsonResult.Message = "鏌ヨ鎴愬姛";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
@@ -405,20 +405,82 @@
}
#endregion
- #region 浜х嚎鍏抽敭浠剁粦瀹歋N鍙锋煡璇�
- [Route("Sc_PckSplit/Get_PHPCruxBillList")]
+ #region 浜х嚎鍏抽敭浠剁粦瀹�
+ /// <summary>
+ /// SN鍙锋煡璇�
+ /// </summary>
+ /// <param name="HBarCode">SN鍙�</param>
+ /// <returns></returns>
+ [Route("Sc_PckSplit/Get_PHPCruxSNBillList")]
[HttpGet]
- public Object Get_PHPCruxBillList(string HBarCode)
+ public Object Get_PHPCruxSNBillList(int HinterID, string HBarCode,int HProcID,string HBillNo)
{
try
{
- string sql1 = string.Format(@"select a.HMaterID,m.HName HMaterName,m.HModel HMaterSpec,a.HQtyMust,0 HQty,'"+ HBarCode + "' as HCPM from Sc_PPBomBillSub a left join Gy_Material m on a.HMaterID=m.HItemID where HICMOEntryID=(select HSourceEntryID from Gy_BarCodeBill where HBarCode='"+HBarCode+"')");
- DataSet ds = oCn.RunProcReturn(sql1, "Sc_PPBomBillSub");
+ string sql1 = string.Format($"exec h_p_Sc_PHPCruxSNBillTOTemp '"+HBarCode+"',"+HinterID+","+HProcID+",'"+ HBillNo+"'");
+ DataSet ds = oCn.RunProcReturn(sql1, "h_p_Sc_PHPCruxSNBillTOTemp");
if (ds.Tables[0].Rows.Count == 0 || ds == null)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏌ヨ澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.Message = "鏆傛棤鏁版嵁锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["sel"]) ==0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏆傛棤鏁版嵁锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else{
+ //鍏堝瓨杩涗复鏃惰〃鍐嶈繑鍥炴暟鎹�
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏌ヨ鎴愬姛";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "涓婁紶澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鍏抽敭鐮佹煡璇�
+ /// </summary>
+ /// <param name="HBarCode">鍏抽敭鐮�</param>
+ /// <returns></returns>
+ [Route("Sc_PckSplit/Get_PHPCruxBillList")]
+ [HttpGet]
+ public Object Get_PHPCruxBillList(int HinterID,string HPCrux,string HBillNo)
+ {
+ try
+ {
+ string sql1 = string.Format($"exec h_p_Sc_PHPCruxBillTOTemp '" +HPCrux+"',"+ HinterID+",'"+ HBillNo+"'");
+ DataSet ds = oCn.RunProcReturn(sql1, "h_p_Sc_PHPCruxBillTOTemp");
+ if (ds.Tables[0].Rows.Count == 0 || ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌鏉″舰鐮佷俊鎭紒" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (ds.Tables[0].Rows[0]["HBack"].ToString() == "2")
+ {
+ objJsonResult.code = "2";
+ objJsonResult.count = 2;
+ objJsonResult.Message = "閿欒锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0][1]);
objJsonResult.data = null;
return objJsonResult;
}
@@ -427,7 +489,7 @@
//鍏堝瓨杩涗复鏃惰〃鍐嶈繑鍥炴暟鎹�
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鏆傛棤鏁版嵁";
+ objJsonResult.Message = "鏌ヨ鎴愬姛";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
@@ -442,6 +504,130 @@
return objJsonResult;
}
}
+
+ /// <summary>
+ /// 鎵爜缂撳瓨鍒犻櫎
+ /// </summary>
+ /// <param name="HBarCode">鍏抽敭鐮�</param>
+ /// <returns></returns>
+ [Route("Sc_PckSplit/Delete_PHPCruxBillListByME")]
+ [HttpGet]
+ public Object Delete_PHPCruxBillListByME(int HInterID,int HMaterID,string HBarCode)
+ {
+ try
+ {
+ oCn.BeginTran();
+ string sql = string.Format(@"delete Sc_AssemblyBill_BindBarCodeTemp where HInterID="+ HInterID+" and HMaterID="+ HMaterID+ " and HBarCode='" + HBarCode+"'");
+ oCn.RunProc(sql);
+ //鍒犻櫎鎴愬姛
+ string sql1= string.Format(@"select a.HEntryID,a.HMaterID,m.HName HMaterName,m.HModel HMaterSpec,1 HQty,HBarCode HPJM
+ from Sc_AssemblyBill_BindBarCodeTemp a left join Gy_Material m on a.HMaterID=m.HItemID
+ where HInterID=" + HInterID);
+ DataSet ds=oCn.RunProcReturn(sql1, "Sc_AssemblyBill_BindBarCodeTemp");
+ oCn.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "涓婁紶澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 缁勮鍗曟彁浜�
+ /// </summary>
+ /// <param name="HBarCode">鍏抽敭鐮�</param>
+ /// <returns></returns>
+ [Route("Sc_PckSplit/Add_PHPCruxBillList")]
+ [HttpPost]
+ public Object Add_PHPCruxBillList([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();//鍩烘湰璧勬枡
+ string msg3 = sArray[1].ToString();//閰嶄欢鍒楄〃
+ string msg4 = sArray[2].ToString();//鏉＄爜鍒楄〃
+ string msg5 = sArray[3].ToString();//鐧诲綍浜�
+ ListModels oListModels = new ListModels();
+ long HinterID;
+ string HBillNo = "";
+
+ try
+ {
+ DLL.ClsSc_PHPCruxBillBill oBill = new DLL.ClsSc_PHPCruxBillBill();
+ List<Models.ClsSc_AssemblyBillMain> lsmain = new List<Models.ClsSc_AssemblyBillMain>();//鍩烘湰璧勬枡
+ List<Models.ClsSc_AssemblyBillMain> lspjItme = new List<Models.ClsSc_AssemblyBillMain>();//閰嶄欢鍒楄〃
+ List<Models.ClsSc_AssemblyBillSub> lstmItme = new List<Models.ClsSc_AssemblyBillSub>();//鎵爜鍒楄〃
+ //鍩烘湰璧勬枡_json鏍煎紡杞崲
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", "");
+ lsmain = oListModels.getObjectByJson_Sc_AssemblyBillMain(msg2);
+
+ HinterID = lsmain[0].HInterID;//涓籌D
+ HBillNo = lsmain[0].HBillNo;//鍗曟嵁鍙�
+
+
+ //浜嬪姟寮�濮�
+ oCn.BeginTran();
+ //鏍规嵁interID鍦ㄦ簮鍗曚复鏃惰〃涓煡鎵炬暟鎹�
+ DataSet ds1 = oCn.RunProcReturn("select top 1 * from Sc_AssemblyBill_BindSourceTemp where HInterID=" + HinterID, "Sc_AssemblyBill_BindSourceTemp");
+ //淇濆瓨鐢熶骇缁勮鍗曚富琛�
+ string sql = "Insert Into Sc_AssemblyBillMain " +
+ "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate," +
+ "HBillNo,HBillStatus,HMaker,HMakeDate" +
+ ",HMainSourceInterID,HMainSourceBillNo" +
+ ",HICMOInterID,HICMOBillNo,HBarCode_P,HMaterID,HUnitID,HAssemblyStatus" +
+ ") " +
+ " values('" + DateTime.Now.Year + "','" + DateTime.Now.Month + "',3727,3727," + HinterID + ",'" + DateTime.Now+
+ "','" + HBillNo + "',1,'"+msg5+"',getdate()" +
+ ",0,'" + lsmain[0].HBarCode + "'" +
+ "," + ds1.Tables[0].Rows[0]["HSourceInterID"].ToString() + ",'" + ds1.Tables[0].Rows[0]["HSourceBillNo"].ToString() + "','" + lsmain[0].HBarCode + "',0,0,'鐢熶骇涓�'" +
+ ") ";
+ oCn.RunProc(sql);
+
+ //鏍规嵁interID鍦ㄦ壂鐮佷复鏃惰〃涓煡鎵炬暟鎹�
+ DataSet ds2 = oCn.RunProcReturn("select * from Sc_AssemblyBill_BindBarCodeTemp where HInterID=" + HinterID, "Sc_AssemblyBill_BindBarCodeTemp");
+ for (int i = 0; i < ds2.Tables[0].Rows.Count; i++)
+ {
+ string sq2 = "Insert Into Sc_AssemblyBillSub " +
+ "(HInterID,HBillNo_bak,HEntryID," +
+ "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ ",HMaterID,HSourceID,HEquipID,HUnitID,HQty,HGroupID,HWorkerID,HScanDate,HBarCode,HBarCode_P,HSNNumber" +
+ ") " +
+ " values(" + HinterID + ",'" + HBillNo + "'," + i +
+ "," + ds2.Tables[0].Rows[i]["HSourceInterID"].ToString() + "," + ds2.Tables[0].Rows[i]["HSourceEntryID"].ToString() + ",'" + ds2.Tables[0].Rows[i]["HSourceBillNo"].ToString() + "'" +
+ ",''," + ds2.Tables[0].Rows[i]["HMaterID"].ToString() + ",'"+ lsmain[0].HSCZYID + "',0,0,1," + lsmain[0].HGroupID + "," + lsmain[0].HKeeperID + ",getdate(),'" + ds2.Tables[0].Rows[i]["HBarCode"].ToString() + "','" + ds2.Tables[0].Rows[i]["HBarCode"].ToString() + "','" + lsmain[0].HBarCode + "'" +
+ ") ";
+ oCn.RunProc(sq2);
+ }
+ oCn.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message ="鎻愪氦鎴愬姛";
+ objJsonResult.data =null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "涓婁紶澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
#endregion
+
}
}
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 151eb51..54dbdc0 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -219,7 +219,9 @@
model.Add("FBillType", new JObject() { ["Fnumber"] = "SCHBD01_SYS" }); //鍗曟嵁绫诲瀷鐢熶骇姹囨姤鈥淪CHBD02_SYS鈥� 鍏ュ簱姹囨姤SCHBD01_SYS
model.Add("FPrdOrgId", new JObject() { ["Fnumber"] = dr1["FPrdOrgNUMBER"].ToString() }); //鐢熶骇缁勭粐1
model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //鍗曟嵁鏃ユ湡1
+ model.Add("FHZYMESFLAG", "鏄�");// 鏄惁涓篗ES鍚屾
JArray Fentity = new JArray();
+
foreach (DataRow item in ds.Tables[0].Rows)
{
JObject FentityModel = new JObject();
@@ -318,7 +320,7 @@
Ids = fID,
};
result1 = InvokeHelper.Submit("PRD_MORPT", JsonConvert.SerializeObject(json));//鎻愪氦
- //result2 = InvokeHelper.Audit("PRD_MORPT", JsonConvert.SerializeObject(json));//瀹℃牳
+ result2 = InvokeHelper.Audit("PRD_MORPT", JsonConvert.SerializeObject(json));//鎻愪氦
if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
{
oCN.RollBack();
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 241d16b..d9c6515 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -3142,7 +3142,7 @@
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
string sql = string.Format(@"select b.HDotCheckItemID HDotCheckItemID,c.HNumber HDotCheckCode,b.HDotCheckItem,b.HDotCheckPart,b.HClaim,
- b.HManagerID,e.HNumber HManagerCode,e.HName HManagerName,b.HRemark from Sb_EquipDotCheckRuleBillMain a
+ b.HManagerID,e.HNumber HManagerCode,e.HName HManagerName,b.HRemark,a.HInterID,a.HBillNo from Sb_EquipDotCheckRuleBillMain a
left join Sb_EquipDotCheckRuleBillSub b on a.HInterID=b.HInterID
left join Gy_QCCheckItem c on c.HItemID=b.HDotCheckItemID
left join Gy_Employee e on e.HItemID=b.HManagerID
diff --git "a/WebAPI/Controllers/\345\215\232\346\227\245\350\207\252\345\212\250\346\211\253\347\240\201\347\272\277/ScanlineAPIController.cs" "b/WebAPI/Controllers/\345\215\232\346\227\245\350\207\252\345\212\250\346\211\253\347\240\201\347\272\277/ScanlineAPIController.cs"
index 26fc827..520edd5 100644
--- "a/WebAPI/Controllers/\345\215\232\346\227\245\350\207\252\345\212\250\346\211\253\347\240\201\347\272\277/ScanlineAPIController.cs"
+++ "b/WebAPI/Controllers/\345\215\232\346\227\245\350\207\252\345\212\250\346\211\253\347\240\201\347\272\277/ScanlineAPIController.cs"
@@ -160,10 +160,9 @@
{
//鍒ゆ柇鏉＄爜鏄惁瀛樺湪
bool IsBarCode = oBill.IsBarCode(list.barcodes[i].barcode);
- if (IsBarCodePack == false)
+ if (IsBarCode == false)
{
DataTable dt = oCN.RunProcReturn("Select HBarCode_Pack from Sc_PackUnionBillSub Where HBarCode='" + list.barcodes[i].barcode + "'", "Sc_PackUnionBillSub").Tables[0];
- LogService.Write($"鏉＄爜锛歿list.barcodes[i].barcode}锛屽凡瀛樺湪绠辩爜锛歿dt.Rows[0]["HBarCode_Pack"]}涓紝鏈缁戝畾绠辩爜涓猴細{list.packagebarcode},缁戝畾澶辫触,涓嶈兘閲嶅缁戝畾锛�");
objJsonResult.status = -1;
objJsonResult.msg = $"鏉＄爜锛歿list.barcodes[i].barcode}锛屽凡瀛樺湪绠辩爜锛歿dt.Rows[0]["HBarCode_Pack"]}涓紝鏈缁戝畾绠辩爜涓猴細{list.packagebarcode},缁戝畾澶辫触,涓嶈兘閲嶅缁戝畾锛�";
objJsonResult.data = null;
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckBillController.cs"
index 562e9ca..98c9a34 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckBillController.cs"
@@ -159,7 +159,7 @@
msg2 = "[" + msg2.ToString() + "]";
List<Models.ClsGy_DotCheck> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_DotCheck>>(msg2);
- long HItemID = int.Parse(msg3);
+ long HItemID = int.Parse(msg4);
string HNumber = list[0].HNumber;
string HName = list[0].HName;
string HShortNumber = list[0].HNumber;
@@ -169,7 +169,7 @@
string HUseFlag = list[0].HUseFlag;
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log("Gy_DotCheck_Edit", 1, false, msg4))
+ if (!ClsPub.Security_Log("Gy_DotCheck_Edit", 1, false, msg3))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -188,14 +188,14 @@
return objJsonResult;
}
- if (oDept.HavSameNumber(HItemID, HNumber))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "浠ｇ爜閲嶅锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //if (oDept.HavSameNumber(HItemID, HNumber))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "浠ｇ爜閲嶅锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
@@ -284,9 +284,9 @@
//涓昏〃
oCN.RunProc("Insert into Gy_DotCheck " +
" (HNumber,HName,HHelpCode,HShortNumber" +
- ",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime) " +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HParentID) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," +
- +HLevel + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
+ +HLevel + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',0)", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
//oCN.RunProc("Update Gy_MouldType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairBillController.cs"
index 42a43aa..483bbc0 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairBillController.cs"
@@ -186,15 +186,6 @@
return objJsonResult;
}
- if (oDept.HavSameNumber(HItemID, HNumber))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "浠ｇ爜閲嶅锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
@@ -282,9 +273,9 @@
//涓昏〃
oCN.RunProc("Insert into Gy_Repair " +
" (HNumber,HName,HHelpCode,HShortNumber" +
- ",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime) " +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HParentID) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," +
- +HLevel + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
+ +HLevel + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',0)", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
//oCN.RunProc("Update Gy_MouldType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
index 8c65879..f97b1f1 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
@@ -1027,11 +1027,9 @@
}
oCN.BeginTran();
- //鍒犻櫎宸ュ簭姹囨姤瀛愯〃
- string sql1 = string.Format(@"delete Sc_ProcessReportSub where HInterID='" + HInterID + "' and HICMOInterID='" + HICMOInterID + "' and HICMOEntryID='" + HICMOEntryID + "'");
- oCN.RunProc(sql1);
- //鍒犻櫎宸ュ簭姹囨姤涓昏〃
- string sql = string.Format(@"delete Sc_ProcessReportMain where HInterID='" + HInterID + "'");
+
+ //鍒犻櫎浜ч噺姹囨姤琛�
+ string sql = string.Format(@"delete Sc_ICMOBillWorkQtyStatus_Tmp where HInterID='" + HInterID + "'");
oCN.RunProc(sql);
oCN.Commit();
diff --git a/WebAPI/DLL/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs b/WebAPI/DLL/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs
index 536f2e2..18752d4 100644
--- a/WebAPI/DLL/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs
+++ b/WebAPI/DLL/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs
@@ -89,14 +89,14 @@
",HBillSubType,HBillNo,HICMOInterID,HICMOEntryID,HICMOBillNo" +
",HQty,HBadQty,HWasterQty,HBarCode,HAddr,HMaker,HMakeDate" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSplitNO,HSourceBillType" +
- ",HRelationInterID,HRelationEntryID,HRelationBillNo,HReportEntryID" +
+ ",HRelationInterID,HRelationEntryID,HRelationBillNo,HReportEntryID,HBillStatus" +
") " +
" values(" + omodel.HInterID.ToString() + ",'" + BillType + "'," + omodel.HSourceID.ToString() + "," + omodel.HReportType.ToString() + "," + omodel.HPieceQty.ToString() +
"," + omodel.HMaterID.ToString() + ",'" + omodel.HGroupID + "','" + omodel.HWorkManID + "','" + omodel.HWorkReportDate + "','" + omodel.HDate + "'" +
",'" + omodel.HBillSubType.ToString() + "','" + omodel.HBillNo + "','" + omodel.HICMOInterID + "','" + omodel.HICMOEntryID + "','" + omodel.HICMOBillNo + "'" +
"," + omodel.HQty.ToString() + "," + omodel.HBadQty.ToString() + "," + omodel.HWasterQty.ToString() + ",'" + omodel.HBarCode + "','" + omodel.HAddr + "','" + omodel.HMaker+ "','" + omodel.HMakeDate + "'" +
"," + omodel.HSourceInterID.ToString() + "," + omodel.HSourceEntryID.ToString() + ",'" + omodel.HSourceBillNo + "','" + omodel.HSplitNO + "','" + omodel.HSourceBillType + "'" +
- "," + omodel.HRelationInterID.ToString() + "," + omodel.HRelationEntryID.ToString() + ",'" + omodel.HRelationBillNo + "'," + omodel.HReportEntryID.ToString()+
+ "," + omodel.HRelationInterID.ToString() + "," + omodel.HRelationEntryID.ToString() + ",'" + omodel.HRelationBillNo + "'," + omodel.HReportEntryID.ToString() + "," + omodel.HBillStatus.ToString() +
") ");
double sumqty = omodel.HQty + omodel.HBadQty + omodel.HWasterQty; //汇报数量+不良+报废
//回写生产状态临时表Sc_ICMOBillStatus_Tmp拆分汇报数量 HSplitRelationQty
diff --git a/WebAPI/DLL/ClsSc_PHPCruxBillBill.cs b/WebAPI/DLL/ClsSc_PHPCruxBillBill.cs
new file mode 100644
index 0000000..c251614
--- /dev/null
+++ b/WebAPI/DLL/ClsSc_PHPCruxBillBill.cs
@@ -0,0 +1,25 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.DLL
+{
+ public class ClsSc_PHPCruxBillBill : DBUtility.ClsXt_BaseBill
+ {
+ public Models.ClsSc_AssemblyBillMain omodel = new Models.ClsSc_AssemblyBillMain();
+ public List<Models.ClsSc_AssemblyBillSub> DetailColl = new List<Models.ClsSc_AssemblyBillSub>();
+
+ public ClsSc_PHPCruxBillBill()
+ {
+ base.MvarItemKeySub = "Sc_AssemblyBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey = "Sc_AssemblyBillMain";
+ base.MvarReportTitle = "鐢熶骇缁勮鍗�";
+ base.BillType = "3727";
+ base.HBillSubType = "3727";
+ }
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 4ed8160..cbb9302 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -1985,5 +1985,28 @@
return list;
}
+ /// <summary>
+ /// 缁勮杩芥函-涓�
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsSc_AssemblyBillMain> getObjectByJson_Sc_AssemblyBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsSc_AssemblyBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_AssemblyBillMain>>(jsonString);
+ return list;
+ }
+ /// <summary>
+ /// 缁勮杩芥函-瀛�
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsSc_AssemblyBillSub> getObjectByJson_Sc_AssemblyBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsSc_AssemblyBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_AssemblyBillSub>>(jsonString);
+ return list;
+ }
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/ClsSc_AssemblyBillMain.cs b/WebAPI/Models/ClsSc_AssemblyBillMain.cs
new file mode 100644
index 0000000..bf9758c
--- /dev/null
+++ b/WebAPI/Models/ClsSc_AssemblyBillMain.cs
@@ -0,0 +1,28 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class ClsSc_AssemblyBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public Int64 HICMOInterID;// int --浠诲姟鍗旾D锛堟壂鐮佷骇鍝佹潯鐮佸甫鍑猴級
+ public Int64 HMaterID = 0;// int --浜у搧ID
+ public Int64 HUnitID=0;// int --鍗曚綅ID
+ public string HICMOBillNo;// varchar(200) --浠诲姟鍗曞彿 锛堟壂鐮佷骇鍝佹潯鐮佸甫鍑猴級
+ public string HBarCode_P;// varchar(50) --浜у搧鏉″舰鐮�
+ public string HAssemblyStatus; //缁勮鐘舵�侊紙鐢熶骇涓紝姹囨姤锛屾楠岋紝鍖呰锛屽叆搴擄級
+ public string HCPM;
+ public int HGroupID;
+ //public string HGroupName;
+ public int HKeeperID;
+ //public string HKeeperName;
+ public string HBarCode;
+ //public string HProc;
+ public int HProcID;
+ public string HPCrux;
+ public string HSCZY;
+ public int HSCZYID;
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/ClsSc_AssemblyBillSub.cs b/WebAPI/Models/ClsSc_AssemblyBillSub.cs
new file mode 100644
index 0000000..cbe7945
--- /dev/null
+++ b/WebAPI/Models/ClsSc_AssemblyBillSub.cs
@@ -0,0 +1,24 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class ClsSc_AssemblyBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+ public Int64 HMaterID;// int --鐗╂枡ID
+ public Int64 HUnitID;// 鍗曚綅ID
+ public double HQty;// 鏁伴噺
+ public Int64 HSourceID;// 鐢熶骇璧勬簮ID锛堥潪蹇呰锛�
+ public Int64 HEquipID;// 鐢熶骇璁惧ID锛堥潪蹇呰锛�
+ public Int64 HGroupID;// 鐢熶骇鐝粍ID锛堥潪蹇呰锛�
+ public Int64 HWorkerID;// 鎿嶄綔宸D锛堥潪蹇呰锛�
+ public string HScanDate;// --鎵弿鏃堕棿
+ public string HBarCode;// varchar(50) --鏉″舰鐮�
+ public string HBarCode_P;// varchar(50) --浜у搧鏉＄爜
+ public string HSNNumber;// SN鍙凤紙闈炲繀濉級
+ public string HPJM;
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index c828f26..f12989a 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -18,28 +18,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>07/18/2022 18:17:10</publishTime>
+ <publishTime>08/08/2022 14:58:19</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>07/18/2022 18:17:10</publishTime>
+ <publishTime>08/08/2022 14:58:19</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>07/18/2022 18:17:09</publishTime>
+ <publishTime>08/08/2022 14:58:18</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>07/18/2022 18:17:09</publishTime>
+ <publishTime>08/08/2022 14:58:18</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>07/18/2022 18:17:07</publishTime>
+ <publishTime>08/08/2022 14:58:16</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>07/18/2022 18:17:07</publishTime>
+ <publishTime>08/08/2022 14:58:16</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -93,10 +93,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>07/18/2022 18:17:08</publishTime>
+ <publishTime>08/08/2022 14:58:17</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>07/18/2022 18:17:08</publishTime>
+ <publishTime>08/08/2022 14:58:17</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>03/15/2022 10:06:42</publishTime>
@@ -129,22 +129,22 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>07/18/2022 18:17:06</publishTime>
+ <publishTime>08/08/2022 14:58:15</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>07/18/2022 18:17:06</publishTime>
+ <publishTime>08/08/2022 14:58:15</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>07/18/2022 18:17:06</publishTime>
+ <publishTime>08/08/2022 14:58:15</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>07/18/2022 18:17:06</publishTime>
+ <publishTime>08/08/2022 14:58:15</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>07/18/2022 18:17:07</publishTime>
+ <publishTime>08/08/2022 14:58:15</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>07/18/2022 18:17:07</publishTime>
+ <publishTime>08/08/2022 14:58:15</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
@@ -255,13 +255,13 @@
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>07/18/2022 18:17:15</publishTime>
+ <publishTime>08/08/2022 14:58:22</publishTime>
</File>
<File Include="bin/WebAPI.dll.config">
<publishTime>12/15/2021 17:59:43</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>07/18/2022 18:17:15</publishTime>
+ <publishTime>08/08/2022 14:58:22</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -273,7 +273,7 @@
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Config/kdapi.config">
- <publishTime>06/28/2022 08:44:51</publishTime>
+ <publishTime>07/27/2022 08:46:55</publishTime>
</File>
<File Include="Content/bootstrap.css">
<publishTime>03/15/2022 10:06:42</publishTime>
@@ -459,7 +459,7 @@
<publishTime>12/20/2021 13:19:56</publishTime>
</File>
<File Include="Web.config">
- <publishTime>07/18/2022 18:17:23</publishTime>
+ <publishTime>08/08/2022 14:58:31</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637953187497864324.log b/WebAPI/Sc_MouldProdInBill/Log/637953187497864324.log
new file mode 100644
index 0000000..bfdf9c7
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637953187497864324.log
@@ -0,0 +1,3 @@
+------------------------2022/8/5 17:52:29------------------------------
+鎴愬姛锛�
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637953187498594383.log b/WebAPI/Sc_MouldProdInBill/Log/637953187498594383.log
new file mode 100644
index 0000000..9379116
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637953187498594383.log
@@ -0,0 +1,3 @@
+------------------------2022/8/5 17:52:29------------------------------
+鏈夋潈闄�
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637953187498644386.log b/WebAPI/Sc_MouldProdInBill/Log/637953187498644386.log
new file mode 100644
index 0000000..84df1cf
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637953187498644386.log
@@ -0,0 +1,3 @@
+------------------------2022/8/5 17:52:29------------------------------
+select * from h_v_Sc_MouldProdInHouseBillList where 搴撳瓨缁勭粐='鎵嬫満浜嬩笟閮�' and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-07-06' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-08-05'order by hmainid desc
+
diff --git a/WebAPI/Vlog/webapi20220805.txt b/WebAPI/Vlog/webapi20220805.txt
new file mode 100644
index 0000000..9186f6f
--- /dev/null
+++ b/WebAPI/Vlog/webapi20220805.txt
@@ -0,0 +1 @@
+2022/8/5 17:52:29 and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-07-06' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-08-05';鎵嬫満浜嬩笟閮�
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 0d54a06..c117bfe 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -22,7 +22,7 @@
<!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/> -->
<!--<add key="sUrl" value="http://192.168.63.195/WEBS-WMS/WebService1.asmx"/> 棰滃彴寮忔満-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 澶忓疂-->
- <add key="sUrl" value="http://60.191.27.141:8090/WEBS-WMS/WebService1.asmx" />
+ <add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx" />
<!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/> 鍗氭棩绉戞妧-->
<!--<add key="sUrl" value="http://192.168.0.214/WEBS-WMS/WebService1.asmx"/> 鐟炰笌绁�-->
<!--<add key="sUrl" value="http://60.191.27.141:8090/WEBS-WMS/WebService1.asmx"/> 妫シ-->
@@ -92,7 +92,7 @@
</basicHttpBinding>
</bindings>
<client>
- <endpoint address="http://60.191.27.141:8090/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
+ <endpoint address="http://47.96.97.237/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap"
name="WebService1Soap" />
</client>
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index e3ea52f..49aabbb 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -386,6 +386,7 @@
<Compile Include="Controllers\SCGL\Sc_ICBomBillController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_DayPlanPlatFormBillController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_DayPlanPlatFormImportController.cs" />
+ <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_ICMOSortBillController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱NpoiHelper.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Sc_JIT_ComplementGoodBillController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_CompleteController..cs" />
@@ -537,6 +538,7 @@
<Compile Include="DLL\ClsSc_MouldOtherInBill.cs" />
<Compile Include="DLL\ClsSc_MouldMoveStockStepOutBill.cs" />
<Compile Include="DLL\ClsSc_PackUnionBill.cs" />
+ <Compile Include="DLL\ClsSc_PHPCruxBillBill.cs" />
<Compile Include="DLL\ClsSc_ProcessPlan.cs" />
<Compile Include="DLL\ClsWW_PPBomBill.cs" />
<Compile Include="DLL\宸ヨ祫绠＄悊\ClsPay_GroupBalBill.cs" />
@@ -545,6 +547,8 @@
<Compile Include="HttpClient.cs" />
<Compile Include="InvokeHelper.cs" />
<Compile Include="Log.cs" />
+ <Compile Include="Models\ClsSc_AssemblyBillMain.cs" />
+ <Compile Include="Models\ClsSc_AssemblyBillSub.cs" />
<Compile Include="Models\JIT_Cg_PODemandPlanBillMain.cs" />
<Compile Include="Models\JIT_Cg_PODemandPlanBillSub.cs" />
<Compile Include="Models\Cg_PODemandPlanConfigBillSub.cs" />
@@ -833,6 +837,7 @@
<Folder Include="Views\Gy_RoutingGroup\" />
<Folder Include="Views\JIT_DayPlanPlatFormBill\" />
<Folder Include="Views\JIT_DayPlanPlatFormImport\" />
+ <Folder Include="Views\JIT_ICMOSortBillList\" />
<Folder Include="Views\KF_ICInventoryList_WMSBill\" />
<Folder Include="Views\Kf_ICStockBillMain\" />
<Folder Include="Views\Kf_ICStockInOutBill\" />
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_ICMOBillStatusReport.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_ICMOBillStatusReport.cs"
index e179de0..17ed8f1 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_ICMOBillStatusReport.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_ICMOBillStatusReport.cs"
@@ -140,8 +140,9 @@
DataSet DSet = new DataSet();
//杩囨护鏉′欢Dlg
string sDlgWhere = "";
- sDlgWhere = sDlgWhere + ",'" + dtpHBDate.Value.ToShortDateString() + "'";
- sDlgWhere = sDlgWhere + ",'" + dtpHEDate.Value.ToShortDateString() + "'";
+ //sDlgWhere = sDlgWhere + ",'" + dtpHBDate.Value.ToShortDateString() + "'";
+ //sDlgWhere = sDlgWhere + ",'" + dtpHEDate.Value.ToShortDateString() + "'";
+ sDlgWhere = sDlgWhere + ",'" + txtHMaterName.Text + "'";
sDlgWhere = sDlgWhere + ",'" + txtHICMOBillNo.Text + "'";
sDlgWhere = sDlgWhere + ",'" + txtHProcessExchangeBillNo.Text + "'";
sDlgWhere = sDlgWhere + ",'" + cmbHICMOBillStatus.Text.Trim() + "'";
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_ICMOBillStatusReport.designer.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_ICMOBillStatusReport.designer.cs"
index b8ea027..891f154 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_ICMOBillStatusReport.designer.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_ICMOBillStatusReport.designer.cs"
@@ -32,6 +32,9 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MES_ICMOBillStatusReport));
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.Tool = new System.Windows.Forms.ToolStrip();
+ this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();
+ this.eXCELToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.cSVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.yl = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.cx = new System.Windows.Forms.ToolStripButton();
@@ -58,9 +61,8 @@
this.timer2 = new System.Windows.Forms.Timer(this.components);
this.grdMain = new System.Windows.Forms.DataGridView();
this.grdSum = new System.Windows.Forms.DataGridView();
- this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();
- this.eXCELToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.cSVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.label4 = new System.Windows.Forms.Label();
+ this.txtHMaterName = new System.Windows.Forms.TextBox();
this.Tool.SuspendLayout();
this.pPic.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
@@ -98,6 +100,34 @@
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
+ //
+ // toolStripDropDownButton1
+ //
+ this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.eXCELToolStripMenuItem,
+ this.cSVToolStripMenuItem});
+ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image")));
+ this.toolStripDropDownButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";
+ this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 44);
+ this.toolStripDropDownButton1.Text = "寮曞嚭";
+ this.toolStripDropDownButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.toolStripDropDownButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ //
+ // eXCELToolStripMenuItem
+ //
+ this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
+ this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
+ this.eXCELToolStripMenuItem.Text = "EXCEL";
+ this.eXCELToolStripMenuItem.Click += new System.EventHandler(this.eXCELToolStripMenuItem_Click);
+ //
+ // cSVToolStripMenuItem
+ //
+ this.cSVToolStripMenuItem.Name = "cSVToolStripMenuItem";
+ this.cSVToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
+ this.cSVToolStripMenuItem.Text = "CSV";
+ this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
//
// yl
//
@@ -208,6 +238,8 @@
this.pPic.BackColor = System.Drawing.Color.White;
this.pPic.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pPic.BackgroundImage")));
this.pPic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+ this.pPic.Controls.Add(this.label4);
+ this.pPic.Controls.Add(this.txtHMaterName);
this.pPic.Controls.Add(this.label6);
this.pPic.Controls.Add(this.txtHProcessExchangeBillNo);
this.pPic.Controls.Add(this.cmbHICMOBillStatus);
@@ -249,7 +281,8 @@
this.cmbHICMOBillStatus.Items.AddRange(new object[] {
"鍏ㄩ儴",
"WMS缁撴",
- "鏈粨妗�"});
+ "鏈粨妗�",
+ "K3缁撴"});
this.cmbHICMOBillStatus.Location = new System.Drawing.Point(723, 3);
this.cmbHICMOBillStatus.Name = "cmbHICMOBillStatus";
this.cmbHICMOBillStatus.Size = new System.Drawing.Size(143, 20);
@@ -290,6 +323,7 @@
this.dtpHEDate.Name = "dtpHEDate";
this.dtpHEDate.Size = new System.Drawing.Size(107, 21);
this.dtpHEDate.TabIndex = 10;
+ this.dtpHEDate.Visible = false;
//
// label1
//
@@ -300,6 +334,7 @@
this.label1.Size = new System.Drawing.Size(53, 12);
this.label1.TabIndex = 7;
this.label1.Text = "寮�濮嬫棩鏈�";
+ this.label1.Visible = false;
//
// label2
//
@@ -310,6 +345,7 @@
this.label2.Size = new System.Drawing.Size(53, 12);
this.label2.TabIndex = 8;
this.label2.Text = "缁撴潫鏃ユ湡";
+ this.label2.Visible = false;
//
// dtpHBDate
//
@@ -318,6 +354,7 @@
this.dtpHBDate.Name = "dtpHBDate";
this.dtpHBDate.Size = new System.Drawing.Size(107, 21);
this.dtpHBDate.TabIndex = 9;
+ this.dtpHBDate.Visible = false;
//
// lblCaption
//
@@ -368,33 +405,22 @@
this.grdSum.Size = new System.Drawing.Size(1190, 19);
this.grdSum.TabIndex = 49;
//
- // toolStripDropDownButton1
+ // label4
//
- this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.eXCELToolStripMenuItem,
- this.cSVToolStripMenuItem});
- this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image")));
- this.toolStripDropDownButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";
- this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 44);
- this.toolStripDropDownButton1.Text = "寮曞嚭";
- this.toolStripDropDownButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.toolStripDropDownButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.label4.AutoSize = true;
+ this.label4.BackColor = System.Drawing.Color.Transparent;
+ this.label4.Location = new System.Drawing.Point(654, 32);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(53, 12);
+ this.label4.TabIndex = 114;
+ this.label4.Text = "浜у搧鍚嶇О";
//
- // eXCELToolStripMenuItem
+ // txtHMaterName
//
- this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
- this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.eXCELToolStripMenuItem.Text = "EXCEL";
- this.eXCELToolStripMenuItem.Click += new System.EventHandler(this.eXCELToolStripMenuItem_Click);
- //
- // cSVToolStripMenuItem
- //
- this.cSVToolStripMenuItem.Name = "cSVToolStripMenuItem";
- this.cSVToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.cSVToolStripMenuItem.Text = "CSV";
- this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
+ this.txtHMaterName.Location = new System.Drawing.Point(723, 28);
+ this.txtHMaterName.Name = "txtHMaterName";
+ this.txtHMaterName.Size = new System.Drawing.Size(143, 21);
+ this.txtHMaterName.TabIndex = 113;
//
// MES_ICMOBillStatusReport
//
@@ -454,5 +480,7 @@
private System.Windows.Forms.ToolStripDropDownButton toolStripDropDownButton1;
private System.Windows.Forms.ToolStripMenuItem eXCELToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem cSVToolStripMenuItem;
+ private System.Windows.Forms.Label label4;
+ public System.Windows.Forms.TextBox txtHMaterName;
}
}
\ No newline at end of file
--
Gitblit v1.9.1