From 345adbb14b9a33d444e9c0e84b0c82ba8137d767 Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期五, 19 八月 2022 14:48:23 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- PayM/bin/x86/Debug/SQLHelper.dll | 0 PayM/obj/x86/Debug/PayM.csproj.FileListAbsolute.txt | 208 ++++++ PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cache | 0 PayM/obj/x86/Debug/PayM.csproj.ResolveComReference.cache | 0 PayM/bin/x86/Debug/Pub_Control.pdb | 0 PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache | 2 NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe | 0 PayM/bin/x86/Debug/Pub_Class.pdb | 0 PayM/bin/x86/Debug/Pub_Control.dll | 0 PayM/bin/x86/Debug/Pub_Class.dll | 0 PayM/bin/x86/Debug/SQLHelper.pdb | 0 NETERPNoWin/bin/x86/Debug/Model.pdb | 0 PayM/bin/x86/Debug/Model.pdb | 0 PayM/bin/x86/Debug/BLL.dll | 0 DAL/工资管理/ClsPay_PayMentBill.cs | 22 PayM/bin/x86/Debug/BLL.pdb | 0 NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb | 0 NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb | 0 NETERPNoWin/bin/x86/Debug/WarM.pdb | 0 NETERPNoWin/bin/x86/Debug/OAM.dll | 0 NETERPNoWin/bin/x86/Debug/WarM.dll | 0 NETERPNoWin/bin/x86/Debug/WorkM.pdb | 0 NETERPNoWin/bin/x86/Debug/Model.dll | 0 PayM/bin/x86/Debug/DBUtility.dll | 0 NETERPNoWin/bin/x86/Debug/Kanban.dll | 0 NETERPNoWin/bin/x86/Debug/WorkM.dll | 0 PayM/bin/x86/Debug/DAL.dll | 0 NETERPNoWin/bin/x86/Debug/BaseSet.dll | 0 PayM/bin/x86/Debug/DBUtility.pdb | 0 NETERPNoWin/bin/x86/Debug/OAM.pdb | 0 NETERPNoWin/bin/x86/Debug/BaseSet.pdb | 0 NETERPNoWin/bin/x86/Debug/DBUtility.dll | 0 NETERPNoWin/bin/x86/Debug/Kanban.pdb | 0 PayM/obj/x86/Debug/PayM.csprojAssemblyReference.cache | 0 NETERPNoWin/bin/x86/Debug/BLL.dll | 0 NETERPNoWin/bin/x86/Debug/DBUtility.pdb | 0 PayM/obj/x86/Debug/PayM.pdb | 0 NETERPNoWin/bin/x86/Debug/BLL.pdb | 0 Kanban/Sc_QLKB.cs | 2 PayM/obj/x86/Debug/PayM.dll | 0 PayM/bin/x86/Debug/Model.dll | 0 PayM/bin/x86/Debug/Interop.gregn6Lib.dll | 0 NETERPNoWin/bin/x86/Debug/DAL.pdb | 0 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 1062 ++++++++++++++++++++++++---------- NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe | 0 Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 416 ++++++++----- NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache | 0 NETERPNoWin/bin/x86/Debug/PlanM.dll | 0 PayM/bin/x86/Debug/DAL.pdb | 0 NETERPNoWin/bin/x86/Debug/DAL.dll | 0 PayM/bin/x86/Debug/PayM.dll | 0 NETERPNoWin/bin/x86/Debug/HXERP.ini | 42 PayM/bin/x86/Debug/PayM.pdb | 0 DBUtility/业务单据/Xt_BaseBillFun.cs | 2 NETERPNoWin/bin/x86/Debug/PlanM.pdb | 0 55 files changed, 1,249 insertions(+), 507 deletions(-) diff --git "a/DAL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_PayMentBill.cs" "b/DAL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_PayMentBill.cs" index 0ee3c94..5f81953 100644 --- "a/DAL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_PayMentBill.cs" +++ "b/DAL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_PayMentBill.cs" @@ -247,17 +247,17 @@ oSub.HPayRemark = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HPayRemark"]); oSub.HUnPayRemark = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HUnPayRemark"]); //====鑷畾涔夊垪 鏄剧ず 骞� - oSub.oSelfValue.Clear(); - foreach (Model.ClsGy_SelfEntry oEntry in omodel.oSelf) - { - Model.ClsGy_SelfEntryValue oSubValue = new Model.ClsGy_SelfEntryValue(); - oSubValue.HInterID = oSub.HInterID; - oSubValue.HEntryID = oSub.HEntryID; - oSubValue.HSQLColumnName = oEntry.HSQLColumnName; - oSubValue.HCaption = oEntry.HCaption; - oSubValue.HValue = DsSub.Tables[0].Rows[i][oEntry.HSQLColumnName]; - oSub.oSelfValue.Add(oSubValue); - } + //oSub.oSelfValue.Clear(); + //foreach (Model.ClsGy_SelfEntry oEntry in omodel.oSelf) + //{ + // Model.ClsGy_SelfEntryValue oSubValue = new Model.ClsGy_SelfEntryValue(); + // oSubValue.HInterID = oSub.HInterID; + // oSubValue.HEntryID = oSub.HEntryID; + // oSubValue.HSQLColumnName = oEntry.HSQLColumnName; + // oSubValue.HCaption = oEntry.HCaption; + // oSubValue.HValue = DsSub.Tables[0].Rows[i][oEntry.HSQLColumnName]; + // oSub.oSelfValue.Add(oSubValue); + //} //============== DetailColl.Add(oSub); } diff --git "a/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/Xt_BaseBillFun.cs" "b/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/Xt_BaseBillFun.cs" index 82acb8b..31d3cfe 100644 --- "a/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/Xt_BaseBillFun.cs" +++ "b/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/Xt_BaseBillFun.cs" @@ -551,7 +551,7 @@ } if (b) { - grdMain.Rows[i].DefaultCellStyle.BackColor = Color.Black; + grdMain.Rows[i].DefaultCellStyle.BackColor = Color.Khaki; } else { diff --git a/Kanban/Sc_QLKB.cs b/Kanban/Sc_QLKB.cs index fd70aad..fd3c8ee 100644 --- a/Kanban/Sc_QLKB.cs +++ b/Kanban/Sc_QLKB.cs @@ -187,7 +187,7 @@ int SubIDCol = Fun_GetCol("hsubid"); long n = 0; DBUtility.Xt_BaseBillFun.GraphLine_XB(grdMain, MainIDCol, SubIDCol, s, ref n); - + //Total(); } catch (Exception e) { diff --git a/NETERPNoWin/bin/x86/Debug/BLL.dll b/NETERPNoWin/bin/x86/Debug/BLL.dll index 1c6d6ad..64a76e8 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 c661498..922db76 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 189fca5..2ecedb7 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 b5c7289..1636204 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 97ca775..2d17cd9 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 cb097e2..b5a7cd8 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 7a8358a..ff6de1f 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 b932c7a..920bd36 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 ec3c589..97a7676 100644 --- a/NETERPNoWin/bin/x86/Debug/HXERP.ini +++ b/NETERPNoWin/bin/x86/Debug/HXERP.ini @@ -1,25 +1,39 @@ +[po] +Server=47.96.97.237,15127 [Erp] -Server=192.168.0.88 +Server=47.96.97.237,15127 DataBase=HX_LMESsys -DataBaseNumber=001-WMS条码系统 +DataBaseNumber=001-智云LMES管理系统 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=192.168.0.88 +Server=47.96.97.237,15127 +DataBase= +UserName=HX_USER +PassWord=lc@841022 +[K32Erp] +Server=47.96.97.237,15127 DataBase=HX_LMESsys UserName=HX_USER PassWord=lc@841022 [UserInfo] -UserName=admin,王平,测试人员,jhz,001,景焕章,周黄阳,没有找到! +UserName=admin,33.995,001,宁波海关驻慈溪办事处,景焕章 UserPsd= Remember=1 -HOrgName=宁波奥邦喷雾器有限公司 -[K32Erp] -Server=没有找到! -DataBase=没有找到! -UserName=没有找到! -PassWord=没有找到! -[OPenWin] -gnbm=Sc9910 -gnsy=Sc_WorkBillPlanSumReportKB -gnmc=车间看板 \ No newline at end of file +HOrgName=手机事业部 +[CLOUDINFO] + +sCLOUDUrl=http://47.96.97.237/k3cloud/ +sCLOUDAcc=6204a70eba35fc +sCLOUDUseName=demo +sCLOUDPsd=888888 diff --git a/NETERPNoWin/bin/x86/Debug/Kanban.dll b/NETERPNoWin/bin/x86/Debug/Kanban.dll index 6d02981..4d392ea 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 611553f..e0733b7 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 7faaa0e..c54333a 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 1b7e6ca..8dd2d26 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 a0aba5b..0784f1a 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 257118b..9e6d3e4 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 40f9f07..256667c 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 cedb5c8..596f14a 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 5e52036..a31cb4b 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 66fc933..44bbd76 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/WarM.dll b/NETERPNoWin/bin/x86/Debug/WarM.dll index 40fa317..e906546 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 d4ea5d8..93f761c 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 7ebb88f..640ff99 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 05d3368..27f0bc6 100644 --- a/NETERPNoWin/bin/x86/Debug/WorkM.pdb +++ b/NETERPNoWin/bin/x86/Debug/WorkM.pdb Binary files differ diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache index d6d060c..8b3ea05 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 a0aba5b..0784f1a 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 257118b..9e6d3e4 100644 --- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb +++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb Binary files differ diff --git a/PayM/bin/x86/Debug/BLL.dll b/PayM/bin/x86/Debug/BLL.dll index 794e234..33aa9f0 100644 --- a/PayM/bin/x86/Debug/BLL.dll +++ b/PayM/bin/x86/Debug/BLL.dll Binary files differ diff --git a/PayM/bin/x86/Debug/BLL.pdb b/PayM/bin/x86/Debug/BLL.pdb index 9b6546c..48dba05 100644 --- a/PayM/bin/x86/Debug/BLL.pdb +++ b/PayM/bin/x86/Debug/BLL.pdb Binary files differ diff --git a/PayM/bin/x86/Debug/DAL.dll b/PayM/bin/x86/Debug/DAL.dll index b9b0171..494c7b7 100644 --- a/PayM/bin/x86/Debug/DAL.dll +++ b/PayM/bin/x86/Debug/DAL.dll Binary files differ diff --git a/PayM/bin/x86/Debug/DAL.pdb b/PayM/bin/x86/Debug/DAL.pdb index ae70b92..e8cc6d5 100644 --- a/PayM/bin/x86/Debug/DAL.pdb +++ b/PayM/bin/x86/Debug/DAL.pdb Binary files differ diff --git a/PayM/bin/x86/Debug/DBUtility.dll b/PayM/bin/x86/Debug/DBUtility.dll index 6774387..c0b1a2c 100644 --- a/PayM/bin/x86/Debug/DBUtility.dll +++ b/PayM/bin/x86/Debug/DBUtility.dll Binary files differ diff --git a/PayM/bin/x86/Debug/DBUtility.pdb b/PayM/bin/x86/Debug/DBUtility.pdb index e131de7..3a7bc65 100644 --- a/PayM/bin/x86/Debug/DBUtility.pdb +++ b/PayM/bin/x86/Debug/DBUtility.pdb Binary files differ diff --git a/PayM/bin/x86/Debug/Interop.gregn6Lib.dll b/PayM/bin/x86/Debug/Interop.gregn6Lib.dll index c68526f..5dda2ef 100644 --- a/PayM/bin/x86/Debug/Interop.gregn6Lib.dll +++ b/PayM/bin/x86/Debug/Interop.gregn6Lib.dll Binary files differ diff --git a/PayM/bin/x86/Debug/Model.dll b/PayM/bin/x86/Debug/Model.dll index ca7cae7..d4f2501 100644 --- a/PayM/bin/x86/Debug/Model.dll +++ b/PayM/bin/x86/Debug/Model.dll Binary files differ diff --git a/PayM/bin/x86/Debug/Model.pdb b/PayM/bin/x86/Debug/Model.pdb index 31a63c7..e36dc83 100644 --- a/PayM/bin/x86/Debug/Model.pdb +++ b/PayM/bin/x86/Debug/Model.pdb Binary files differ diff --git a/PayM/bin/x86/Debug/PayM.dll b/PayM/bin/x86/Debug/PayM.dll index 5b111a8..22b47a8 100644 --- a/PayM/bin/x86/Debug/PayM.dll +++ b/PayM/bin/x86/Debug/PayM.dll Binary files differ diff --git a/PayM/bin/x86/Debug/PayM.pdb b/PayM/bin/x86/Debug/PayM.pdb index 80db55a..f248a65 100644 --- a/PayM/bin/x86/Debug/PayM.pdb +++ b/PayM/bin/x86/Debug/PayM.pdb Binary files differ diff --git a/PayM/bin/x86/Debug/Pub_Class.dll b/PayM/bin/x86/Debug/Pub_Class.dll index a3a5497..243e991 100644 --- a/PayM/bin/x86/Debug/Pub_Class.dll +++ b/PayM/bin/x86/Debug/Pub_Class.dll Binary files differ diff --git a/PayM/bin/x86/Debug/Pub_Class.pdb b/PayM/bin/x86/Debug/Pub_Class.pdb index bdc1cef..8be0fea 100644 --- a/PayM/bin/x86/Debug/Pub_Class.pdb +++ b/PayM/bin/x86/Debug/Pub_Class.pdb Binary files differ diff --git a/PayM/bin/x86/Debug/Pub_Control.dll b/PayM/bin/x86/Debug/Pub_Control.dll index 8833e58..4c74cf2 100644 --- a/PayM/bin/x86/Debug/Pub_Control.dll +++ b/PayM/bin/x86/Debug/Pub_Control.dll Binary files differ diff --git a/PayM/bin/x86/Debug/Pub_Control.pdb b/PayM/bin/x86/Debug/Pub_Control.pdb index d706f35..89b59d9 100644 --- a/PayM/bin/x86/Debug/Pub_Control.pdb +++ b/PayM/bin/x86/Debug/Pub_Control.pdb Binary files differ diff --git a/PayM/bin/x86/Debug/SQLHelper.dll b/PayM/bin/x86/Debug/SQLHelper.dll index 431638e..d3d3496 100644 --- a/PayM/bin/x86/Debug/SQLHelper.dll +++ b/PayM/bin/x86/Debug/SQLHelper.dll Binary files differ diff --git a/PayM/bin/x86/Debug/SQLHelper.pdb b/PayM/bin/x86/Debug/SQLHelper.pdb index 22ab86f..3e2df98 100644 --- a/PayM/bin/x86/Debug/SQLHelper.pdb +++ b/PayM/bin/x86/Debug/SQLHelper.pdb Binary files differ diff --git a/PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache b/PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache index eb2086c..5bd3ad3 100644 --- a/PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache +++ b/PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -08bc7f9ad52dac46a486d601aad75ab55bfbf42b +f70cb7d7ee8d88a4770a27001295562246dc2e4a diff --git a/PayM/obj/x86/Debug/PayM.csproj.FileListAbsolute.txt b/PayM/obj/x86/Debug/PayM.csproj.FileListAbsolute.txt index f424a10..4afe59a 100644 --- a/PayM/obj/x86/Debug/PayM.csproj.FileListAbsolute.txt +++ b/PayM/obj/x86/Debug/PayM.csproj.FileListAbsolute.txt @@ -817,3 +817,211 @@ D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.CopyComplete D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\PayM\obj\x86\Debug\PayM.dll D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\PayM\obj\x86\Debug\PayM.pdb +E:\GIT浠撳簱\MES-WEB-API\PayM\bin\x86\Debug\PayM.dll +E:\GIT浠撳簱\MES-WEB-API\PayM\bin\x86\Debug\PayM.pdb +E:\GIT浠撳簱\MES-WEB-API\PayM\bin\x86\Debug\BLL.dll +E:\GIT浠撳簱\MES-WEB-API\PayM\bin\x86\Debug\DAL.dll +E:\GIT浠撳簱\MES-WEB-API\PayM\bin\x86\Debug\DBUtility.dll +E:\GIT浠撳簱\MES-WEB-API\PayM\bin\x86\Debug\Model.dll +E:\GIT浠撳簱\MES-WEB-API\PayM\bin\x86\Debug\Pub_Class.dll +E:\GIT浠撳簱\MES-WEB-API\PayM\bin\x86\Debug\Pub_Control.dll +E:\GIT浠撳簱\MES-WEB-API\PayM\bin\x86\Debug\SQLHelper.dll +E:\GIT浠撳簱\MES-WEB-API\PayM\bin\x86\Debug\Kingdee.BOS.WebApi.Client.dll +E:\GIT浠撳簱\MES-WEB-API\PayM\bin\x86\Debug\Newtonsoft.Json.dll +E:\GIT浠撳簱\MES-WEB-API\PayM\bin\x86\Debug\BLL.pdb +E:\GIT浠撳簱\MES-WEB-API\PayM\bin\x86\Debug\DAL.pdb +E:\GIT浠撳簱\MES-WEB-API\PayM\bin\x86\Debug\DBUtility.pdb +E:\GIT浠撳簱\MES-WEB-API\PayM\bin\x86\Debug\Model.pdb +E:\GIT浠撳簱\MES-WEB-API\PayM\bin\x86\Debug\Pub_Class.pdb +E:\GIT浠撳簱\MES-WEB-API\PayM\bin\x86\Debug\Pub_Control.pdb +E:\GIT浠撳簱\MES-WEB-API\PayM\bin\x86\Debug\SQLHelper.pdb +E:\GIT浠撳簱\MES-WEB-API\PayM\bin\x86\Debug\Interop.gregn6Lib.dll +E:\GIT浠撳簱\MES-WEB-API\PayM\bin\x86\Debug\AxInterop.gregn6Lib.dll +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.csprojAssemblyReference.cache +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\Interop.gregn6Lib.dll +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\AxInterop.gregn6Lib.dll +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.ResolveComReference.cache +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Form2.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_ContractBookBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_ContractBookBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpChangeBillQuery.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpUpChangeBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpUpChangeBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_FamilyMemberBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_FamilyMemberBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_InsuranceBookBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_InsuranceBookBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_LearnHistoryBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_LearnHistoryBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_PaperPhotoBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_PaperPhotoBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_RewardsPunishBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_RewardsPunishBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_WorkInjuryBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_WorkInjuryBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_WorkSkillBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_WorkSkillBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_WorkStoryBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_WorkStoryBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpFosterBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpFosterBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.FrmChangeDate.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_AbsentBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_AbsentBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_DuSubsidyItemBillQuery.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_DuSubsidyItemBill_KS.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EarlyLateErrBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EarlyLateErrBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EmpInitChangeBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EmpInitChangeBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ErrWorkTimesSendBillQuery.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_GroupBalBillQuery.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthICMOStockSumBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthICMOStockSumBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OtherBalBillQuery.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OutApplyBillQuery.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OverApplyBillQuery.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\HuanXin.ERP.Pay_PayMentBillListDlg.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\HuanXin.ERP.Pay_PayMentBillListUnPayDlg.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentBillQuery.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMent_QC.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMent_QCAdd.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProcPriceRequestBillQuery.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_RewardPunishBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_RewardPunishBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillList_KS.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillQuery.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBill_Enter.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBill_KS.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBill_YR.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SumBalBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SumBalBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SumBalBill_JS.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkErrTimesBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkErrTimesBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesBillQuery.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesSumQueryBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesSumQueryBillListDlg.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OutForComApplyBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OutForComApplyBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentBillReport.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentBillReportDlg.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillEntryReport.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillEntryReportDlg.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillSumReport.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillSumReportDlg.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesPayMentEntryReport.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesPayMentEntryReportDlg.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesPayMentSumReport.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesPayMentSumReportDlg.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthSubsidyYearReport.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_YearToCashBillReport.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_YearToCashBillReportDlg.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Properties.Resources.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpDimissionBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpDimissionBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\OAM.HR_EmpEngageRequestBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\OAM.HR_EmpEngageRequestBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_CarOutApplyBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_CarOutApplyBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_PayMentBillAutoAddnew.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_PayMentBillAutoAddnew1.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_PayMentBillAutoAddnew2.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_PayMentBillAutoAddnew3.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_PayMentBillAutoAddnew4.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_PayMentBillAutoAddnew5.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\BaseSet.Gy_DataInTmp_DuSubsidyItem.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_DuSubsidyItemBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_DuSubsidyItemBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ErrWorkTimesRequestBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ErrWorkTimesRequestBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ErrWorkTimesSendBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ErrWorkTimesSendBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_GetNeedCheckErrWorkTimesSendBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OtherMoney_Dlg.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpChangeBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpChangeBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_GroupBalBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_GroupBalBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentDayBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentDayBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProcPriceRequestBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProcPriceRequestBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OtherBalBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OtherBalBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OutApplyBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OutApplyBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OverApplyBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OverApplyBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillDlg.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SubsidyChangeBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SubsidyChangeBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EmpPayMentSumReport.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EmpPayMentSumReportDlg.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EmpWorkQtyEntryReport.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EmpWorkQtyEntryReportDlg.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_InnerScrap.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_InnerScrapDlg.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OuterScrap.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OuterScrapDlg.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentDeptSendList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentDeptSendListDlg.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentDeptYearReport.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentDeptYearReportDlg.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentPrintReport.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentPrintReportDlg.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentSendList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentSendListDlg.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentYearReport.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentYearReportDlg.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProdWorkQtyEntryReport.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProdWorkQtyEntryReportDlg.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProdWorkQtySumReport.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProdWorkQtySumReportDlg.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesListDlg.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthWriteBillReportMX.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthWriteBillReportMX2.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Err_MonthExpenseEntryBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Err_MonthExpenseEntryBillDlg.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.KQ_sourceReport.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.KQ_sourceReportDlg.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthSubsidyEntryBillAdd.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthSubsidyEntryBillReportMX.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_NoWorkTimesReport.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_NoWorkTimesReportDlg.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_AccPayMentDayBill.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_AccPayMentDayBill2.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_AccPayMentDayBill3.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_AccPayMentDayBill4.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_AccPayMentDayBill5.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_AccPayMentDayBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBill1.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBill2.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBill3.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBill4.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBill5.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBillReport.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBillReportDlg.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthSubsidyEntryBillReport.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthSubsidyEntryBillReportDlg.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthWriteBillReport.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthWriteBillReportDlg.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesCardBill1.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesCardBill2.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesCardBill3.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesCardBill4.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesCardBill5.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesCardBillList.resources +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.GenerateResource.cache +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.CoreCompileInputs.cache +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.CopyComplete +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.dll +E:\GIT浠撳簱\MES-WEB-API\PayM\obj\x86\Debug\PayM.pdb diff --git a/PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cache b/PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cache index b13d27f..c5d9e08 100644 --- a/PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cache +++ b/PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cache Binary files differ diff --git a/PayM/obj/x86/Debug/PayM.csproj.ResolveComReference.cache b/PayM/obj/x86/Debug/PayM.csproj.ResolveComReference.cache index f604818..2fcf564 100644 --- a/PayM/obj/x86/Debug/PayM.csproj.ResolveComReference.cache +++ b/PayM/obj/x86/Debug/PayM.csproj.ResolveComReference.cache Binary files differ diff --git a/PayM/obj/x86/Debug/PayM.csprojAssemblyReference.cache b/PayM/obj/x86/Debug/PayM.csprojAssemblyReference.cache index 61ffd8f..74f14fb 100644 --- a/PayM/obj/x86/Debug/PayM.csprojAssemblyReference.cache +++ b/PayM/obj/x86/Debug/PayM.csprojAssemblyReference.cache Binary files differ diff --git a/PayM/obj/x86/Debug/PayM.dll b/PayM/obj/x86/Debug/PayM.dll index 5b111a8..22b47a8 100644 --- a/PayM/obj/x86/Debug/PayM.dll +++ b/PayM/obj/x86/Debug/PayM.dll Binary files differ diff --git a/PayM/obj/x86/Debug/PayM.pdb b/PayM/obj/x86/Debug/PayM.pdb index 80db55a..f248a65 100644 --- a/PayM/obj/x86/Debug/PayM.pdb +++ b/PayM/obj/x86/Debug/PayM.pdb Binary files differ diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs index a47a8de..83a5456 100644 --- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs +++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs @@ -85,27 +85,53 @@ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++) { - // 外购退料单 - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_AutoCheck") + //WMS条码 系统参数 + //生产汇报单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_AutoCheck") { - omodel.Kf_POStockInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Sc_ICMOReportBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_ERPMode") + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_ERPMode") { - omodel.Kf_POStockInBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Sc_ICMOReportBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_MustQtyCtl") + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_MustQtyCtl") { - omodel.Kf_POStockInBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Sc_ICMOReportBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_MulSourceBill") + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_MulSourceBill") { - omodel.Kf_POStockInBackBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Sc_ICMOReportBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_BillTypeOneScan") + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_BillTypeOneScan") { - omodel.Kf_POStockInBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Sc_ICMOReportBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_SourceBillCtl") + { + omodel.Sc_ICMOReportBill_SourceBillCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_BatchNoCtl") + { + omodel.Sc_ICMOReportBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_MultilineCtl") + { + omodel.Sc_ICMOReportBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_MaterWHSPCtl") + { + omodel.Sc_ICMOReportBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_SourceWHSPCtl") + { + omodel.Sc_ICMOReportBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_UpdateSourceInterID") + { + omodel.Sc_ICMOReportBill_UpdateSourceInterID = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //采购入库单 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_AutoCheck") { @@ -127,84 +153,27 @@ { omodel.Kf_POStockInBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_BarCodeMustSameSourceBill") + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_SourceBillCtl") { - omodel.Kf_POStockInBill_BarCodeMustSameSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Kf_POStockInBill_SourceBillCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - //领料单 - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_AutoCheck") + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_BatchNoCtl") { - omodel.Kf_MateOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Kf_POStockInBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_ERPMode") + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_MultilineCtl") { - omodel.Kf_MateOutBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Kf_POStockInBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_MustQtyCtl") + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_MaterWHSPCtl") { - omodel.Kf_MateOutBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Kf_POStockInBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_MulSourceBill") + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_SourceWHSPCtl") { - omodel.Kf_MateOutBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Kf_POStockInBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_BillTypeOneScan") - { - omodel.Kf_MateOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_FIFOList") //先进先出下架清单 - { - omodel.Kf_MateOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_FIFOCtl") //先进先出控制 - { - omodel.Kf_MateOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_AutoBarCode") //非唯一条码,免扫码 - { - omodel.Kf_MateOutBill_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_SimpleMode") //简洁模式,只显示已扫码源单记录 - { - omodel.Kf_MateOutBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_MustQtyCtl") - { - omodel.Kf_MateOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_WHSPCtl") //校验-是否校对仓库仓位 - { - omodel.Kf_MateOutBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_MultilineCtl") //校验-多行相同物料自动拆分换行匹配 - { - omodel.Kf_MateOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - //生产退料单 - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_AutoCheck") - { - omodel.Kf_MateOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_ERPMode") - { - omodel.Kf_MateOutBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_MustQtyCtl") - { - omodel.Kf_MateOutBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_MulSourceBill") - { - omodel.Kf_MateOutBackBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_BillTypeOneScan") - { - omodel.Kf_MateOutBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_SimpleMode") //简洁模式,只显示已扫码源单记录 - { - omodel.Kf_MateOutBackBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } + //产品入库单 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_AutoCheck") { @@ -226,189 +195,27 @@ { omodel.Kf_ProductInBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_BarCodeMustSameSourceBill") + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_SourceBillCtl") { - omodel.Kf_ProductInBill_BarCodeMustSameSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Kf_ProductInBill_SourceBillCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - //生产退库单 - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_AutoCheck") + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_BatchNoCtl") { - omodel.Kf_ProductInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Kf_ProductInBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_ERPMode") + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_MultilineCtl") { - omodel.Kf_ProductInBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Kf_ProductInBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_MustQtyCtl") + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_MaterWHSPCtl") { - omodel.Kf_ProductInBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Kf_ProductInBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_MulSourceBill") + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_SourceWHSPCtl") { - omodel.Kf_ProductInBackBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Kf_ProductInBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_BillTypeOneScan") - { - omodel.Kf_ProductInBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - //委外入库单 - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_AutoCheck") - { - omodel.Kf_EntrustInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_ERPMode") - { - omodel.Kf_EntrustInBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_MustQtyCtl") - { - omodel.Kf_EntrustInBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_MulSourceBill") - { - omodel.Kf_EntrustInBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_BillTypeOneScan") - { - omodel.Kf_EntrustInBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - //委外退库单 - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_AutoCheck") - { - omodel.Kf_EntrustInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_ERPMode") - { - omodel.Kf_EntrustInBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_MustQtyCtl") - { - omodel.Kf_EntrustInBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_MulSourceBill") - { - omodel.Kf_EntrustInBackBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_BillTypeOneScan") - { - omodel.Kf_EntrustInBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - //委外领料单 - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_AutoCheck") - { - omodel.Kf_EntrustOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_ERPMode") - { - omodel.Kf_EntrustOutBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_MustQtyCtl") - { - omodel.Kf_EntrustOutBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_MulSourceBill") - { - omodel.Kf_EntrustOutBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_BillTypeOneScan") - { - omodel.Kf_EntrustOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_FIFOList") //先进先出下架清单 - { - omodel.Kf_EntrustOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_FIFOCtl") - { - omodel.Kf_EntrustOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_SimpleMode") //简洁模式,只显示已扫码源单记录 - { - omodel.Kf_EntrustOutBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - //委外退料单 - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_AutoCheck") - { - omodel.Kf_EntrustOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_ERPMode") - { - omodel.Kf_EntrustOutBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_MustQtyCtl") - { - omodel.Kf_EntrustOutBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_MulSourceBill") - { - omodel.Kf_EntrustOutBackBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_BillTypeOneScan") - { - omodel.Kf_EntrustOutBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_SimpleMode") - { - omodel.Kf_EntrustOutBackBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); //简洁模式,只显示已扫码源单记录 - } - //销售出库单 - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_AutoCheck") - { - omodel.Kf_SellOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_ERPMode") - { - omodel.Kf_SellOutBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_MustQtyCtl") - { - omodel.Kf_SellOutBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_MulSourceBill") - { - omodel.Kf_SellOutBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_BillTypeOneScan") - { - omodel.Kf_SellOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_FIFOList") //先进先出下架清单 - { - omodel.Kf_SellOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_FIFOCtl") - { - omodel.Kf_SellOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_AutoSavePOStockInBill") //同步生成采购入库单 - { - omodel.Kf_SellOutBill_AutoSavePOStockInBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - //销售退库单 - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_AutoCheck") - { - omodel.Kf_SellOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_ERPMode") - { - omodel.Kf_SellOutBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_MustQtyCtl") - { - omodel.Kf_SellOutBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_MulSourceBill") - { - omodel.Kf_SellOutBackBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_BillTypeOneScan") - { - omodel.Kf_SellOutBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_AutoSavePOStockInBackBill") //同步生成采购退料单 - { - omodel.Kf_SellOutBackBill_AutoSavePOStockInBackBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } + //其他入库单 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_AutoCheck") { @@ -430,10 +237,203 @@ { omodel.Kf_OtherInBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_SourceBillCtl") + { + omodel.Kf_OtherInBill_SourceBillCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_BatchNoCtl") + { + omodel.Kf_OtherInBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_MultilineCtl") + { + omodel.Kf_OtherInBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_MaterWHSPCtl") + { + omodel.Kf_OtherInBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_SourceWHSPCtl") + { + omodel.Kf_OtherInBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //其他入库单 校验 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_MustQtyCtl") { omodel.Kf_OtherInBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_WHSPCtl") + { + omodel.Kf_OtherInBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_MultilineCtl") + { + omodel.Kf_OtherInBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + + //委外入库单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_AutoCheck") + { + omodel.Kf_EntrustInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_ERPMode") + { + omodel.Kf_EntrustInBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_MustQtyCtl") + { + omodel.Kf_EntrustInBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_MulSourceBill") + { + omodel.Kf_EntrustInBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_BillTypeOneScan") + { + omodel.Kf_EntrustInBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_SourceBillCtl") + { + omodel.Kf_EntrustInBill_SourceBillCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_BatchNoCtl") + { + omodel.Kf_EntrustInBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_MultilineCtl") + { + omodel.Kf_EntrustInBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_MaterWHSPCtl") + { + omodel.Kf_EntrustInBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_SourceWHSPCtl") + { + omodel.Kf_EntrustInBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + + //生产领料单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_AutoCheck") + { + omodel.Kf_MateOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_ERPMode") + { + omodel.Kf_MateOutBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_MustQtyCtl") + { + omodel.Kf_MateOutBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_MulSourceBill") + { + omodel.Kf_MateOutBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_BillTypeOneScan") + { + omodel.Kf_MateOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_BatchNoCtl") + { + omodel.Kf_MateOutBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_MultilineCtl") + { + omodel.Kf_MateOutBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_MaterWHSPCtl") + { + omodel.Kf_MateOutBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_SourceWHSPCtl") + { + omodel.Kf_MateOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_FIFOList") + { + omodel.Kf_MateOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_FIFOCtl") + { + omodel.Kf_MateOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_SimpleMode") + { + omodel.Kf_MateOutBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_AutoBarCode") + { + omodel.Kf_MateOutBill_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //生产领料单 校验 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_MustQtyCtl") + { + omodel.Kf_MateOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_WHSPCtl") + { + omodel.Kf_MateOutBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_MultilineCtl") + { + omodel.Kf_MateOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + + //销售出库单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_AutoCheck") + { + omodel.Kf_SellOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_ERPMode") + { + omodel.Kf_SellOutBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_MustQtyCtl") + { + omodel.Kf_SellOutBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_MulSourceBill") + { + omodel.Kf_SellOutBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_BillTypeOneScan") + { + omodel.Kf_SellOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_BatchNoCtl") + { + omodel.Kf_SellOutBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_MultilineCtl") + { + omodel.Kf_SellOutBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_MaterWHSPCtl") + { + omodel.Kf_SellOutBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_SourceWHSPCtl") + { + omodel.Kf_SellOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_FIFOList") + { + omodel.Kf_SellOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_FIFOCtl") + { + omodel.Kf_SellOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_AutoSavePOStockInBill") + { + omodel.Kf_SellOutBill_AutoSavePOStockInBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_NoRefresh") + { + omodel.Kf_SellOutBill_NoRefresh = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //其他出库单 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_AutoCheck") { @@ -447,56 +447,95 @@ { omodel.Kf_OtherOutBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_MulSourceBill") + { + omodel.Kf_OtherOutBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_BillTypeOneScan") { omodel.Kf_OtherOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_BatchNoCtl") + { + omodel.Kf_OtherOutBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_MultilineCtl") + { + omodel.Kf_OtherOutBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_MaterWHSPCtl") + { + omodel.Kf_OtherOutBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_SourceWHSPCtl") + { + omodel.Kf_OtherOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //其他出库单 校验 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_MustQtyCtl") { omodel.Kf_OtherOutBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - //调拨单 - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_AutoCheck") + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_WHSPCtl") { - omodel.Kf_MoveStockBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Kf_OtherOutBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_ERPMode") + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_MultilineCtl") { - omodel.Kf_MoveStockBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Kf_OtherOutBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_MustQtyCtl") + + //委外出库单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_AutoCheck") { - omodel.Kf_MoveStockBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Kf_EntrustOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_MulSourceBill") + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_ERPMode") { - omodel.Kf_MoveStockBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Kf_EntrustOutBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_BillTypeOneScan") + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_MustQtyCtl") { - omodel.Kf_MoveStockBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Kf_EntrustOutBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_FIFOList") //先进先出下架清单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_MulSourceBill") { - omodel.Kf_MoveStockBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Kf_EntrustOutBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_FIFOCtl") + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_BillTypeOneScan") { - omodel.Kf_MoveStockBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Kf_EntrustOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_MustQtyCtl") + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_BatchNoCtl") { - omodel.Kf_MoveStockBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Kf_EntrustOutBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_WHSPCtl") //校验-是否校对仓库仓位 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_MultilineCtl") { - omodel.Kf_MoveStockBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Kf_EntrustOutBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_MultilineCtl") //校验-多行相同物料自动拆分换行匹配 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_MaterWHSPCtl") { - omodel.Kf_MoveStockBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Kf_EntrustOutBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - //补料单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_SourceWHSPCtl") + { + omodel.Kf_EntrustOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_FIFOList") + { + omodel.Kf_EntrustOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_FIFOCtl") + { + omodel.Kf_EntrustOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_SimpleMode") + { + omodel.Kf_EntrustOutBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + + //生产补料单 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_AutoCheck") { omodel.Kf_MateReplenishOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); @@ -517,40 +556,82 @@ { omodel.Kf_MateReplenishOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - //其他入库反向 - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_AutoCheck") + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_BatchNoCtl") { - omodel.Kf_OtherInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Kf_MateReplenishOutBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_ERPMode") + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_MultilineCtl") { - omodel.Kf_OtherInBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Kf_MateReplenishOutBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_MustQtyCtl") + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_MaterWHSPCtl") { - omodel.Kf_OtherInBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Kf_MateReplenishOutBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_BillTypeOneScan") + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_SourceWHSPCtl") { - omodel.Kf_OtherInBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Kf_MateReplenishOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - //其他出库反向 - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_AutoCheck") + + //直接调拨单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_AutoCheck") { - omodel.Kf_OtherOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Kf_MoveStockBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_ERPMode") + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_ERPMode") { - omodel.Kf_OtherOutBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Kf_MoveStockBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_MustQtyCtl") + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_MustQtyCtl") { - omodel.Kf_OtherOutBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Kf_MoveStockBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_BillTypeOneScan") + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_MulSourceBill") { - omodel.Kf_OtherOutBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + omodel.Kf_MoveStockBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_BillTypeOneScan") + { + omodel.Kf_MoveStockBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_BatchNoCtl") + { + omodel.Kf_MoveStockBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_MultilineCtl") + { + omodel.Kf_MoveStockBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_MaterWHSPCtl") + { + omodel.Kf_MoveStockBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_SourceWHSPCtl") + { + omodel.Kf_MoveStockBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_FIFOList") + { + omodel.Kf_MoveStockBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_FIFOCtl") + { + omodel.Kf_MoveStockBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //直接调拨单 校验 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_MustQtyCtl") + { + omodel.Kf_MoveStockBillCheck_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_WHSPCtl") + { + omodel.Kf_MoveStockBillCheck_WHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_MultilineCtl") + { + omodel.Kf_MoveStockBillCheck_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + //分步式调出单 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_AutoCheck") { @@ -572,7 +653,23 @@ { omodel.Kf_MoveStockStepOutBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_FIFOList") //先进先出下架清单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_BatchNoCtl") + { + omodel.Kf_MoveStockStepOutBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_MultilineCtl") + { + omodel.Kf_MoveStockStepOutBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_MaterWHSPCtl") + { + omodel.Kf_MoveStockStepOutBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_SourceWHSPCtl") + { + omodel.Kf_MoveStockStepOutBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_FIFOList") { omodel.Kf_MoveStockStepOutBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } @@ -580,6 +677,7 @@ { omodel.Kf_MoveStockStepOutBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + //分步式调入单 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_AutoCheck") { @@ -601,9 +699,348 @@ { omodel.Kf_MoveStockStepInBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - //================================================= + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_BatchNoCtl") + { + omodel.Kf_MoveStockStepInBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_MultilineCtl") + { + omodel.Kf_MoveStockStepInBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_MaterWHSPCtl") + { + omodel.Kf_MoveStockStepInBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_SourceWHSPCtl") + { + omodel.Kf_MoveStockStepInBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_FIFOList") + { + omodel.Kf_MoveStockStepInBill_FIFOList = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_FIFOCtl") + { + omodel.Kf_MoveStockStepInBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } - //===============================WMS + //采购退料单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_AutoCheck") + { + omodel.Kf_POStockInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_ERPMode") + { + omodel.Kf_POStockInBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_MustQtyCtl") + { + omodel.Kf_POStockInBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_MulSourceBill") + { + omodel.Kf_POStockInBackBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_BillTypeOneScan") + { + omodel.Kf_POStockInBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_BatchNoCtl") + { + omodel.Kf_POStockInBackBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_MultilineCtl") + { + omodel.Kf_POStockInBackBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_MaterWHSPCtl") + { + omodel.Kf_POStockInBackBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_SourceWHSPCtl") + { + omodel.Kf_POStockInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + + //生产退库单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_AutoCheck") + { + omodel.Kf_ProductInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_ERPMode") + { + omodel.Kf_ProductInBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_MustQtyCtl") + { + omodel.Kf_ProductInBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_MulSourceBill") + { + omodel.Kf_ProductInBackBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_BillTypeOneScan") + { + omodel.Kf_ProductInBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_BatchNoCtl") + { + omodel.Kf_ProductInBackBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_MultilineCtl") + { + omodel.Kf_ProductInBackBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_MaterWHSPCtl") + { + omodel.Kf_ProductInBackBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_SourceWHSPCtl") + { + omodel.Kf_ProductInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + + //其他入库红字 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_AutoCheck") + { + omodel.Kf_OtherInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_ERPMode") + { + omodel.Kf_OtherInBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_MustQtyCtl") + { + omodel.Kf_OtherInBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_MulSourceBill") + { + omodel.Kf_OtherInBackBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_BillTypeOneScan") + { + omodel.Kf_OtherInBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_BatchNoCtl") + { + omodel.Kf_OtherInBackBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_MultilineCtl") + { + omodel.Kf_OtherInBackBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_MaterWHSPCtl") + { + omodel.Kf_OtherInBackBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_SourceWHSPCtl") + { + omodel.Kf_OtherInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + + //委外退库单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_AutoCheck") + { + omodel.Kf_EntrustInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_ERPMode") + { + omodel.Kf_EntrustInBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_MustQtyCtl") + { + omodel.Kf_EntrustInBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_MulSourceBill") + { + omodel.Kf_EntrustInBackBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_BillTypeOneScan") + { + omodel.Kf_EntrustInBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_BatchNoCtl") + { + omodel.Kf_EntrustInBackBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_MultilineCtl") + { + omodel.Kf_EntrustInBackBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_MaterWHSPCtl") + { + omodel.Kf_EntrustInBackBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_SourceWHSPCtl") + { + omodel.Kf_EntrustInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + + //生产退料单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_AutoCheck") + { + omodel.Kf_MateOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_ERPMode") + { + omodel.Kf_MateOutBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_MustQtyCtl") + { + omodel.Kf_MateOutBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_MulSourceBill") + { + omodel.Kf_MateOutBackBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_BillTypeOneScan") + { + omodel.Kf_MateOutBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_BatchNoCtl") + { + omodel.Kf_MateOutBackBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_MultilineCtl") + { + omodel.Kf_MateOutBackBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_MaterWHSPCtl") + { + omodel.Kf_MateOutBackBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_SourceWHSPCtl") + { + omodel.Kf_MateOutBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_SimpleMode") + { + omodel.Kf_MateOutBackBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + + //销售退库单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_AutoCheck") + { + omodel.Kf_SellOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_ERPMode") + { + omodel.Kf_SellOutBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_MustQtyCtl") + { + omodel.Kf_SellOutBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_MulSourceBill") + { + omodel.Kf_SellOutBackBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_BillTypeOneScan") + { + omodel.Kf_SellOutBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_BatchNoCtl") + { + omodel.Kf_SellOutBackBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_MultilineCtl") + { + omodel.Kf_SellOutBackBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_MaterWHSPCtl") + { + omodel.Kf_SellOutBackBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_SourceWHSPCtl") + { + omodel.Kf_SellOutBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_AutoSavePOStockInBackBill") + { + omodel.Kf_SellOutBackBill_AutoSavePOStockInBackBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + + //其他出库红字 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_AutoCheck") + { + omodel.Kf_OtherOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_ERPMode") + { + omodel.Kf_OtherOutBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_MustQtyCtl") + { + omodel.Kf_OtherOutBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_MulSourceBill") + { + omodel.Kf_OtherOutBackBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_BillTypeOneScan") + { + omodel.Kf_OtherOutBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_BatchNoCtl") + { + omodel.Kf_OtherOutBackBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_MultilineCtl") + { + omodel.Kf_OtherOutBackBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_MaterWHSPCtl") + { + omodel.Kf_OtherOutBackBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_SourceWHSPCtl") + { + omodel.Kf_OtherOutBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + + //委外退料单 + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_AutoCheck") + { + omodel.Kf_EntrustOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_ERPMode") + { + omodel.Kf_EntrustOutBackBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_MustQtyCtl") + { + omodel.Kf_EntrustOutBackBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_MulSourceBill") + { + omodel.Kf_EntrustOutBackBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_BillTypeOneScan") + { + omodel.Kf_EntrustOutBackBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_BatchNoCtl") + { + omodel.Kf_EntrustOutBackBill_BatchNoCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_MultilineCtl") + { + omodel.Kf_EntrustOutBackBill_MultilineCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_MaterWHSPCtl") + { + omodel.Kf_EntrustOutBackBill_MaterWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_SourceWHSPCtl") + { + omodel.Kf_EntrustOutBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_SimpleMode") + { + omodel.Kf_EntrustOutBackBill_SimpleMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); + } + + //WMS 通用 //库存控制-ERP负库存控制 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "WMS_ERPStockCtl") { @@ -665,8 +1102,7 @@ omodel.WMS_MouldManagerCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - //===================================MES - //-======桌面条码模块 + //桌面条码模块 //有源单生成条码,生成条码数量可否超源单数量控制 if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "BarCode_SourceQtyCtl") { @@ -687,6 +1123,8 @@ { omodel.BarCode_UpdatePrintQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } + + //============================================================================================== //-======进站单 //先进先出 @@ -798,36 +1236,6 @@ omodel.MES_StationEntrustOutBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } - //==========生产汇报单 - //自动审核 - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_AutoCheck") - { - omodel.Sc_ICMOReportBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_BillTypeOneScan") - { - omodel.Sc_ICMOReportBill_BillTypeOneScan = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - //ERP模式 - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_ERPMode") - { - omodel.Sc_ICMOReportBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - // - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_MustQtyCtl") - { - omodel.Sc_ICMOReportBill_MustQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - // 多源单模式 - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_MulSourceBill") - { - omodel.Sc_ICMOReportBill_MulSourceBill = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } - // 覆盖源单内码 - if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_UpdateSourceInterID") - { - omodel.Sc_ICMOReportBill_UpdateSourceInterID = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); - } //=======JIT diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs index cc45b85..bcef5d2 100644 --- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs +++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs @@ -6,163 +6,282 @@ { public class ClsXt_SystemParameterMain { + //WMS条码 系统参数 + + //生产汇报单 + public string Sc_ICMOReportBill_AutoCheck; //是否自动审核 + public string Sc_ICMOReportBill_ERPMode; //WMS系统同步至ERP的类型(WISE、CLOUD) + public string Sc_ICMOReportBill_MustQtyCtl; //应收数量控制(小于等于应收、完全等于应收、不控制) + public string Sc_ICMOReportBill_MulSourceBill; //多源单模式 + public string Sc_ICMOReportBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表) + public string Sc_ICMOReportBill_SourceBillCtl; //是否进行源单信息核对('Y'为核对源单信息) + public string Sc_ICMOReportBill_BatchNoCtl; //是否进行批号核对('Y'为核对批号) + public string Sc_ICMOReportBill_MultilineCtl; //是否存在多行相同物料时自动拆分换行('Y'为自动拆分) + public string Sc_ICMOReportBill_MaterWHSPCtl; //是否取物料默认仓库仓位('Y'为是) + public string Sc_ICMOReportBill_SourceWHSPCtl; //是否取源单中仓库仓位('Y'为是) + public string Sc_ICMOReportBill_UpdateSourceInterID; //上传后回填条码档案源单信息 + //采购入库 - public string Kf_POStockInBill_AutoCheck; - public string Kf_POStockInBill_ERPMode; - public string Kf_POStockInBill_MustQtyCtl; - public string Kf_POStockInBill_BarCodeMustSameSourceBill; // 条码必须同源单一致(唯一码时:条码档案的源单主内码和子内码 ,必须和扫码入库时的源单主内码子内码一致) - public string Kf_POStockInBill_MulSourceBill; //多源单模式 - public string Kf_POStockInBill_BillTypeOneScan;//本单据类型内只允许一次扫码(唯一码,含缓存列表) - //采购退料 - public string Kf_POStockInBackBill_AutoCheck; - public string Kf_POStockInBackBill_ERPMode; - public string Kf_POStockInBackBill_MustQtyCtl; - public string Kf_POStockInBackBill_MulSourceBill; //多源单模式 - public string Kf_POStockInBackBill_BillTypeOneScan;//本单据类型内只允许一次扫码(唯一码,含缓存列表) - //领料 - public string Kf_MateOutBill_AutoCheck; - public string Kf_MateOutBill_ERPMode; - public string Kf_MateOutBill_MustQtyCtl; - public string Kf_MateOutBill_FIFOList; //先进先出下架清单 - public string Kf_MateOutBill_FIFOCtl; //先进先出控制 - public string Kf_MateOutBill_AutoBarCode; //免扫码模式, 不需要扫码物料条码自动写入临时表(只支持品种码) - public string Kf_MateOutBill_MulSourceBill; //多源单模式 - public string Kf_MateOutBill_SimpleMode; //简洁模式(不显示源单列表,只显示扫码记录,但后台仍控制) - public string Kf_MateOutBill_BillTypeOneScan;//本单据类型内只允许一次扫码(唯一码,含缓存列表) - public string Kf_MateOutBillCheck_MustQtyCtl; //校验数量控制 - public string Kf_MateOutBillCheck_WHSPCtl; //校验-是否校对仓库仓位 - public string Kf_MateOutBillCheck_MultilineCtl; //校验-多行相同物料自动拆分换行匹配 - //生产退料 - public string Kf_MateOutBackBill_AutoCheck; - public string Kf_MateOutBackBill_ERPMode; - public string Kf_MateOutBackBill_MustQtyCtl; - public string Kf_MateOutBackBill_MulSourceBill; //多源单模式 - public string Kf_MateOutBackBill_SimpleMode; //简洁模式(不显示源单列表,只显示扫码记录,但后台仍控制) - public string Kf_MateOutBackBill_BillTypeOneScan;//本单据类型内只允许一次扫码(唯一码,含缓存列表) + public string Kf_POStockInBill_AutoCheck; //是否自动审核 + public string Kf_POStockInBill_ERPMode; //WMS系统同步至ERP的类型(WISE、CLOUD) + public string Kf_POStockInBill_MustQtyCtl; //应收数量控制(小于等于应收、完全等于应收、不控制) + public string Kf_POStockInBill_MulSourceBill; //多源单模式 + public string Kf_POStockInBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表) + public string Kf_POStockInBill_SourceBillCtl; //是否进行源单信息核对('Y'为核对源单信息) + public string Kf_POStockInBill_BatchNoCtl; //是否进行批号核对('Y'为核对批号) + public string Kf_POStockInBill_MultilineCtl; //是否存在多行相同物料时自动拆分换行('Y'为自动拆分) + public string Kf_POStockInBill_MaterWHSPCtl; //是否取物料默认仓库仓位('Y'为是) + public string Kf_POStockInBill_SourceWHSPCtl; //是否取源单中仓库仓位('Y'为是) + //产品入库 - public string Kf_ProductInBill_AutoCheck; - public string Kf_ProductInBill_ERPMode; - public string Kf_ProductInBill_MustQtyCtl; - public string Kf_ProductInBill_MulSourceBill; //多源单模式 - public string Kf_ProductInBill_BarCodeMustSameSourceBill; // 条码必须同源单一致(唯一码时:条码档案的源单主内码和子内码 ,必须和扫码入库时的源单主内码子内码一致;扫码生成的汇报为源单时,必须扫码汇报单上扫码过的条码,否则报错) - public string Kf_ProductInBill_BillTypeOneScan;//本单据类型内只允许一次扫码(唯一码,含缓存列表) - //产品退库 - public string Kf_ProductInBackBill_AutoCheck; - public string Kf_ProductInBackBill_ERPMode; - public string Kf_ProductInBackBill_MustQtyCtl; - public string Kf_ProductInBackBill_MulSourceBill; //多源单模式 - public string Kf_ProductInBackBill_BillTypeOneScan;//本单据类型内只允许一次扫码(唯一码,含缓存列表) - //委外入库 - public string Kf_EntrustInBill_AutoCheck; - public string Kf_EntrustInBill_ERPMode; - public string Kf_EntrustInBill_MustQtyCtl; - public string Kf_EntrustInBill_MulSourceBill; //多源单模式 - public string Kf_EntrustInBill_BillTypeOneScan;//本单据类型内只允许一次扫码(唯一码,含缓存列表) - //委外入库退库 - public string Kf_EntrustInBackBill_AutoCheck; - public string Kf_EntrustInBackBill_ERPMode; - public string Kf_EntrustInBackBill_MustQtyCtl; - public string Kf_EntrustInBackBill_MulSourceBill; //多源单模式 - public string Kf_EntrustInBackBill_BillTypeOneScan;//本单据类型内只允许一次扫码(唯一码,含缓存列表) - //委外出库 - public string Kf_EntrustOutBill_AutoCheck; - public string Kf_EntrustOutBill_ERPMode; - public string Kf_EntrustOutBill_MustQtyCtl; - public string Kf_EntrustOutBill_FIFOList; //先进先出下架清单 - public string Kf_EntrustOutBill_FIFOCtl; //先进先出控制 - public string Kf_EntrustOutBill_MulSourceBill; //多源单模式 - public string Kf_EntrustOutBill_SimpleMode; //简洁模式(不显示源单列表,只显示扫码记录,但后台仍控制) - public string Kf_EntrustOutBill_BillTypeOneScan;//本单据类型内只允许一次扫码(唯一码,含缓存列表) - //委外出库退料 - public string Kf_EntrustOutBackBill_AutoCheck; - public string Kf_EntrustOutBackBill_ERPMode; - public string Kf_EntrustOutBackBill_MustQtyCtl; - public string Kf_EntrustOutBackBill_MulSourceBill; //多源单模式 - public string Kf_EntrustOutBackBill_SimpleMode; //简洁模式(不显示源单列表,只显示扫码记录,但后台仍控制) - public string Kf_EntrustOutBackBill_BillTypeOneScan;//本单据类型内只允许一次扫码(唯一码,含缓存列表) - //销售出库 - public string Kf_SellOutBill_AutoCheck; - public string Kf_SellOutBill_ERPMode; - public string Kf_SellOutBill_MustQtyCtl; - public string Kf_SellOutBill_FIFOList; //先进先出下架清单 - public string Kf_SellOutBill_FIFOCtl; //先进先出控制 - public string Kf_SellOutBill_MulSourceBill; //多源单模式 - public string Kf_SellOutBill_AutoSavePOStockInBill; //同步生成采购入库单 - public string Kf_SellOutBill_NoRefresh; //PDA不自动刷新 - public string Kf_SellOutBill_BillTypeOneScan;//本单据类型内只允许一次扫码(唯一码,含缓存列表) - //销售退库 - public string Kf_SellOutBackBill_AutoCheck; - public string Kf_SellOutBackBill_ERPMode; - public string Kf_SellOutBackBill_MustQtyCtl; - public string Kf_SellOutBackBill_MulSourceBill; //多源单模式 - public string Kf_SellOutBackBill_AutoSavePOStockInBackBill; //同步生成采购入库单红字 - public string Kf_SellOutBackBill_BillTypeOneScan;//本单据类型内只允许一次扫码(唯一码,含缓存列表) + public string Kf_ProductInBill_AutoCheck; //是否自动审核 + public string Kf_ProductInBill_ERPMode; //WMS系统同步至ERP的类型(WISE、CLOUD) + public string Kf_ProductInBill_MustQtyCtl; //应收数量控制(小于等于应收、完全等于应收、不控制) + public string Kf_ProductInBill_MulSourceBill; //多源单模式 + public string Kf_ProductInBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表) + public string Kf_ProductInBill_SourceBillCtl; //是否进行源单信息核对('Y'为核对源单信息) + public string Kf_ProductInBill_BatchNoCtl; //是否进行批号核对('Y'为核对批号) + public string Kf_ProductInBill_MultilineCtl; //是否存在多行相同物料时自动拆分换行('Y'为自动拆分) + public string Kf_ProductInBill_MaterWHSPCtl; //是否取物料默认仓库仓位('Y'为是) + public string Kf_ProductInBill_SourceWHSPCtl; //是否取源单中仓库仓位('Y'为是) + //其他入库 - public string Kf_OtherInBill_AutoCheck; - public string Kf_OtherInBill_ERPMode; - public string Kf_OtherInBill_MustQtyCtl; - public string Kf_OtherInBill_MulSourceBill; //多源单模式 - public string Kf_OtherInBill_BarCodeMustSameSourceBill; // 条码必须同源单一致 - public string Kf_OtherInBill_BillTypeOneScan;//本单据类型内只允许一次扫码(唯一码,含缓存列表) + public string Kf_OtherInBill_AutoCheck; //是否自动审核 + public string Kf_OtherInBill_ERPMode; //WMS系统同步至ERP的类型(WISE、CLOUD) + public string Kf_OtherInBill_MustQtyCtl; //应收数量控制(小于等于应收、完全等于应收、不控制) + public string Kf_OtherInBill_MulSourceBill; //多源单模式 + public string Kf_OtherInBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表) + public string Kf_OtherInBill_SourceBillCtl; //是否进行源单信息核对('Y'为核对源单信息) + public string Kf_OtherInBill_BatchNoCtl; //是否进行批号核对('Y'为核对批号) + public string Kf_OtherInBill_MultilineCtl; //是否存在多行相同物料时自动拆分换行('Y'为自动拆分) + public string Kf_OtherInBill_MaterWHSPCtl; //是否取物料默认仓库仓位('Y'为是) + public string Kf_OtherInBill_SourceWHSPCtl; //是否取源单中仓库仓位('Y'为是) + //其他入库 校验 public string Kf_OtherInBillCheck_MustQtyCtl; //校验数量控制 + public string Kf_OtherInBillCheck_WHSPCtl; //校验-是否校对仓库仓位 + public string Kf_OtherInBillCheck_MultilineCtl; //校验-多行相同物料自动拆分换行匹配 + + //委外入库 + public string Kf_EntrustInBill_AutoCheck; //是否自动审核 + public string Kf_EntrustInBill_ERPMode; //WMS系统同步至ERP的类型(WISE、CLOUD) + public string Kf_EntrustInBill_MustQtyCtl; //应收数量控制(小于等于应收、完全等于应收、不控制) + public string Kf_EntrustInBill_MulSourceBill; //多源单模式 + public string Kf_EntrustInBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表) + public string Kf_EntrustInBill_SourceBillCtl; //是否进行源单信息核对('Y'为核对源单信息) + public string Kf_EntrustInBill_BatchNoCtl; //是否进行批号核对('Y'为核对批号) + public string Kf_EntrustInBill_MultilineCtl; //是否存在多行相同物料时自动拆分换行('Y'为自动拆分) + public string Kf_EntrustInBill_MaterWHSPCtl; //是否取物料默认仓库仓位('Y'为是) + public string Kf_EntrustInBill_SourceWHSPCtl; //是否取源单中仓库仓位('Y'为是) + + //生产领料 + public string Kf_MateOutBill_AutoCheck; //是否自动审核 + public string Kf_MateOutBill_ERPMode; //WMS系统同步至ERP的类型(WISE、CLOUD) + public string Kf_MateOutBill_MustQtyCtl; //应收数量控制(小于等于应收、完全等于应收、不控制) + public string Kf_MateOutBill_MulSourceBill; //多源单模式 + public string Kf_MateOutBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表) + public string Kf_MateOutBill_BatchNoCtl; //是否进行批号核对('Y'为核对批号) + public string Kf_MateOutBill_MultilineCtl; //是否存在多行相同物料时自动拆分换行('Y'为自动拆分) + public string Kf_MateOutBill_MaterWHSPCtl; //是否取物料默认仓库仓位('Y'为是) + public string Kf_MateOutBill_SourceWHSPCtl; //是否取源单中仓库仓位('Y'为是) + public string Kf_MateOutBill_FIFOList; //先进先出下架清单 + public string Kf_MateOutBill_FIFOCtl; //先进先出控制 + public string Kf_MateOutBill_SimpleMode; //简洁模式(不显示源单列表,只显示扫码记录,但后台仍控制) + public string Kf_MateOutBill_AutoBarCode; //免扫码模式, 不需要扫码物料条码自动写入临时表(只支持品种码) + //生产领料 校验 + public string Kf_MateOutBillCheck_MustQtyCtl; //校验数量控制 + public string Kf_MateOutBillCheck_WHSPCtl; //校验-是否校对仓库仓位 + public string Kf_MateOutBillCheck_MultilineCtl; //校验-多行相同物料自动拆分换行匹配 + + //销售出库 + public string Kf_SellOutBill_AutoCheck; //是否自动审核 + public string Kf_SellOutBill_ERPMode; //WMS系统同步至ERP的类型(WISE、CLOUD) + public string Kf_SellOutBill_MustQtyCtl; //应收数量控制(小于等于应收、完全等于应收、不控制) + public string Kf_SellOutBill_MulSourceBill; //多源单模式 + public string Kf_SellOutBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表) + public string Kf_SellOutBill_BatchNoCtl; //是否进行批号核对('Y'为核对批号) + public string Kf_SellOutBill_MultilineCtl; //是否存在多行相同物料时自动拆分换行('Y'为自动拆分) + public string Kf_SellOutBill_MaterWHSPCtl; //是否取物料默认仓库仓位('Y'为是) + public string Kf_SellOutBill_SourceWHSPCtl; //是否取源单中仓库仓位('Y'为是) + public string Kf_SellOutBill_FIFOList; //先进先出下架清单 + public string Kf_SellOutBill_FIFOCtl; //先进先出控制 + public string Kf_SellOutBill_AutoSavePOStockInBill; //同步生成采购入库单 + public string Kf_SellOutBill_NoRefresh; //PDA不自动刷新 + //其他出库 - public string Kf_OtherOutBill_AutoCheck; - public string Kf_OtherOutBill_ERPMode; - public string Kf_OtherOutBill_MustQtyCtl; - public string Kf_OtherOutBill_BarCodeMustSameSourceBill; // 条码必须同源单一致 - public string Kf_OtherOutBill_BillTypeOneScan;//本单据类型内只允许一次扫码(唯一码,含缓存列表) + public string Kf_OtherOutBill_AutoCheck; //是否自动审核 + public string Kf_OtherOutBill_ERPMode; //WMS系统同步至ERP的类型(WISE、CLOUD) + public string Kf_OtherOutBill_MustQtyCtl; //应收数量控制(小于等于应收、完全等于应收、不控制) + public string Kf_OtherOutBill_MulSourceBill; //多源单模式 + public string Kf_OtherOutBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表) + public string Kf_OtherOutBill_BatchNoCtl; //是否进行批号核对('Y'为核对批号) + public string Kf_OtherOutBill_MultilineCtl; //是否存在多行相同物料时自动拆分换行('Y'为自动拆分) + public string Kf_OtherOutBill_MaterWHSPCtl; //是否取物料默认仓库仓位('Y'为是) + public string Kf_OtherOutBill_SourceWHSPCtl; //是否取源单中仓库仓位('Y'为是) + //其他出库 校验 public string Kf_OtherOutBillCheck_MustQtyCtl; //校验数量控制 + public string Kf_OtherOutBillCheck_WHSPCtl; //校验-是否校对仓库仓位 + public string Kf_OtherOutBillCheck_MultilineCtl; //校验-多行相同物料自动拆分换行匹配 + + //委外出库 + public string Kf_EntrustOutBill_AutoCheck; //是否自动审核 + public string Kf_EntrustOutBill_ERPMode; //WMS系统同步至ERP的类型(WISE、CLOUD) + public string Kf_EntrustOutBill_MustQtyCtl; //应收数量控制(小于等于应收、完全等于应收、不控制) + public string Kf_EntrustOutBill_MulSourceBill; //多源单模式 + public string Kf_EntrustOutBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表) + public string Kf_EntrustOutBill_BatchNoCtl; //是否进行批号核对('Y'为核对批号) + public string Kf_EntrustOutBill_MultilineCtl; //是否存在多行相同物料时自动拆分换行('Y'为自动拆分) + public string Kf_EntrustOutBill_MaterWHSPCtl; //是否取物料默认仓库仓位('Y'为是) + public string Kf_EntrustOutBill_SourceWHSPCtl; //是否取源单中仓库仓位('Y'为是) + public string Kf_EntrustOutBill_FIFOList; //先进先出下架清单 + public string Kf_EntrustOutBill_FIFOCtl; //先进先出控制 + public string Kf_EntrustOutBill_SimpleMode; //简洁模式(不显示源单列表,只显示扫码记录,但后台仍控制) + + //生产补料 + public string Kf_MateReplenishOutBill_AutoCheck; //是否自动审核 + public string Kf_MateReplenishOutBill_ERPMode; //WMS系统同步至ERP的类型(WISE、CLOUD) + public string Kf_MateReplenishOutBill_MustQtyCtl; //应收数量控制(小于等于应收、完全等于应收、不控制) + public string Kf_MateReplenishOutBill_MulSourceBill; //多源单模式 + public string Kf_MateReplenishOutBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表) + public string Kf_MateReplenishOutBill_BatchNoCtl; //是否进行批号核对('Y'为核对批号) + public string Kf_MateReplenishOutBill_MultilineCtl; //是否存在多行相同物料时自动拆分换行('Y'为自动拆分) + public string Kf_MateReplenishOutBill_MaterWHSPCtl; //是否取物料默认仓库仓位('Y'为是) + public string Kf_MateReplenishOutBill_SourceWHSPCtl; //是否取源单中仓库仓位('Y'为是) + //直接调拨 - public string Kf_MoveStockBill_AutoCheck; - public string Kf_MoveStockBill_ERPMode; - public string Kf_MoveStockBill_MustQtyCtl; + public string Kf_MoveStockBill_AutoCheck; //是否自动审核 + public string Kf_MoveStockBill_ERPMode; //WMS系统同步至ERP的类型(WISE、CLOUD) + public string Kf_MoveStockBill_MustQtyCtl; //应收数量控制(小于等于应收、完全等于应收、不控制) + public string Kf_MoveStockBill_MulSourceBill; //多源单模式 + public string Kf_MoveStockBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表) + public string Kf_MoveStockBill_BatchNoCtl; //是否进行批号核对('Y'为核对批号) + public string Kf_MoveStockBill_MultilineCtl; //是否存在多行相同物料时自动拆分换行('Y'为自动拆分) + public string Kf_MoveStockBill_MaterWHSPCtl; //是否取物料默认仓库仓位('Y'为是) + public string Kf_MoveStockBill_SourceWHSPCtl; //是否取源单中仓库仓位('Y'为是) public string Kf_MoveStockBill_FIFOList; //先进先出下架清单 public string Kf_MoveStockBill_FIFOCtl; //先进先出控制 - public string Kf_MoveStockBill_MulSourceBill; //多源单模式 - public string Kf_MoveStockBill_BarCodeMustSameSourceBill; // 条码必须同源单一致 - public string Kf_MoveStockBill_BillTypeOneScan;//本单据类型内只允许一次扫码(唯一码,含缓存列表) - public string Kf_MoveStockBillCheck_MustQtyCtl; //校验数量控制 - public string Kf_MoveStockBillCheck_WHSPCtl; //校验-是否校对仓库仓位 - public string Kf_MoveStockBillCheck_MultilineCtl; //校验-多行相同物料自动拆分换行匹配 - //补料单 - public string Kf_MateReplenishOutBill_AutoCheck; - public string Kf_MateReplenishOutBill_ERPMode; - public string Kf_MateReplenishOutBill_MustQtyCtl; - public string Kf_MateReplenishOutBill_MulSourceBill; //多源单模式 - public string Kf_MateReplenishOutBill_BarCodeMustSameSourceBill; // 条码必须同源单一致 - public string Kf_MateReplenishOutBill_BillTypeOneScan;//本单据类型内只允许一次扫码(唯一码,含缓存列表) - //其他入库反向 - public string Kf_OtherInBackBill_AutoCheck; - public string Kf_OtherInBackBill_ERPMode; - public string Kf_OtherInBackBill_MustQtyCtl; - public string Kf_OtherInBackBill_BarCodeMustSameSourceBill; // 条码必须同源单一致 - public string Kf_OtherInBackBill_BillTypeOneScan;//本单据类型内只允许一次扫码(唯一码,含缓存列表) - //其他出库反向 - public string Kf_OtherOutBackBill_AutoCheck; - public string Kf_OtherOutBackBill_ERPMode; - public string Kf_OtherOutBackBill_MustQtyCtl; - public string Kf_OtherOutBackBill_BarCodeMustSameSourceBill; // 条码必须同源单一致 - public string Kf_OtherOutBackBill_BillTypeOneScan;//本单据类型内只允许一次扫码(唯一码,含缓存列表) + //直接调拨 校验 + public string Kf_MoveStockBillCheck_MustQtyCtl; //校验数量控制 + public string Kf_MoveStockBillCheck_WHSPCtl; //校验-是否校对仓库仓位 + public string Kf_MoveStockBillCheck_MultilineCtl; //校验-多行相同物料自动拆分换行匹配 + //分步式调出单 - public string Kf_MoveStockStepOutBill_AutoCheck; //自动审核 - public string Kf_MoveStockStepOutBill_ERPMode; //ERP模式 - public string Kf_MoveStockStepOutBill_MustQtyCtl; // - public string Kf_MoveStockStepOutBill_MulSourceBill;// - public string Kf_MoveStockStepOutBill_FIFOList; //先进先出下架清单 - public string Kf_MoveStockStepOutBill_FIFOCtl; //先进先出控制 - public string Kf_MoveStockStepOutBill_BillTypeOneScan;//本单据类型内只允许一次扫码(唯一码,含缓存列表) + public string Kf_MoveStockStepOutBill_AutoCheck; //是否自动审核 + public string Kf_MoveStockStepOutBill_ERPMode; //WMS系统同步至ERP的类型(WISE、CLOUD) + public string Kf_MoveStockStepOutBill_MustQtyCtl; //应收数量控制(小于等于应收、完全等于应收、不控制) + public string Kf_MoveStockStepOutBill_MulSourceBill; //多源单模式 + public string Kf_MoveStockStepOutBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表) + public string Kf_MoveStockStepOutBill_BatchNoCtl; //是否进行批号核对('Y'为核对批号) + public string Kf_MoveStockStepOutBill_MultilineCtl; //是否存在多行相同物料时自动拆分换行('Y'为自动拆分) + public string Kf_MoveStockStepOutBill_MaterWHSPCtl; //是否取物料默认仓库仓位('Y'为是) + public string Kf_MoveStockStepOutBill_SourceWHSPCtl; //是否取源单中仓库仓位('Y'为是) + public string Kf_MoveStockStepOutBill_FIFOList; //先进先出下架清单 + public string Kf_MoveStockStepOutBill_FIFOCtl; //先进先出控制 + //分步式调入单 - public string Kf_MoveStockStepInBill_AutoCheck; //自动审核 - public string Kf_MoveStockStepInBill_ERPMode; //ERP模式 - public string Kf_MoveStockStepInBill_MustQtyCtl; // - public string Kf_MoveStockStepInBill_MulSourceBill;// - public string Kf_MoveStockStepInBill_BarCodeMustSameSourceBill; // 条码必须同源单一致 - public string Kf_MoveStockStepInBill_BillTypeOneScan;//本单据类型内只允许一次扫码(唯一码,含缓存列表) + public string Kf_MoveStockStepInBill_AutoCheck; //是否自动审核 + public string Kf_MoveStockStepInBill_ERPMode; //WMS系统同步至ERP的类型(WISE、CLOUD) + public string Kf_MoveStockStepInBill_MustQtyCtl; //应收数量控制(小于等于应收、完全等于应收、不控制) + public string Kf_MoveStockStepInBill_MulSourceBill; //多源单模式 + public string Kf_MoveStockStepInBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表) + public string Kf_MoveStockStepInBill_BatchNoCtl; //是否进行批号核对('Y'为核对批号) + public string Kf_MoveStockStepInBill_MultilineCtl; //是否存在多行相同物料时自动拆分换行('Y'为自动拆分) + public string Kf_MoveStockStepInBill_MaterWHSPCtl; //是否取物料默认仓库仓位('Y'为是) + public string Kf_MoveStockStepInBill_SourceWHSPCtl; //是否取源单中仓库仓位('Y'为是) + public string Kf_MoveStockStepInBill_FIFOList; //先进先出下架清单 + public string Kf_MoveStockStepInBill_FIFOCtl; //先进先出控制 + //采购退料 + public string Kf_POStockInBackBill_AutoCheck; //是否自动审核 + public string Kf_POStockInBackBill_ERPMode; //WMS系统同步至ERP的类型(WISE、CLOUD) + public string Kf_POStockInBackBill_MustQtyCtl; //应收数量控制(小于等于应收、完全等于应收、不控制) + public string Kf_POStockInBackBill_MulSourceBill; //多源单模式 + public string Kf_POStockInBackBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表) + public string Kf_POStockInBackBill_BatchNoCtl; //是否进行批号核对('Y'为核对批号) + public string Kf_POStockInBackBill_MultilineCtl; //是否存在多行相同物料时自动拆分换行('Y'为自动拆分) + public string Kf_POStockInBackBill_MaterWHSPCtl; //是否取物料默认仓库仓位('Y'为是) + public string Kf_POStockInBackBill_SourceWHSPCtl; //是否取源单中仓库仓位('Y'为是) - // + //产品退库 + public string Kf_ProductInBackBill_AutoCheck; //是否自动审核 + public string Kf_ProductInBackBill_ERPMode; //WMS系统同步至ERP的类型(WISE、CLOUD) + public string Kf_ProductInBackBill_MustQtyCtl; //应收数量控制(小于等于应收、完全等于应收、不控制) + public string Kf_ProductInBackBill_MulSourceBill; //多源单模式 + public string Kf_ProductInBackBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表) + public string Kf_ProductInBackBill_BatchNoCtl; //是否进行批号核对('Y'为核对批号) + public string Kf_ProductInBackBill_MultilineCtl; //是否存在多行相同物料时自动拆分换行('Y'为自动拆分) + public string Kf_ProductInBackBill_MaterWHSPCtl; //是否取物料默认仓库仓位('Y'为是) + public string Kf_ProductInBackBill_SourceWHSPCtl; //是否取源单中仓库仓位('Y'为是) - //WMS + //其他入库红字 + public string Kf_OtherInBackBill_AutoCheck; //是否自动审核 + public string Kf_OtherInBackBill_ERPMode; //WMS系统同步至ERP的类型(WISE、CLOUD) + public string Kf_OtherInBackBill_MustQtyCtl; //应收数量控制(小于等于应收、完全等于应收、不控制) + public string Kf_OtherInBackBill_MulSourceBill; //多源单模式 + public string Kf_OtherInBackBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表) + public string Kf_OtherInBackBill_BatchNoCtl; //是否进行批号核对('Y'为核对批号) + public string Kf_OtherInBackBill_MultilineCtl; //是否存在多行相同物料时自动拆分换行('Y'为自动拆分) + public string Kf_OtherInBackBill_MaterWHSPCtl; //是否取物料默认仓库仓位('Y'为是) + public string Kf_OtherInBackBill_SourceWHSPCtl; //是否取源单中仓库仓位('Y'为是) + + //委外退库 + public string Kf_EntrustInBackBill_AutoCheck; //是否自动审核 + public string Kf_EntrustInBackBill_ERPMode; //WMS系统同步至ERP的类型(WISE、CLOUD) + public string Kf_EntrustInBackBill_MustQtyCtl; //应收数量控制(小于等于应收、完全等于应收、不控制) + public string Kf_EntrustInBackBill_MulSourceBill; //多源单模式 + public string Kf_EntrustInBackBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表) + public string Kf_EntrustInBackBill_BatchNoCtl; //是否进行批号核对('Y'为核对批号) + public string Kf_EntrustInBackBill_MultilineCtl; //是否存在多行相同物料时自动拆分换行('Y'为自动拆分) + public string Kf_EntrustInBackBill_MaterWHSPCtl; //是否取物料默认仓库仓位('Y'为是) + public string Kf_EntrustInBackBill_SourceWHSPCtl; //是否取源单中仓库仓位('Y'为是) + + //生产退料 + public string Kf_MateOutBackBill_AutoCheck; //是否自动审核 + public string Kf_MateOutBackBill_ERPMode; //WMS系统同步至ERP的类型(WISE、CLOUD) + public string Kf_MateOutBackBill_MustQtyCtl; //应收数量控制(小于等于应收、完全等于应收、不控制) + public string Kf_MateOutBackBill_MulSourceBill; //多源单模式 + public string Kf_MateOutBackBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表) + public string Kf_MateOutBackBill_BatchNoCtl; //是否进行批号核对('Y'为核对批号) + public string Kf_MateOutBackBill_MultilineCtl; //是否存在多行相同物料时自动拆分换行('Y'为自动拆分) + public string Kf_MateOutBackBill_MaterWHSPCtl; //是否取物料默认仓库仓位('Y'为是) + public string Kf_MateOutBackBill_SourceWHSPCtl; //是否取源单中仓库仓位('Y'为是) + public string Kf_MateOutBackBill_SimpleMode; //简洁模式(不显示源单列表,只显示扫码记录,但后台仍控制) + + //销售退库 + public string Kf_SellOutBackBill_AutoCheck; //是否自动审核 + public string Kf_SellOutBackBill_ERPMode; //WMS系统同步至ERP的类型(WISE、CLOUD) + public string Kf_SellOutBackBill_MustQtyCtl; //应收数量控制(小于等于应收、完全等于应收、不控制) + public string Kf_SellOutBackBill_MulSourceBill; //多源单模式 + public string Kf_SellOutBackBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表) + public string Kf_SellOutBackBill_BatchNoCtl; //是否进行批号核对('Y'为核对批号) + public string Kf_SellOutBackBill_MultilineCtl; //是否存在多行相同物料时自动拆分换行('Y'为自动拆分) + public string Kf_SellOutBackBill_MaterWHSPCtl; //是否取物料默认仓库仓位('Y'为是) + public string Kf_SellOutBackBill_SourceWHSPCtl; //是否取源单中仓库仓位('Y'为是) + public string Kf_SellOutBackBill_AutoSavePOStockInBackBill; //同步生成采购入库单红字 + + //其他出库红字 + public string Kf_OtherOutBackBill_AutoCheck; //是否自动审核 + public string Kf_OtherOutBackBill_ERPMode; //WMS系统同步至ERP的类型(WISE、CLOUD) + public string Kf_OtherOutBackBill_MustQtyCtl; //应收数量控制(小于等于应收、完全等于应收、不控制) + public string Kf_OtherOutBackBill_MulSourceBill; //多源单模式 + public string Kf_OtherOutBackBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表) + public string Kf_OtherOutBackBill_BatchNoCtl; //是否进行批号核对('Y'为核对批号) + public string Kf_OtherOutBackBill_MultilineCtl; //是否存在多行相同物料时自动拆分换行('Y'为自动拆分) + public string Kf_OtherOutBackBill_MaterWHSPCtl; //是否取物料默认仓库仓位('Y'为是) + public string Kf_OtherOutBackBill_SourceWHSPCtl; //是否取源单中仓库仓位('Y'为是) + + //委外退料 + public string Kf_EntrustOutBackBill_AutoCheck; //是否自动审核 + public string Kf_EntrustOutBackBill_ERPMode; //WMS系统同步至ERP的类型(WISE、CLOUD) + public string Kf_EntrustOutBackBill_MustQtyCtl; //应收数量控制(小于等于应收、完全等于应收、不控制) + public string Kf_EntrustOutBackBill_MulSourceBill; //多源单模式 + public string Kf_EntrustOutBackBill_BillTypeOneScan; //本单据类型内只允许一次扫码(唯一码,含缓存列表) + public string Kf_EntrustOutBackBill_BatchNoCtl; //是否进行批号核对('Y'为核对批号) + public string Kf_EntrustOutBackBill_MultilineCtl; //是否存在多行相同物料时自动拆分换行('Y'为自动拆分) + public string Kf_EntrustOutBackBill_MaterWHSPCtl; //是否取物料默认仓库仓位('Y'为是) + public string Kf_EntrustOutBackBill_SourceWHSPCtl; //是否取源单中仓库仓位('Y'为是) + public string Kf_EntrustOutBackBill_SimpleMode; //简洁模式(不显示源单列表,只显示扫码记录,但后台仍控制) + + //WMS 通用 public string WMS_ERPStockCtl;//ERP负库存控制(物料库存) public string WMS_WMSStockCtl;//WMS负库存控制(条码库存) public string WMS_WMSStockCtl_ERPMode; //库存控制ERP模式 @@ -176,6 +295,7 @@ public string WMS_OneScanMode; //一次扫码模式 public string WMS_MouldManagerCtl; //是否启用器具管理(Y,N) + //桌面条码模块 public string BarCode_SourceQtyCtl; //有源单生成条码,生成条码数量可否超源单数量控制 @@ -213,16 +333,8 @@ public string MES_StationEntrustOutBill_DeleteCtl; //删除单据时制单人与删除人必须一致 - //MES - //生产汇报单 - public string Sc_ICMOReportBill_AutoCheck; //自动审核 - public string Sc_ICMOReportBill_ERPMode; // ERP模式 - public string Sc_ICMOReportBill_MustQtyCtl; // 应收数量 - public string Sc_ICMOReportBill_MulSourceBill; //多源单模式 - public string Sc_ICMOReportBill_BillTypeOneScan;//本单据类型内只允许一次扫码(唯一码,含缓存列表) - public string Sc_ICMOReportBill_UpdateSourceInterID;//覆盖源单内码 - public string Sc_ICMOReportBill_FirstCheckOut; //必须首件检验通过才能保存单据 + public string Sc_ICMOReportBill_FirstCheckOut; //必须首件检验通过才能保存单据 //JIT -- Gitblit v1.9.1