From a191b8b20ca2fe54968eebae943e151678cfecf0 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期六, 02 九月 2023 18:55:35 +0800
Subject: [PATCH] 1
---
WebAPI/Models/Gy_RoutingBillSub.cs | 4
WarM/条码打印/Kf_WeighToBarCode_StationOutBill.cs | 974 +++++++++++++
LMES/ClsShowMod.cs | 5
WarM/条码打印/Sc_ICMOToBarCode.cs | 11
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs | 6
WebAPI/Controllers/QC_ManagementController.cs | 83
Model/Model.csproj | 3
Model/车间管理/ClsQC_TestSampleCheckBillSub.cs | 56
Model/质检管理/ClsQC_PatrolProcCheckBillMain.cs | 3
WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs | 64
WarM/条码打印/Kf_WeighToBarCode.cs | 25
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs | 727 ++++++++++
WebAPI/Controllers/品质管理/首件检验单/QC_FirstPieceCheckBillController.cs | 249 ++
WebAPI/Models/ClsGy_Material_Model.cs | 4
WarM/WarM.csproj | 10
Model/质检管理/ClsQC_FirstPieceCheckBillMain.cs | 2
WebAPI/Models/基础资料/Gy_Process.cs | 3
Model/质检管理/ClsQC_PatrolProcCheckBillSub_BadReason.cs | 23
Model/车间管理/ClsQC_TestSampleCheckBillMain.cs | 63
WarM/条码打印/Kf_WeighToBarCode_StationOutBill.designer.cs | 977 +++++++++++++
WebAPI/Controllers/品质管理/巡检单/QC_PatrolProcCheckBillController.cs | 26
WebAPI/Controllers/WebAPIController.cs | 2
WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs | 9
/dev/null | 0
WebAPI/Controllers/BaseSet/Gy_ProcessController.cs | 12
WebAPI/ListModels.cs | 11
WarM/条码打印/Kf_WeighToBarCode_StationOutBill.resx | 456 ++++++
WebAPI/WebAPI.csproj | 3
WebAPI/Controllers/品质管理/工序检验单/QC_ProcessCheckBillController.cs | 374 +++--
WebAPI/DLL/ClsGy_Material_Ctl.cs | 8
30 files changed, 3,887 insertions(+), 306 deletions(-)
diff --git a/LMES/ClsShowMod.cs b/LMES/ClsShowMod.cs
index 2199adf..acd9031 100644
--- a/LMES/ClsShowMod.cs
+++ b/LMES/ClsShowMod.cs
@@ -3644,6 +3644,11 @@
Kf_WeighToBarCode oKf_WeighToBarCode = new Kf_WeighToBarCode();
oKf_WeighToBarCode.ShowDialog();
break;
+ case "kf_weightobarcode_stationoutbill":
+ //
+ Kf_WeighToBarCode_StationOutBill oKf_WeighToBarCode_StationOutBill = new Kf_WeighToBarCode_StationOutBill();
+ oKf_WeighToBarCode_StationOutBill.ShowDialog();
+ break;
case "kf_barcodeoutinreport":
//权限
Kf_BarCodeOutInReport oKf_BarCodeOutInReport = new Kf_BarCodeOutInReport();
diff --git a/LMES/bin/x86/Debug.zip b/LMES/bin/x86/Debug.zip
deleted file mode 100644
index 9375961..0000000
--- a/LMES/bin/x86/Debug.zip
+++ /dev/null
Binary files differ
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 49e58fd..82dca5a 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -585,6 +585,7 @@
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipConkBookBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipConkBookBillSub.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_FirstPieceCheckBillSub_ValueGrid.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_PatrolProcCheckBillSub_BadReason.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_ProcessCheckBillSub_ValueGrid.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsCrm_CustomerAppealBillSub.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsCrm_CustomerAppealBillMain.cs" />
@@ -722,7 +723,9 @@
<Compile Include="杞﹂棿绠＄悊\ClsSc_StationEntrustOutBillSub_Item.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_StationInBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_StationInBillSub.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsQC_TestSampleCheckBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_StationOutBillMain.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsQC_TestSampleCheckBillSub.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_StationOutBillSub.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_StationOutBillSub_Emp.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_StationOutBillSub_Item.cs" />
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_FirstPieceCheckBillMain.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_FirstPieceCheckBillMain.cs"
index ed85bf3..633a7d6 100644
--- "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_FirstPieceCheckBillMain.cs"
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_FirstPieceCheckBillMain.cs"
@@ -21,6 +21,8 @@
public Int64 HPrintQty;
public Int64 HICMOEntryID;
public Int64 HQCSchemeID;
+ public Int64 HUnitID;
+ public Int64 HProcID;
}
}
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckBillMain.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckBillMain.cs"
index f32e2aa..0832216 100644
--- "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckBillMain.cs"
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckBillMain.cs"
@@ -18,6 +18,7 @@
public Int64 HProcExchQty;
public Int64 HMaterID;
public Int64 HFirstCheckEmp;
-
+ public Int64 HMainProcID;
+
}
}
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckBillSub_BadReason.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckBillSub_BadReason.cs"
new file mode 100644
index 0000000..ce20b68
--- /dev/null
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckBillSub_BadReason.cs"
@@ -0,0 +1,23 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsQC_PatrolProcCheckBillSub_BadReason : DBUtility.ClsXt_BaseBillSub
+ {
+ public Int64 HInterID;
+ public string HBillNo_bak;
+ public Int64 HEntryID;
+ public Int64 HItemID;
+ public Int64 HSEQ;
+ public DateTime HCreateDate;
+ public Int64 HBadReasonID;
+ public Int64 HEmpID ;
+ public Int64 HProcID ;
+ public Int64 HCheckEmpID;
+ public DateTime HFinishDate;
+ public Int64 HMaterID ;
+ public double HQty;
+ }
+}
diff --git "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsQC_TestSampleCheckBillMain.cs" "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsQC_TestSampleCheckBillMain.cs"
new file mode 100644
index 0000000..5020778
--- /dev/null
+++ "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsQC_TestSampleCheckBillMain.cs"
@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsQC_TestSampleCheckBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public Int64 HPrintQty;
+ public Int64 HICMOInterID;
+ public Int64 HICMOEntryID;
+ public String HICMOBillNo;
+ public Int64 HProcPlanInterID;
+ public Int64 HProcPlanEntryID;
+ public String HProcPlanBillNo;
+ public Int64 HProcExchInterID;
+ public Int64 HProcExchEntryID;
+ public String HProcExchBillNo;
+ public Int64 HMaterID;
+ public Int64 HUnitID;
+ public Int64 HProcID;
+ public Int64 HPayProcID;
+ public double HICMOQty;
+ public double HPlanQty;
+ public double HDSQty;
+ public DateTime HStationOutTime;
+ public Int64 HSourceID;
+ public Int64 HGroupID;
+ public Int64 HDeptID;
+ public Int64 HEmpID;
+ public String HReportType;
+ public String HBarCode;
+ public String HAddr;
+ public String HBarCodeMaker;
+ public DateTime HBarCodeMakeDate;
+ public Int64 HSupID;
+ public double HQty;
+ public double HPieceQty;
+ public double HPrice;
+ public double HMoney;
+ public double HBadCount;
+ public double HWasterQty;
+ public String HSourceName;
+ public double HPlanPieceQty;
+ public double HBadPNL;
+ public Int64 HCenterID;
+ public int HProcNo;
+ public string HOrderProcNO;
+ public bool HLastSubProc;
+ public double HChongQty;
+ public double HPriceRate;
+ public string HMouldNum;//模穴号
+ public string HBarCode_Cus;//客户条码编码
+ public Single HWorkTimes;//工时
+ public Int64 HQCCheckID;//检验员
+ public string HSourceNameList;//设备清单
+ public Int64 HPersonNums; //人员数
+ public Int64 HMachineNums; //机器数
+ public string HEmpNum; //职员代码
+ public string eventType { get; set; }
+ public Int64 HLastResult;//试样结论
+ }
+}
diff --git "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsQC_TestSampleCheckBillSub.cs" "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsQC_TestSampleCheckBillSub.cs"
new file mode 100644
index 0000000..a7a8880
--- /dev/null
+++ "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsQC_TestSampleCheckBillSub.cs"
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsQC_TestSampleCheckBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+
+ public string HBillNo_bak;// varchar(50) --单据号（备份，以免内码丢失，找不到对应主表）
+
+ public Int64 HProcID;// int --工序
+ public Int64 HMaterID;// int --物料
+ public Int64 HEmpID;// int --操作工
+ public Int64 HSourceID;// int --生产资源ID(Gy_Source)
+ public Int64 HSourceID2;// int --生产资源ID(Gy_Source)
+ public Int64 HSourceID3;// int --生产资源ID(Gy_Source)
+ public Int64 HSourceID4;// int --生产资源ID(Gy_Source)
+ public Int64 HSourceID5;// int --生产资源ID(Gy_Source)
+ public DateTime HRelBeginDate;// datetime --实际开工日期
+ public DateTime HRelEndDate;// datetime --实际完工日期
+ public double HTimes;// money --实作时间
+ public double HQty;// dec --实作数量
+ public double HPieceQty;// dec --板数
+ public double HCheckQty; //dec(18,8) --合格数量
+ public double HBadCount; //不良品数
+ public double HWasterQty;// 因工报废数量
+ public double HWasterQty2;// 因料报废数量
+
+ public double HWeight;// dec(18,8) --重量
+ public double HPrice;// dec(18,8) --工序工价
+ public double HMoney;// money -- 计件金额
+ public double HOtherDeduct;// money --其他扣款
+ public double HRelPay;// money --实得工资
+ public string HOtherItem1;// varchar(50) --其他属性1
+ public string HOtherItem2;// varchar(50) --其他属性2
+ public long HCheckEmpID;// int --检验员(gy_employee)
+
+ public Int64 HProcPlanInterID;// int --工序计划单ID
+ public Int64 HProcPlanEntryID;// int --工序计划单子ID
+ public string HProcPlanBillNo;// varchar(50) --工序计划单号
+ public Int64 HICMOInterID;// int --任务单ID
+ public string HICMOBillNo;// varchar(50) --任务单号
+ public Int64 HSeOrderInterID;// int --销售订单主ID
+ public Int64 HSeOrderEntryID;// int --销售子ID
+ public string HSeOrderBillNo;// varchar(50) --销售订单号
+ public Int64 HWWOrderInterID;// int --委外订单内码
+ public Int64 HWWOrderEntryID;// int --委外订单子内码
+ public string HWWOrderBillNo;// varchar(50) --委外订单号
+ public Int64 HProcExchInterID;// int --工序流转卡ID
+ public Int64 HProcExchEntryID;// int --工序流转卡子ID
+ public string HProcExchBillNo;// varchar(50) --工序流转卡号
+ public Int64 HProcNo;// int --工序号
+ public string HSourceName;// 机台
+ }
+}
diff --git a/WarM/WarM.csproj b/WarM/WarM.csproj
index f41ba96..00efaff 100644
--- a/WarM/WarM.csproj
+++ b/WarM/WarM.csproj
@@ -693,6 +693,12 @@
<Compile Include="鏉＄爜鎵撳嵃\Kf_AGVRequestBill_FastList.designer.cs">
<DependentUpon>Kf_AGVRequestBill_FastList.cs</DependentUpon>
</Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Kf_WeighToBarCode_StationOutBill.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Kf_WeighToBarCode_StationOutBill.designer.cs">
+ <DependentUpon>Kf_WeighToBarCode_StationOutBill.cs</DependentUpon>
+ </Compile>
<Compile Include="鏉＄爜鎵撳嵃\Kf_WeighToBarCode.cs">
<SubType>Form</SubType>
</Compile>
@@ -1126,6 +1132,10 @@
<DependentUpon>Kf_AGVRequestBill_FastList.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Kf_WeighToBarCode_StationOutBill.resx">
+ <DependentUpon>Kf_WeighToBarCode_StationOutBill.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="鏉＄爜鎵撳嵃\Kf_WeighToBarCode.resx">
<DependentUpon>Kf_WeighToBarCode.cs</DependentUpon>
<SubType>Designer</SubType>
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.cs"
index cbb25c7..8f913b6 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.cs"
@@ -363,6 +363,8 @@
+ ", " + HStockOrgID.ToString() + "," + HStockOrgID.ToString() + ") ");
//鏇存柊鍏宠仈鏁伴噺
oCn.RunProc("exec h_p_Sc_UpDateRelation_ICMOToProductIn_Add " + HInterID.ToString());
+ //鍥炲～宸茬敓鍗曠姸鎬�
+ oCn.RunProc("Update KF_WeighSource_Temp set HRelationInterID=1 where HInterID= " + HInterID.ToString());
MessageBox.Show("鐢熸垚鐢熶骇鍏ュ簱鍗曪細" + HBillNo + " 鎴愬姛锛�", "鎻愮ず");
oCn.Commit();
return true;
@@ -536,6 +538,11 @@
MessageBox.Show("璇疯緭鍏ユ纭噸閲忥紒", "鎻愮ず");
return false;
}
+ else if (DBUtility.ClsPub.isDoule(txtHQty.Text)- DBUtility.ClsPub.isDoule(txtHKDQty.Text) <= 0)
+ {
+ MessageBox.Show("杈撳叆鐨勬墸鐐规暟涓嶈兘澶т簬绫虫暟锛�", "鎻愮ず");
+ return false;
+ }
else if (DBUtility.ClsPub.isInt(txtHBarcodeNo.Text) == 0)
{
MessageBox.Show("璇疯緭鍏ュ寘鍙凤紒", "鎻愮ず");
@@ -626,9 +633,10 @@
string HBarCode = "";
string HBarCodeType = "";
- double HQty = 0; //绫虫暟
+ double HNowQty = 0; //绫虫暟
double HMaterialJQty = 0; //閲嶉噺
double HMaterialMQty = 0; //鎵ｇ偣鏁�
+ double HQty = 0; //鏁伴噺
Int64 HDeptID = 0;
string HRemark = "";
string HMaterName = "";
@@ -641,9 +649,10 @@
HBarCode = TM;
HBarCodeType = DBUtility.ClsPub.isStrNull(cmbHBarCodeType.Text);
- HQty = DBUtility.ClsPub.isDoule(txtHQty.Text);
+ HNowQty = DBUtility.ClsPub.isDoule(txtHQty.Text);
HMaterialJQty = DBUtility.ClsPub.isDoule(txtHWeightQyt.Text);
HMaterialMQty = DBUtility.ClsPub.isDoule(txtHKDQty.Text);
+ HQty = HNowQty- HMaterialMQty;
HDeptID = DBUtility.ClsPub.isLong(txtHDeptName.Tag);
HRemark = DBUtility.ClsPub.isStrNull(txtHRemark.Text);
HMaterName = DBUtility.ClsPub.isStrNull(txtHMaterName.Text);
@@ -657,31 +666,31 @@
try
{
oCn.BeginTran();
- //鍐欏叆鏉＄爜妗ｆ (瀹㈡埛鐗╂枡鍚嶇ОHCusMaterName瀛樺叆HMaterialModel瀛楁锛屽鎴疯鏍煎瀷鍙稨CusModel瀛樺叆HCusModel瀛楁
+ //鍐欏叆鏉＄爜妗ｆ (瀹㈡埛鐗╂枡鍚嶇ОHCusMaterName瀛樺叆HMaterialModel瀛楁锛屽鎴疯鏍煎瀷鍙稨CusModel瀛樺叆HCusModel瀛楁锛屼笉鑹師鍥營D瀛樺叆HCustomQty1瀛楁锛�
oCn.RunProc("Insert into Gy_BarCodeBill " +
"(HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
- ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate,HMaterialJQty,HMaterialMQty " +
+ ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate,HMaterialJQty,HMaterialMQty,HNowQty " +
",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HGiveAwayFlag " +
",HOrderInterID,HOrderEntryID,HOrderBillNo,HCustomQty1,HMaterialModel,HCusModel " +
- ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
+ ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo,HLogo " +
") Values ("
+ "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty.ToString()
+ ",'" + HBatchNo + "'," + HSupID.ToString() + ",0,'" + HMaker + "',getdate(),0," + HQty.ToString()
+ ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "',''"
+ ", 1," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
- + ", 0,'',getdate(),'','" + sDate + "'," + HMaterialJQty.ToString() + "," + HMaterialMQty.ToString()
+ + ", 0,'',getdate(),'','" + sDate + "'," + HMaterialJQty.ToString() + "," + HMaterialMQty.ToString() + "," + HNowQty.ToString()
+ ", " + HStockOrgID.ToString() + "," + HStockOrgID.ToString() + ",''," + HInterID.ToString() + ",0"
+ ", " + ProcessExchangeInterID.ToString() + ",0,'" + ProcessExchangeBillNo + "'," + HBadReasonID.ToString() + ",'" + HCusMaterName + "','" + HCusModel + "'"
- + ",'" + HMaterName + "','" + HMaterModel + "',''," + HAuxPropID.ToString() + ",'','')");
+ + ",'" + HMaterName + "','" + HMaterModel + "',''," + HAuxPropID.ToString() + ",'','','1')");
//鍥炲～鏈�澶ф祦姘村彿
oCn.RunProc("exec h_p_WMS_SetMaxNo_QTY '" + sTMNumber + "',1 ");
//鍥炲～婧愬崟涓存椂琛℉InterID
- oCn.RunProc("update a set a.HInterID=" + HInterID.ToString() + ",a.HBillNo='" + HBillNo + "' from KF_WeighSource_Temp a where a.HInterID<>" + HInterID.ToString() + " and a.HMaker='" + HMaker + "' and convert(varchar(10),a.HMakeDate,120)=convert(varchar(10),getdate(),120)");
+ oCn.RunProc("update a set a.HInterID=" + HInterID.ToString() + ",a.HBillNo='" + HBillNo +"',a.HRelationInterID= 0 from KF_WeighSource_Temp a where a.HInterID<>" + HInterID.ToString() + " and a.HMaker='" + HMaker + "' and a.HSourceBillNo='" + ProcessExchangeBillNo + "'");
//鍐欏叆鏉＄爜鍑哄叆搴撲复鏃惰〃
oCn.RunProc("Insert into KF_PonderationBillMain_Temp " +
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode_StationOutBill.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode_StationOutBill.cs"
new file mode 100644
index 0000000..05279c5
--- /dev/null
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode_StationOutBill.cs"
@@ -0,0 +1,974 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using gregn6Lib;
+using SQLHelper;
+using DBUtility;
+using System.Threading;
+using System.IO;
+using Pub_Class;
+
+namespace WarM
+{
+ public partial class Kf_WeighToBarCode_StationOutBill : Form
+ {
+ public Kf_WeighToBarCode_StationOutBill()
+ {
+ InitializeComponent();
+ }
+ public frmBillQueryCondition_New frmCondition;
+ public string ModCaption = "娑ょ憾鍗婃垚鍝佺敓鎴愭潯鐮�";
+ public const string ModName = "85";
+ public Int64 HInterID = 0;
+ public string HBillNo = "";
+ public string HBillType = "1202";
+ public Int64 HUnitID = 0;
+ public Int64 HSourceInterID = 0;
+ public Int64 HSourceEntryID = 0;
+ public string HSourceBillNo = "";
+ public string HSourceBillType = "";
+ public Int64 HProcessExchangeInterID = 0;
+ public Int64 HProcessExchangeEntryID = 0;
+ public Int64 HSupID = 0;
+ public double HSourceQty = 0;
+ public string HCusMaterName = ""; //瀹㈡埛鐗╂枡鍚嶇О
+ public string HCusModel = ""; //瀹㈡埛瑙勬牸鍨嬪彿
+ public string HMaker = DBUtility.ClsPub.CurUserName;
+ public Int64 HStockOrgID = DBUtility.ClsPub.HOrgID;
+ public DateTime HDate = DateTime.Today;
+ public long PrintQty = 0; //鍏佽鏉＄爜鎵撳嵃娆℃暟
+ public string PrintQtyCtl = ""; //鏉＄爜鎵撳嵃娆℃暟鎺у埗
+ public string UpdatePrintQtyCtl = ""; //鏉＄爜鎵撳嵃娆℃暟鏇存柊
+ public string sBarCodeItemID = ""; //鏉＄爜鑷鍒�
+ public DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+
+ #region //鍥哄畾浠ｇ爜
+
+ //娓呯┖鐣岄潰
+ public void Sub_ClearBill()
+ {
+ cmbHBarCodeType.Items.Clear();
+ cmbHBarCodeType.Items.Add("鍞竴鏉＄爜");
+ DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp);
+ txtHBarCode.Text = "";
+ grdMain.DataSource = null;
+ grdSub.DataSource = null;
+ chkHDYFlag.Checked = true;
+ }
+
+ //绐椾綋鍔犺浇
+ private void Kf_WeighToBarCode_StationOutBill_Load(object sender, EventArgs e)
+ {
+ frmCondition = new frmBillQueryCondition_New();
+ this.Text = ModCaption;
+ Sub_GetSystemParameter();
+ }
+
+ private void initGrid()
+ {
+ DBUtility.Xt_BaseBillFun.initGridList(grdMain, this.Name);
+ DBUtility.Xt_BaseBillFun.initGridList(grdSub, this.Name + "grdSub");
+ }
+
+ //鑾峰彇绯荤粺鍙傛暟淇℃伅
+ private void Sub_GetSystemParameter()
+ {
+ //鑾峰彇绯荤粺鍙傛暟
+ ClsXt_SystemParameter oSystemParameter = new ClsXt_SystemParameter();
+ if (oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo) == false)
+ {
+ MessageBox.Show("鑾峰彇绯荤粺鍙傛暟澶辫触锛佸師鍥�:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
+ return;
+ }
+ else
+ {
+ PrintQty = oSystemParameter.omodel.BarCode_PrintQty;
+ PrintQtyCtl = oSystemParameter.omodel.BarCode_PrintQtyCtl;
+ UpdatePrintQtyCtl = oSystemParameter.omodel.BarCode_UpdatePrintQtyCtl;
+ }
+ }
+
+ private void timer1_Tick(object sender, EventArgs e)
+ {
+ timer1.Enabled = false;
+ initGrid();
+ this.Sub_ClearBill();//娓呯┖鐣岄潰
+
+ //鑾峰彇鏉＄爜ID
+ DataSet Ds = oCn.RunProcReturn("exec h_p_KF_GetBCPWeighSource_TempList '" + HMaker + "'," + HStockOrgID.ToString(), "h_p_KF_GetBCPWeighSource_TempList");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ HInterID = DBUtility.ClsPub.CreateBillID_Prod(HBillType, ref DBUtility.ClsPub.sExeReturnInfo); //寰楀埌鏂板崟鎹甀D
+ }
+ else if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ HInterID = DBUtility.ClsPub.CreateBillID_Prod(HBillType, ref DBUtility.ClsPub.sExeReturnInfo); //寰楀埌鏂板崟鎹甀D
+ }
+ else
+ {
+ HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
+ }
+ Source_Display();
+ BarCode_Display();
+ if (grdSub.Rows.Count > 0)
+ {
+ grdSub.Rows[0].Selected = true;
+ SourceBill();
+ txtHQty.Focus();
+ }
+ else
+ {
+ txtHBarCode.Focus();
+ }
+ }
+
+ private void grdMain_Paint(object sender, PaintEventArgs e)
+ {
+ GraphicsGrid();
+ }
+
+ private void GraphicsGrid()
+ {
+ DBUtility.Xt_BaseBillFun.GraphicsGrid(grdMain);
+ }
+
+ private void grdSub_Paint(object sender, PaintEventArgs e)
+ {
+ GraphicsGridSub();
+ }
+
+ private void GraphicsGridSub()
+ {
+ DBUtility.Xt_BaseBillFun.GraphicsGrid(grdSub);
+ }
+
+ private Int32 Fun_GetCol(string sCol)
+ {
+ return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdMain);
+ }
+
+ private Int32 Fun_GetSubCol(string sCol)
+ {
+ return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdSub);
+ }
+
+ //淇濆瓨鍒楀
+ private void bclk_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdSub, this.Name + "grdSub");
+ }
+
+ //榛樿鍒楀
+ private void mrlk_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
+ DBUtility.Xt_BaseBillFun.DefaultGridView(grdSub, this.Name + "grdSub");
+ }
+
+ #endregion
+
+ #region //鍒锋柊
+
+ private void sx_Click_1(object sender, EventArgs e)
+ {
+ timer1.Enabled = true;
+ }
+
+ #endregion
+
+ #region //鎵撳嵃
+
+ GridppReport Report;
+
+ private void dy_Click_1(object sender, EventArgs e)
+ {
+ //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹁秴杩囧厑璁稿彲鎵撳嵃娆℃暟
+ if (ReportPrintBegin())
+ {
+ return;
+ }
+
+ //閫夋嫨鎵撳嵃妯℃澘
+ BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+ oFrm.sBillName = ModName;
+ oFrm.sBillModel = ModCaption;
+ oFrm.ShowDialog();
+ if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+ {
+ Sub_SetReport(oFrm.sOpenTmp);
+ Report.Print(false);
+ Thread.Sleep(1000);
+ }
+ }
+
+ //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹁秴杩囧厑璁稿彲鎵撳嵃娆℃暟
+ private bool ReportPrintBegin()
+ {
+ DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
+ string sHRemark = "";
+ sBarCodeItemID = "";
+ for (int i = 0; i < grdMain.SelectedRows.Count; i++)
+ {
+ sBarCodeItemID = sBarCodeItemID + "," + DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[Fun_GetCol("HItemID")].Value).ToString();
+ }
+ sBarCodeItemID = sBarCodeItemID.Remove(0, 1);
+
+ if (PrintQtyCtl == "Y")
+ {
+ if (oBar.Set_CheckPrintQty(sBarCodeItemID, PrintQty, ref sHRemark))
+ {
+ MessageBox.Show(sHRemark);
+ return true;
+ }
+ return false;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ private void Sub_SetReport(string sOpenTmp)
+ {
+ //鍒ゆ柇琛屾暟
+ for (int i = 0; i < grdMain.Rows.Count; i++)
+ {
+ grdMain.Rows[i].Cells[0].Value = "";
+ }
+ for (int i = 0; i < grdMain.SelectedRows.Count; i++)
+ {
+ grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[0].Value = "*";
+ }
+ //
+ Report = new GridppReport();
+ Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here .
+ Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
+ Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
+ Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd);
+ }
+
+ //濉叆鍗曟嵁琛ㄥご淇℃伅
+ private void ReportBeforePostRecord()//your report?kao
+ {
+ try
+ {
+ //Report.FieldByName("鐗╂枡浠ｇ爜").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("鐗╂枡浠ｇ爜")].Value.ToString();
+ //Report.FieldByName("鐗╂枡鍚嶇О").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("鐗╂枡鍚嶇О")].Value.ToString();
+ //Report.FieldByName("瑙勬牸鍨嬪彿").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("瑙勬牸鍨嬪彿")].Value.ToString();
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show("鎵撳嵃澶辫触!琛ㄥご锛�" + e.Message);
+ }
+ }
+
+ //濉叆鍗曟嵁琛ㄤ綋淇℃伅
+ private void ReportFetchRecordByDataTable()
+ {
+ try
+ {
+ DataTable ds = new DataTable();
+ BLL.Utility.FillRecordToReport_Sel(Report, grdMain, ds, Fun_GetCol("閫夋嫨"));
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show("鎵撳嵃澶辫触!琛ㄤ綋锛�" + e.Message);
+ }
+ }
+
+ //鎵撳嵃缁撴潫鍚庡洖濉潯鐮佹墦鍗版鏁�
+ private void ReportPrintEnd()
+ {
+ DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
+ if (UpdatePrintQtyCtl == "Y")
+ {
+ oBar.Set_UpdatePrintQty(sBarCodeItemID);
+ }
+ }
+
+ #endregion
+
+ #region //鐢熷崟
+
+ private void hb_Click(object sender, EventArgs e)
+ {
+ this.Sub_SaveBill();
+ timer1.Enabled = true;
+ }
+
+ private bool Sub_SaveBill()
+ {
+ //鏉＄爜璁板綍鍒楄〃鏄惁鏈夎褰曞垽鏂�
+ bool b = false;
+ for (int i = 0; i < grdMain.RowCount; i++)
+ {
+ b = true;
+ break;
+ }
+ if (b == false)
+ {
+ MessageBox.Show("褰撳墠鏉＄爜璁板綍鍒楄〃鏃犳暟鎹紝涓嶅厑璁哥敓鎴愬崟鎹紒", "鎻愮ず");
+ return false;
+ }
+
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ MessageBox.Show(s, "鎻愮ず");
+ return false;
+ }
+
+ try
+ {
+ oCn.BeginTran();
+ DataSet Ds = oCn.RunProcReturn("exec h_p_KF_GetBCPWeighSource_StationOutBill " + HInterID.ToString(), "h_p_KF_GetBCPWeighSource_StationOutBill");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ oCn.RollBack();
+ MessageBox.Show("鐢熸垚宸ュ簭鍑虹珯姹囨姤鍗曞け璐ワ紝褰撳墠鏉＄爜璁板綍鍒楄〃鏃犳暟鎹紒", "鎻愮ず");
+ return false;
+ }
+ else
+ {
+ for (int y = 0; y < Ds.Tables[0].Rows.Count; y++)
+ {
+ Int64 sInterID = 0;
+ string sBillNo = "";
+ string sBillType = "3791";
+ sInterID = DBUtility.ClsPub.CreateBillID(sBillType, ref DBUtility.ClsPub.sExeReturnInfo); //寰楀埌鏂板崟鎹甀D
+ sBillNo = DBUtility.ClsPub.CreateBillCode(sBillType, ref DBUtility.ClsPub.sExeReturnInfo, true); //寰楀埌鏂板崟鎹彿
+
+ Int64 sHBarCodeInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[y]["HInterID"]);
+ Int64 sHMaterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[y]["HMaterID"]);
+ Int64 sHUnitID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[y]["HUnitID"]);
+ string sHBatchNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[y]["HBatchNo"]);
+ Int64 sHSupID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[y]["HSupID"]);
+ Int64 sHGroupID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[y]["HGroupID"]);
+ Int64 sHDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[y]["HDeptID"]);
+ Int64 sHProcID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[y]["HProcID"]);
+ Int64 sHCenterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[y]["HCenterID"]);
+ Int64 sHSourceID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[y]["HSourceID"]);
+ Int64 sHProcNo = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[y]["HLayerNumber"]);
+ Double sHQty = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[y]["HQty"]);
+ Double sHICMOQty = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[y]["HReadyQty"]);
+ Int64 sHICMOInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[y]["HSourceInterID"]);
+ Int64 sHICMOEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[y]["HSourceEntryID"]);
+ string sHICMOBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[y]["HSourceBillNo"]);
+ Int64 sHProcExchInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[y]["HOrderInterID"]);
+ Int64 sHProcExchEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[y]["HOrderEntryID"]);
+ string sHProcExchBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[y]["HOrderBillNo"]);
+
+ //鐢熸垚宸ュ簭鍑虹珯姹囨姤鍗� (鏉＄爜ID瀛樺叆HMainInterID瀛楁锛�
+ oCn.RunProc("Insert Into Sc_StationOutBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate,HMouldNum" +
+ ",HYear,HPeriod,HRemark,HSourceName,HPieceQty,HWasterQty,HPlanPieceQty,HBadPNL" +
+ ",HICMOInterID,HICMOEntryID,HICMOBillNo,HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID" +
+ ",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationOutTime,HSourceID,HPayProcID" +
+ ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate,HSourceID2,HSourceID3,HSourceID4,HSourceID5" +
+ ",HSupID,HQty,HPrice,HMoney,HBadCount,HCenterID,HProcNo,HOrderProcNO,HSourceNameList" +
+ ",HMainSourceInterID,HMainSourceBillNo,HMainSourceBillType,HLastSubProc" +
+ ",HEmpID2,HEmpID3,HEmpID4,HEmpID5,HDSQty,HChongQty,HPriceRate,HWorkTimes,HQCCheckID" +
+ ",HPersonNums,HMachineNums,HEmpNum,HMainInterID,HPRDORGID" +
+ ") " +
+ " values('" + sBillType + "','" + sBillType + "'," + sInterID.ToString() + ",'" + sBillNo + "',0,getdate(),'" + DBUtility.ClsPub.CurUserName + "',getdate(),''" +
+ "," + sYear.ToString() + "," + sPeriod.ToString() + ",'娑ょ憾鍗婃垚鍝佺敓鎴愭潯鐮佹ā鍧楃敓鍗曠敓鎴�','',0,0,0,0" +
+ "," + sHICMOInterID.ToString() + "," + sHICMOEntryID.ToString() + ",'" + sHICMOBillNo + "',0,0,''," + sHProcExchInterID.ToString() + "," + sHProcExchEntryID.ToString() +
+ ",'" + sHProcExchBillNo + "'," + sHMaterID.ToString() + "," + sHProcID.ToString() + "," + sHICMOQty.ToString() + "," + sHICMOQty.ToString() + ",getdate()," + sHSourceID.ToString() + ",0" +
+ "," + sHGroupID.ToString() + "," + sHDeptID.ToString() + ",0,'','','',getdate(),0,0,0,0" +
+ "," + sHSupID.ToString() + "," + sHQty.ToString() + ",0,0,0," + sHCenterID.ToString() + "," + sHProcNo.ToString() + ",'',''" +
+ ",0,'','',0" +
+ ",0,0,0,0,0,0,0,0,0" +
+ ",0,0,''," + sHBarCodeInterID.ToString() + "," + HStockOrgID.ToString() +
+ ") ");
+ }
+
+ //鍥炲～宸茬敓鍗曠姸鎬�
+ oCn.RunProc("Update KF_BCPWeighSource_Temp set HRelationInterID=1 where HInterID= " + HInterID.ToString());
+ MessageBox.Show("鐢熸垚宸ュ簭鍑虹珯姹囨姤鍗曟垚鍔燂紒", "鎻愮ず");
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ MessageBox.Show("鐢熸垚宸ュ簭鍑虹珯姹囨姤鍗曞け璐ワ紒" + e.Message);
+ return false;
+ }
+ }
+
+ #endregion
+
+ #region //閫�鍑�
+
+ private void tc_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
+
+ #endregion
+
+ #region //鎵弿鏉＄爜
+
+ private void txtHBarCode_KeyPress(object sender, KeyPressEventArgs e)
+ {
+ if (e.KeyChar == (char)Keys.Return)
+ {
+ if (!AddSource())
+ {
+ txtHBarCode.Focus();
+ txtHBarCode.SelectAll();
+ return;
+ }
+ Source_Display();
+ grdSub.Rows[0].Selected = true;
+ DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp);
+ SourceBill();
+ txtHBarCode.Text = "";
+ txtHQty.Focus();
+ }
+ }
+
+ private void cmdOK_Click(object sender, EventArgs e)
+ {
+ if (!AddSource())
+ {
+ txtHBarCode.Focus();
+ txtHBarCode.SelectAll();
+ return;
+ }
+ Source_Display();
+ grdSub.Rows[0].Selected = true;
+ DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp);
+ SourceBill();
+ txtHBarCode.Text = "";
+ txtHQty.Focus();
+ }
+
+ private bool AddSource()
+ {
+ //灏嗘壂鎻忓崟鎹彿鍐欏叆涓存椂琛�
+ DataSet ds = oCn.RunProcReturn("exec h_p_Kf_AddSource_BCPWeighToBarCode " + HInterID.ToString() + ",'" + HBillNo + "','" + txtHBarCode.Text.Trim() + "','" + HMaker + "'," + HStockOrgID.ToString(), "h_p_Kf_AddSource_BCPWeighToBarCode");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show("鎵弿鏉＄爜鍐欏叆涓存椂琛ㄥ彂鐢熼敊璇紒", "鎻愮ず");
+ return false;
+ }
+ else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0][0]) == 1)
+ {
+ MessageBox.Show(DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]), "鎻愮ず");
+ return false;
+ }
+ else
+ {
+ return true;
+ }
+ }
+
+ #endregion
+
+ #region //閫夊崟
+
+ private void cmdSourceBillNo_Click(object sender, EventArgs e)
+ {
+ //鍒濆鍖栧彸杈硅〃澶翠俊鎭�
+ cmbHBarCodeType.Items.Clear();
+ cmbHBarCodeType.Items.Add("鍞竴鏉＄爜");
+ DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp);
+
+ if (grdSub.CurrentRow == null)
+ {
+ MessageBox.Show("璇峰湪宸﹁竟鍗曟嵁鍒楄〃涓�夋嫨涓�琛屽崟鎹紒", "鎻愮ず");
+ return;
+ }
+ else if (grdSub.SelectedRows.Count != 1)
+ {
+ MessageBox.Show("涓嶅厑璁稿悓鏃堕�夋嫨澶氳鍗曟嵁锛岃閲嶆柊閫夋嫨鍗曟嵁锛�");
+ return;
+ }
+ else
+ {
+ SourceBill();
+ txtHQty.Focus();
+ }
+ }
+
+ #endregion
+
+ #region //淇濆瓨
+
+ private void cmdSave_Click(object sender, EventArgs e)
+ {
+ if (!Sub_AllowSave())
+ {
+ return;
+ }
+ SaveBarCode();
+ BarCode_Display();
+ grdMain.Rows[0].Selected = true;
+
+ sBarCodeItemID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.SelectedRows[0].Index].Cells[Fun_GetCol("HItemID")].Value).ToString();
+ //鑷姩鎵撳嵃
+ if (chkHDYFlag.Checked == true)
+ {
+ //鎵撳嵃鏉＄爜
+ Sub_SetReport("鐗╂枡鏉＄爜");
+ Report.Print(false);
+ Thread.Sleep(1000);
+ }
+ else
+ {
+ //閫夋嫨鎵撳嵃妯℃澘
+ BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+ oFrm.sBillName = ModName;
+ oFrm.sBillModel = ModCaption;
+ oFrm.ShowDialog();
+ if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+ {
+ Sub_SetReport(oFrm.sOpenTmp);
+ Report.Print(false);
+ Thread.Sleep(1000);
+ }
+ }
+
+ txtHQty.Text = "";
+ txtHQty.Focus();
+ }
+
+ //鏉＄爜鐢熸垚鍓嶅垽鏂�
+ private bool Sub_AllowSave()
+ {
+ //鍒ゆ柇褰撳墠鍗曟嵁ID鏄惁宸蹭笂浼犵敓鎴愬崟鎹�
+ DataSet Ds = oCn.RunProcReturn("select top 1 1 from KF_BCPWeighSource_Temp with(nolock) where HInterID=" + HInterID.ToString() + " and HRelationInterID=1 ", "KF_BCPWeighSource_Temp", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ }
+ else
+ {
+ MessageBox.Show("褰撳墠鏉＄爜璁板綍宸茶涓婁紶鐢熸垚鍗曟嵁锛岃閫�鍑哄悗閲嶆柊杩涘叆璇ユā鍧楄繘琛屾潯鐮佺敓鎴愭搷浣滐紒", "鎻愮ず");
+ return false;
+ }
+
+ if (HInterID==0)
+ {
+ MessageBox.Show("鑾峰彇鏉＄爜瀵瑰簲鍗曟嵁ID澶辫触锛岃閲嶆柊鍒锋柊鐣岄潰锛�", "鎻愮ず");
+ return false;
+ }
+ else if (DBUtility.ClsPub.isLong(txtHMaterNumber.Tag) == 0)
+ {
+ MessageBox.Show("璇峰厛鎵弿宸ュ簭娴佽浆鍗″彿锛�", "鎻愮ず");
+ return false;
+ }
+ else if (DBUtility.ClsPub.isDoule(txtHQty.Text) == 0)
+ {
+ MessageBox.Show("璇疯緭鍏ユ纭背鏁帮紒", "鎻愮ず");
+ return false;
+ }
+ else if (DBUtility.ClsPub.isDoule(txtHProcID.Tag) == 0)
+ {
+ MessageBox.Show("璇峰厛閫夋嫨宸ュ簭锛�", "鎻愮ず");
+ return false;
+ }
+
+ return true;
+ }
+
+ //鐢熸垚鏉＄爜
+ private void SaveBarCode()
+ {
+ int LSHlen = 6; //娴佹按鍙烽暱搴�
+ Int64 LSH = 0; //娴佹按鍙�
+ string LSH2 = ""; //娴佹按鍙疯浆鎹㈡垚瀛楃
+ string HMaterID = ""; //鐗╂枡鍐呯爜
+ string HBatchNo = ""; //鎵规
+ string sDate = ""; //鏃ユ湡
+ string sYear = ""; //骞�
+ string sPeriod = ""; //鏈�
+ string sDay = ""; //鏃�
+ string sTMNumber = ""; //鏉＄爜鑷畾涔夊墠缂�
+ string TM = ""; //鏉＄爜缂栧彿
+ DataSet Ds;
+
+ HMaterID = DBUtility.ClsPub.isStrNull(txtHMaterNumber.Tag);
+ HBatchNo = DBUtility.ClsPub.isStrNull(txtHBatchNo.Text);
+ //鏃ユ湡鑾峰彇鏂瑰紡
+ sDate = dtpHDate.Value.ToShortDateString();
+ sYear = DBUtility.ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
+ sPeriod = "0" + DBUtility.ClsPub.isDate(sDate).Month.ToString();
+ sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
+ sDay = "0" + DBUtility.ClsPub.isDate(sDate).Day.ToString();
+ sDay = sDay.Substring(sDay.Length - 2, 2);
+ //==================================
+ if (cmbHBarCodeType.Text == "鍞竴鏉＄爜")
+ {
+ //鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡鍐呯爜 + 骞� + 鏈� + 鏃�
+ sTMNumber = DBUtility.ClsPub.HOrgNumber + HMaterID + sYear + sPeriod + sDay;
+ Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+ LSH = LSH + 1;
+ LSH2 = LSH.ToString();
+ while (LSH2.Length < LSHlen) //濡傛灉娴佹按鍙峰皬浜�6浣嶆暟鍓嶉潰琛�0
+ {
+ LSH2 = "0" + LSH2;
+ }
+ TM = sTMNumber + LSH2;
+ }
+ else if (cmbHBarCodeType.Text == "鍝佺鏉＄爜")
+ {
+ TM = DBUtility.ClsPub.HOrgNumber + HMaterID;
+ }
+ else if (cmbHBarCodeType.Text == "鎵规鏉＄爜")
+ {
+ TM = DBUtility.ClsPub.HOrgNumber + HMaterID + HBatchNo;
+ }
+ else
+ {
+ MessageBox.Show("閿欒鐨勬潯鐮佺被鍨嬶紝涓嶈兘鐢熸垚鏉＄爜锛�");
+ return;
+ }
+
+ string HBarCode = "";
+ string HBarCodeType = "";
+ Int64 HMaterID2 = 0;
+ double HQty = 0; //绫虫暟
+ Int64 HGroupID = 0;
+ Int64 HDeptID = 0;
+ string HProcessExchangeBillNo = "";
+ string HMaterName = "";
+ string HMaterModel = "";
+ Int64 HProcID = 0;
+ Int64 HCenterID = 0;
+ Int64 HSourceID = 0;
+ Int64 HProcNo = 0;
+
+ HBarCode = TM;
+ HBarCodeType = DBUtility.ClsPub.isStrNull(cmbHBarCodeType.Text);
+ HMaterID2 = DBUtility.ClsPub.isLong(txtHMaterNumber.Tag);
+ HQty = DBUtility.ClsPub.isDoule(txtHQty.Text);
+ HGroupID = DBUtility.ClsPub.isLong(txtHGroupID.Tag);
+ HDeptID = DBUtility.ClsPub.isLong(txtHDeptName.Tag);
+ HProcessExchangeBillNo = DBUtility.ClsPub.isStrNull(txtHBillNo.Text);
+ HMaterName = DBUtility.ClsPub.isStrNull(txtHMaterName.Text);
+ HMaterModel = DBUtility.ClsPub.isStrNull(txtHMaterModel.Text);
+ HProcID = DBUtility.ClsPub.isLong(txtHProcID.Tag);
+ HCenterID = DBUtility.ClsPub.isLong(txtHCenterID.Tag);
+ HSourceID = DBUtility.ClsPub.isLong(txtHSourceID.Tag);
+ HProcNo = DBUtility.ClsPub.isLong(txtHProcNo.Text);
+
+ try
+ {
+ oCn.BeginTran();
+ //鍐欏叆鏉＄爜妗ｆ (瀹㈡埛鐗╂枡鍚嶇ОHCusMaterName瀛樺叆HMaterialModel瀛楁锛屽鎴疯鏍煎瀷鍙稨CusModel瀛樺叆HCusModel瀛楁锛屾祦姘村彿瀛樺叆HLayerNumber瀛楁锛屾簮鍗曟暟閲忓瓨鍏ReadyQty瀛楁锛�
+ oCn.RunProc("Insert into Gy_BarCodeBill " +
+ "(HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
+ ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
+ ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
+ ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate,HMaterialJQty,HMaterialMQty " +
+ ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HGiveAwayFlag " +
+ ",HOrderInterID,HOrderEntryID,HOrderBillNo,HCustomQty1,HMaterialModel,HCusModel " +
+ ",HProcID,HCenterID,HSourceID,HLayerNumber,HReadyQty " +
+ ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo,HLogo " +
+ ") Values ("
+ + " '" + HBarCode + "','" + HBarCodeType + "'," + HMaterID2.ToString() + "," + HUnitID.ToString() + "," + HQty.ToString()
+ + ",'" + HBatchNo + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + HMaker + "',getdate(),0," + HQty.ToString()
+ + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "',''"
+ + ", 1,1," + HDeptID.ToString() + ",0,0,''"
+ + ", 0,'',getdate(),'','" + sDate + "',0,0"
+ + ", " + HStockOrgID.ToString() + "," + HStockOrgID.ToString() + ",''," + HInterID.ToString() + ",0"
+ + ", " + HProcessExchangeInterID.ToString() + "," + HProcessExchangeEntryID.ToString() + ",'" + HProcessExchangeBillNo + "',0,'" + HCusMaterName + "','" + HCusModel + "'"
+ + ", " + HProcID.ToString() + "," + HCenterID.ToString() + "," + HSourceID.ToString() + "," + HProcNo.ToString() + "," + HSourceQty.ToString()
+ + ",'" + HMaterName + "','" + HMaterModel + "','',0,'','','1')");
+
+ //鍥炲～鏈�澶ф祦姘村彿
+ oCn.RunProc("exec h_p_WMS_SetMaxNo_QTY '" + sTMNumber + "',1 ");
+ //鍥炲～婧愬崟涓存椂琛℉InterID
+ oCn.RunProc("update a set a.HInterID=" + HInterID.ToString() + ",a.HRelationInterID= 0 from KF_BCPWeighSource_Temp a where a.HInterID<>" + HInterID.ToString() + " and a.HMaker='" + HMaker + "' and a.HSourceBillNo='" + HProcessExchangeBillNo + "'");
+ oCn.Commit();
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ MessageBox.Show("鏉＄爜鐢熸垚澶辫触锛�" + e.Message);
+ }
+ }
+
+ #endregion
+
+ #region //杩斿洖淇℃伅
+
+ //杩斿洖婧愬崟鍒楄〃淇℃伅
+ private void SourceBill()
+ {
+ txtHBillNo.Text = DBUtility.ClsPub.isStrNull(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("鍗曟嵁鍙�")].Value);
+ txtHDeptName.Tag = DBUtility.ClsPub.isLong(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HDeptID")].Value);
+ txtHDeptName.Text = DBUtility.ClsPub.isStrNull(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("杞﹂棿")].Value);
+ txtHMaterNumber.Tag = DBUtility.ClsPub.isLong(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HMaterID")].Value);
+ txtHMaterNumber.Text = DBUtility.ClsPub.isStrNull(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("鐗╂枡浠ｇ爜")].Value);
+ txtHMaterName.Text = DBUtility.ClsPub.isStrNull(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("鐗╂枡鍚嶇О")].Value);
+ txtHMaterModel.Text = DBUtility.ClsPub.isStrNull(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("瑙勬牸鍨嬪彿")].Value);
+ txtHBatchNo.Text = DBUtility.ClsPub.isStrNull(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("鎵瑰彿")].Value);
+ txtHICMOBillNo.Text = DBUtility.ClsPub.isStrNull(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("鐢熶骇璁㈠崟")].Value);
+ HUnitID = DBUtility.ClsPub.isLong(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HUnitID")].Value);
+ HSourceInterID = DBUtility.ClsPub.isLong(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HSourceInterID")].Value);
+ HSourceEntryID = DBUtility.ClsPub.isLong(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HSourceEntryID")].Value);
+ HSourceBillNo = DBUtility.ClsPub.isStrNull(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("鐢熶骇璁㈠崟")].Value);
+ HSourceBillType = DBUtility.ClsPub.isStrNull(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HSourceBillType")].Value);
+ HSourceQty = DBUtility.ClsPub.isDoule(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("鏁伴噺")].Value);
+ HProcessExchangeInterID = DBUtility.ClsPub.isLong(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HProcessExchangeInterID")].Value);
+ HSupID = DBUtility.ClsPub.isLong(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HSupID")].Value);
+ HCusMaterName = DBUtility.ClsPub.isStrNull(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HCusMaterName")].Value);
+ HCusModel = DBUtility.ClsPub.isStrNull(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HCusModel")].Value);
+ }
+
+ //杩斿洖婧愬崟鍒楄〃淇℃伅
+ private void Source_Display()
+ {
+ DataSet DSet = oCn.RunProcReturn("exec h_p_KF_GetBCPWeighSource_TempList '" + HMaker + "'," + HStockOrgID.ToString(), "h_p_KF_GetBCPWeighSource_TempList");
+ grdSub.DataSource = DSet.Tables[0].DefaultView;
+ //鍐荤粨
+ int FrCol = DBUtility.ClsPub.isInt(frmCondition.txtFrozenCol.Text);
+ string s = frmCondition.cmbHComplete.Text;
+ DBUtility.Xt_BaseBillFun.DisplayGrid(grdSub, this.Name + "grdSub", s, FrCol);
+ //鐢荤嚎
+ GraphLine();
+ }
+
+ //杩斿洖鏉＄爜璁板綍鍒楄〃淇℃伅
+ private void BarCode_Display()
+ {
+ DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " order by HItemID desc", "h_v_IF_BarCodeBillList", ref DBUtility.ClsPub.sExeReturnInfo);
+ grdMain.DataSource = DSet.Tables[0].DefaultView;
+ //鍐荤粨
+ int FrCol = DBUtility.ClsPub.isInt(frmCondition.txtFrozenCol.Text);
+ string s = frmCondition.cmbHComplete.Text;
+ DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, s, FrCol);
+ //鐢荤嚎
+ GraphLine();
+ }
+
+ private void GraphLine()
+ {
+ int MainIDCol = Fun_GetCol("hmainid");
+ int SubIDCol = Fun_GetCol("hsubid");
+ string s = frmCondition.cmbHComplete.Text;
+ long n = 0;
+ DBUtility.Xt_BaseBillFun.GraphLine(grdMain, MainIDCol, SubIDCol, s, ref n);
+
+ int MainIDCol2 = Fun_GetSubCol("hmainid");
+ int SubIDCol2 = Fun_GetSubCol("hsubid");
+ string s2 = frmCondition.cmbHComplete.Text;
+ long n2 = 0;
+ DBUtility.Xt_BaseBillFun.GraphLine(grdSub, MainIDCol2, SubIDCol2, s2, ref n2);
+ }
+
+ #endregion
+
+ #region //浣滃簾
+ private void cmdZF_Click(object sender, EventArgs e)
+ {
+ if (grdMain.CurrentRow == null)
+ {
+ MessageBox.Show("璇峰厛閫夋嫨闇�瑕佷綔搴熺殑鏉＄爜锛�", "鎻愮ず");
+ return;
+ }
+ else
+ {
+ if (MessageBox.Show("纭畾瑕佷綔搴熸墍閫夋潯鐮侊紵", "鎻愮ず", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
+ {
+ return;
+ }
+ else
+ {
+ string HRemark = "";
+ string HItemID = "";
+ string HBarCode = "";
+ string HBarCode2 = "";
+ for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
+ {
+ HItemID = HItemID + "," + DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("hmainid")].Value.ToString());
+ HBarCode = HBarCode + ",'" + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value) + "'";
+ if (i != 0 && i % 100 == 0)
+ {
+ HBarCode2 = HBarCode2 + "#" + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value);
+ }
+ else
+ {
+ HBarCode2 = HBarCode2 + "," + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value);
+ }
+ if (DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("浣滃簾鏍囪")].Value) != "")
+ {
+ HRemark = HRemark + "銆�" + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value);
+ }
+ }
+ if (HRemark != "")
+ {
+ MessageBox.Show("鎵�閫夋潯鐮佺紪鍙凤細"+ HRemark.Remove(0, 1)+" 宸蹭綔搴燂紝涓嶅厑璁搁噸澶嶄綔搴燂紒", "鎻愮ず");
+ return;
+ }
+ HItemID = HItemID.Remove(0, 1); //鍘绘帀瀛楃涓茬涓�涓瓧绗�
+ HBarCode = HBarCode.Remove(0, 1);
+ HBarCode2 = HBarCode2.Remove(0, 1);
+
+ try
+ {
+ oCn.BeginTran();
+ string[] NewBarCode;
+ NewBarCode = HBarCode2.Split(Convert.ToChar("#"));
+
+ //浣滃簾鏉＄爜
+ oCn.RunProc("update Gy_BarCodeBill set HStopflag=1,HDeleteMan='" + DBUtility.ClsPub.CurUserName + "',HDeleteDate=getdate() where HItemID in (" + HItemID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鍐欏叆绯荤粺鏃ュ織
+ for (int i = 0; i <= NewBarCode.Length - 1; i++)
+ {
+ oCn.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + DBUtility.ClsPub.CurUserName + "','" + DBUtility.ClsPub.ComputerName + "','浣滃簾鏉＄爜锛�" + NewBarCode[i] + "','娑ょ憾鍗婃垚鍝佺敓鎴愭潯鐮佹ā鍧�','" + DBUtility.ClsPub.IPAddress + "','浣滃簾'", ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ oCn.Commit();
+ }
+ catch (Exception e2)
+ {
+ oCn.RollBack();
+ MessageBox.Show("浣滃簾鏉＄爜澶辫触锛�" + e2.Message, "鎻愮ず");
+ return;
+ }
+ //鍒锋柊鏉＄爜璁板綍鍒楄〃淇℃伅
+ BarCode_Display();
+ MessageBox.Show("鎵�閫夋潯鐮佺紪鍙凤細" + HBarCode.Remove(0, 1) + " 浣滃簾鎴愬姛锛�", "鎻愮ず");
+ }
+ }
+ }
+
+ #endregion
+
+ #region //鍙嶄綔搴�
+ private void cmdFZF_Click(object sender, EventArgs e)
+ {
+ if (grdMain.CurrentRow == null)
+ {
+ MessageBox.Show("璇峰厛閫夋嫨闇�瑕佸弽浣滃簾鐨勬潯鐮侊紒", "鎻愮ず");
+ return;
+ }
+ else
+ {
+ if (MessageBox.Show("纭畾瑕佸弽浣滃簾鎵�閫夋潯鐮侊紵", "鎻愮ず", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
+ {
+ return;
+ }
+ else
+ {
+ string HRemark = "";
+ string HItemID = "";
+ string HBarCode = "";
+ string HBarCode2 = "";
+ for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
+ {
+ HItemID = HItemID + "," + DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("hmainid")].Value.ToString());
+ HBarCode = HBarCode + ",'" + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value) + "'";
+ if (i != 0 && i % 100 == 0)
+ {
+ HBarCode2 = HBarCode2 + "#" + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value);
+ }
+ else
+ {
+ HBarCode2 = HBarCode2 + "," + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value);
+ }
+ if (DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("浣滃簾鏍囪")].Value) == "")
+ {
+ HRemark = HRemark + "銆�" + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value);
+ }
+ }
+ if (HRemark != "")
+ {
+ MessageBox.Show("鎵�閫夋潯鐮佺紪鍙凤細" + HRemark.Remove(0, 1) + " 鏈綔搴燂紝涓嶅厑璁稿弽浣滃簾锛�", "鎻愮ず");
+ return;
+ }
+ HItemID = HItemID.Remove(0, 1); //鍘绘帀瀛楃涓茬涓�涓瓧绗�
+ HBarCode = HBarCode.Remove(0, 1);
+ HBarCode2 = HBarCode2.Remove(0, 1);
+
+ try
+ {
+ oCn.BeginTran();
+ string[] NewBarCode;
+ NewBarCode = HBarCode2.Split(Convert.ToChar("#"));
+
+ //鍙嶄綔搴熸潯鐮�
+ oCn.RunProc("update Gy_BarCodeBill set HStopflag=0,HDeleteMan='',HDeleteDate=null where HItemID in (" + HItemID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+
+ //鍐欏叆绯荤粺鏃ュ織
+ for (int i = 0; i <= NewBarCode.Length - 1; i++)
+ {
+ oCn.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + DBUtility.ClsPub.CurUserName + "','" + DBUtility.ClsPub.ComputerName + "','鍙嶄綔搴熸潯鐮侊細" + NewBarCode[i] + "','娑ょ憾鍗婃垚鍝佺敓鎴愭潯鐮佹ā鍧�','" + DBUtility.ClsPub.IPAddress + "','鍙嶄綔搴�'", ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ oCn.Commit();
+ }
+ catch (Exception e2)
+ {
+ oCn.RollBack();
+ MessageBox.Show("鍙嶄綔搴熸潯鐮佸け璐ワ紒" + e2.Message, "鎻愮ず");
+ return;
+ }
+ //鍒锋柊鏉＄爜璁板綍鍒楄〃淇℃伅
+ BarCode_Display();
+ MessageBox.Show("鎵�閫夋潯鐮佺紪鍙凤細" + HBarCode.Remove(0, 1) + " 鍙嶄綔搴熸垚鍔燂紒", "鎻愮ず");
+ }
+ }
+ }
+
+
+ #endregion
+
+ #region //宸ュ簭閫夋嫨
+
+ private void cmdHProcID_Click(object sender, EventArgs e)
+ {
+ DAL.ClsGy_Process_View oProcess = new DAL.ClsGy_Process_View();
+ if (oProcess.RefreshView())
+ {
+ this.txtHProcID.Text = oProcess.oModel.HName;
+ this.txtHProcID.Tag = oProcess.oModel.HItemID.ToString();
+ }
+
+ if(oProcess.oModel.HItemID!=0 && HProcessExchangeInterID != 0)
+ {
+ //鏍规嵁杞崱涓籌D銆佸伐搴忓甫鍑烘祦杞崱涓婄浉搴旀祦姘村彿銆佺彮缁勩�佸伐浣滀腑蹇冦�佺敓浜ц祫婧�
+ DataSet Ds = oCn.RunProcReturn("exec h_p_KF_GetBCPWeighSource_ProcID " + HProcessExchangeInterID.ToString() + "," + oProcess.oModel.HItemID.ToString(), "h_p_KF_GetBCPWeighSource_ProcID");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ this.txtHProcID.Text = "";
+ this.txtHProcID.Tag = 0;
+ MessageBox.Show("鎵�閫夊伐搴忎笉鍦ㄥ綋鍓嶅伐搴忔祦杞崱涓嬶紝璇烽噸鏂伴�夋嫨姝ｇ‘宸ュ簭锛�");
+ return;
+ }
+ else
+ {
+ HProcessExchangeEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSourceEntryID"]);
+ txtHProcNo.Text = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProcNo"]);
+ txtHCenterID.Tag = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCenterID"]);
+ txtHCenterID.Text = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCenterName"]);
+ txtHGroupID.Tag = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HGroupID"]);
+ txtHGroupID.Text = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HGroupName"]);
+ txtHSourceID.Tag = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSourceID"]);
+ txtHSourceID.Text = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HSourceName"]);
+ }
+ }
+ }
+
+ private void txtHProcID_TextChanged(object sender, EventArgs e)
+ {
+ BLL.ClsPub_BLL.Sub_ClearText(txtHProcID);
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode_StationOutBill.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode_StationOutBill.designer.cs"
new file mode 100644
index 0000000..ec7a0b6
--- /dev/null
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode_StationOutBill.designer.cs"
@@ -0,0 +1,977 @@
+锘縩amespace WarM
+{
+ partial class Kf_WeighToBarCode_StationOutBill
+ {
+ /// <summary>
+ /// 蹇呴渶鐨勮璁″櫒鍙橀噺銆�
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// 娓呯悊鎵�鏈夋鍦ㄤ娇鐢ㄧ殑璧勬簮銆�
+ /// </summary>
+ /// <param name="disposing">濡傛灉搴旈噴鏀炬墭绠¤祫婧愶紝涓� true锛涘惁鍒欎负 false銆�</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows 绐椾綋璁捐鍣ㄧ敓鎴愮殑浠ｇ爜
+
+ /// <summary>
+ /// 璁捐鍣ㄦ敮鎸佹墍闇�鐨勬柟娉� - 涓嶈
+ /// 浣跨敤浠ｇ爜缂栬緫鍣ㄤ慨鏀规鏂规硶鐨勫唴瀹广��
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Kf_WeighToBarCode_StationOutBill));
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+ this.Tool = new System.Windows.Forms.ToolStrip();
+ this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
+ this.mrlk = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
+ this.bclk = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
+ this.sx = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+ this.dy = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+ this.hb = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+ this.tc = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
+ this.timer1 = new System.Windows.Forms.Timer(this.components);
+ this.grdMain = new System.Windows.Forms.DataGridView();
+ this.label2 = new System.Windows.Forms.Label();
+ this.txtHMaterModel = new System.Windows.Forms.TextBox();
+ this.label3 = new System.Windows.Forms.Label();
+ this.txtHProcID = new System.Windows.Forms.TextBox();
+ this.label4 = new System.Windows.Forms.Label();
+ this.txtHMaterNumber = new System.Windows.Forms.TextBox();
+ this.gbUp = new System.Windows.Forms.GroupBox();
+ this.label17 = new System.Windows.Forms.Label();
+ this.txtHProcNo = new System.Windows.Forms.TextBox();
+ this.label16 = new System.Windows.Forms.Label();
+ this.txtHICMOBillNo = new System.Windows.Forms.TextBox();
+ this.label13 = new System.Windows.Forms.Label();
+ this.txtHCenterID = new System.Windows.Forms.TextBox();
+ this.cmdHProcID = new System.Windows.Forms.Button();
+ this.chkHDYFlag = new System.Windows.Forms.CheckBox();
+ this.cmdFZF = new System.Windows.Forms.Button();
+ this.cmdZF = new System.Windows.Forms.Button();
+ this.txtHDeptName = new System.Windows.Forms.TextBox();
+ this.label12 = new System.Windows.Forms.Label();
+ this.txtHBatchNo = new System.Windows.Forms.TextBox();
+ this.label11 = new System.Windows.Forms.Label();
+ this.label10 = new System.Windows.Forms.Label();
+ this.txtHSourceID = new System.Windows.Forms.TextBox();
+ this.label9 = new System.Windows.Forms.Label();
+ this.txtHGroupID = new System.Windows.Forms.TextBox();
+ this.label7 = new System.Windows.Forms.Label();
+ this.txtHQty = new System.Windows.Forms.TextBox();
+ this.label14 = new System.Windows.Forms.Label();
+ this.txtHMaterName = new System.Windows.Forms.TextBox();
+ this.cmdSave = new System.Windows.Forms.Button();
+ this.label5 = new System.Windows.Forms.Label();
+ this.cmdSourceBillNo = new System.Windows.Forms.Button();
+ this.txtHBillNo = new System.Windows.Forms.TextBox();
+ this.cmbHBarCodeType = new System.Windows.Forms.ComboBox();
+ this.label8 = new System.Windows.Forms.Label();
+ this.dtpHDate = new System.Windows.Forms.DateTimePicker();
+ this.label6 = new System.Windows.Forms.Label();
+ this.grdSub = new System.Windows.Forms.DataGridView();
+ this.tabControl1 = new System.Windows.Forms.TabControl();
+ this.tabPage1 = new System.Windows.Forms.TabPage();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.label1 = new System.Windows.Forms.Label();
+ this.txtHBarCode = new System.Windows.Forms.TextBox();
+ this.cmdOK = new System.Windows.Forms.Button();
+ this.panel2 = new System.Windows.Forms.Panel();
+ this.宸︿晶 = new System.Windows.Forms.Panel();
+ this.涓棿 = new System.Windows.Forms.Panel();
+ this.搴曢儴 = new System.Windows.Forms.Panel();
+ this.鍙充晶 = new System.Windows.Forms.Panel();
+ this.Tool.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
+ this.gbUp.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdSub)).BeginInit();
+ this.tabControl1.SuspendLayout();
+ this.tabPage1.SuspendLayout();
+ this.panel1.SuspendLayout();
+ this.groupBox1.SuspendLayout();
+ this.panel2.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // Tool
+ //
+ this.Tool.AutoSize = false;
+ this.Tool.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("Tool.BackgroundImage")));
+ this.Tool.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.Tool.ImageScalingSize = new System.Drawing.Size(22, 22);
+ this.Tool.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.toolStripSeparator9,
+ this.mrlk,
+ this.toolStripSeparator7,
+ this.bclk,
+ this.toolStripSeparator8,
+ this.sx,
+ this.toolStripSeparator1,
+ this.dy,
+ this.toolStripSeparator2,
+ this.hb,
+ this.toolStripSeparator3,
+ this.tc,
+ this.toolStripSeparator4});
+ this.Tool.Location = new System.Drawing.Point(0, 0);
+ this.Tool.Name = "Tool";
+ this.Tool.Padding = new System.Windows.Forms.Padding(0);
+ this.Tool.Size = new System.Drawing.Size(1396, 50);
+ this.Tool.Stretch = true;
+ this.Tool.TabIndex = 16;
+ this.Tool.Text = "toolStrip1";
+ //
+ // toolStripSeparator9
+ //
+ this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator9.Name = "toolStripSeparator9";
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
+ //
+ // mrlk
+ //
+ this.mrlk.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.mrlk.Image = ((System.Drawing.Image)(resources.GetObject("mrlk.Image")));
+ this.mrlk.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
+ this.mrlk.Name = "mrlk";
+ this.mrlk.Size = new System.Drawing.Size(60, 47);
+ this.mrlk.Text = "榛樿鍒楀";
+ this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.mrlk.Click += new System.EventHandler(this.mrlk_Click);
+ //
+ // toolStripSeparator7
+ //
+ this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator7.Name = "toolStripSeparator7";
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
+ //
+ // bclk
+ //
+ this.bclk.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.bclk.Image = ((System.Drawing.Image)(resources.GetObject("bclk.Image")));
+ this.bclk.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.bclk.ImageTransparentColor = System.Drawing.Color.White;
+ this.bclk.Name = "bclk";
+ this.bclk.Size = new System.Drawing.Size(60, 47);
+ this.bclk.Text = "淇濆瓨鍒楀";
+ this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.bclk.Click += new System.EventHandler(this.bclk_Click);
+ //
+ // toolStripSeparator8
+ //
+ this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator8.Name = "toolStripSeparator8";
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
+ //
+ // sx
+ //
+ this.sx.AutoSize = false;
+ this.sx.Image = ((System.Drawing.Image)(resources.GetObject("sx.Image")));
+ this.sx.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.sx.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.sx.ImageTransparentColor = System.Drawing.Color.White;
+ this.sx.Name = "sx";
+ this.sx.Size = new System.Drawing.Size(35, 47);
+ this.sx.Text = "鍒锋柊";
+ this.sx.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.sx.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.sx.Click += new System.EventHandler(this.sx_Click_1);
+ //
+ // toolStripSeparator1
+ //
+ this.toolStripSeparator1.Name = "toolStripSeparator1";
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
+ //
+ // dy
+ //
+ this.dy.AutoSize = false;
+ this.dy.Image = ((System.Drawing.Image)(resources.GetObject("dy.Image")));
+ this.dy.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.dy.ImageTransparentColor = System.Drawing.Color.White;
+ this.dy.Name = "dy";
+ this.dy.Size = new System.Drawing.Size(35, 47);
+ this.dy.Text = "鎵撳嵃";
+ this.dy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.dy.Click += new System.EventHandler(this.dy_Click_1);
+ //
+ // toolStripSeparator2
+ //
+ this.toolStripSeparator2.Name = "toolStripSeparator2";
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
+ //
+ // hb
+ //
+ this.hb.AutoSize = false;
+ this.hb.Image = ((System.Drawing.Image)(resources.GetObject("hb.Image")));
+ this.hb.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.hb.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.hb.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.hb.Name = "hb";
+ this.hb.Size = new System.Drawing.Size(40, 47);
+ this.hb.Text = "鐢熷崟";
+ this.hb.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.hb.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.hb.Click += new System.EventHandler(this.hb_Click);
+ //
+ // toolStripSeparator3
+ //
+ this.toolStripSeparator3.Name = "toolStripSeparator3";
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
+ //
+ // tc
+ //
+ this.tc.AutoSize = false;
+ this.tc.Image = ((System.Drawing.Image)(resources.GetObject("tc.Image")));
+ this.tc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.tc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.tc.ImageTransparentColor = System.Drawing.Color.White;
+ this.tc.Name = "tc";
+ this.tc.Size = new System.Drawing.Size(36, 47);
+ this.tc.Text = "閫�鍑�";
+ this.tc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.tc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.tc.Click += new System.EventHandler(this.tc_Click);
+ //
+ // toolStripSeparator4
+ //
+ this.toolStripSeparator4.Name = "toolStripSeparator4";
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
+ //
+ // timer1
+ //
+ this.timer1.Enabled = true;
+ this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+ //
+ // grdMain
+ //
+ this.grdMain.AllowUserToAddRows = false;
+ this.grdMain.AllowUserToDeleteRows = false;
+ this.grdMain.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
+ this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;
+ dataGridViewCellStyle1.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText;
+ dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.grdMain.DefaultCellStyle = dataGridViewCellStyle1;
+ this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.grdMain.Location = new System.Drawing.Point(3, 3);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(0);
+ this.grdMain.Name = "grdMain";
+ this.grdMain.ReadOnly = true;
+ this.grdMain.RowHeadersWidth = 51;
+ this.grdMain.RowTemplate.Height = 23;
+ this.grdMain.Size = new System.Drawing.Size(1091, 377);
+ this.grdMain.TabIndex = 19;
+ this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label2.ForeColor = System.Drawing.Color.Black;
+ this.label2.Location = new System.Drawing.Point(442, 60);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(53, 12);
+ this.label2.TabIndex = 49;
+ this.label2.Text = "瑙勬牸鍨嬪彿";
+ //
+ // txtHMaterModel
+ //
+ this.txtHMaterModel.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHMaterModel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHMaterModel.Location = new System.Drawing.Point(498, 56);
+ this.txtHMaterModel.Name = "txtHMaterModel";
+ this.txtHMaterModel.ReadOnly = true;
+ this.txtHMaterModel.Size = new System.Drawing.Size(128, 21);
+ this.txtHMaterModel.TabIndex = 50;
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label3.ForeColor = System.Drawing.Color.Black;
+ this.label3.Location = new System.Drawing.Point(272, 88);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(29, 12);
+ this.label3.TabIndex = 52;
+ this.label3.Text = "宸ュ簭";
+ //
+ // txtHProcID
+ //
+ this.txtHProcID.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHProcID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHProcID.Location = new System.Drawing.Point(303, 84);
+ this.txtHProcID.Name = "txtHProcID";
+ this.txtHProcID.ReadOnly = true;
+ this.txtHProcID.Size = new System.Drawing.Size(112, 21);
+ this.txtHProcID.TabIndex = 53;
+ this.txtHProcID.TextChanged += new System.EventHandler(this.txtHProcID_TextChanged);
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label4.ForeColor = System.Drawing.Color.Black;
+ this.label4.Location = new System.Drawing.Point(39, 60);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(53, 12);
+ this.label4.TabIndex = 55;
+ this.label4.Text = "鐗╂枡浠ｇ爜";
+ //
+ // txtHMaterNumber
+ //
+ this.txtHMaterNumber.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHMaterNumber.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHMaterNumber.Location = new System.Drawing.Point(95, 56);
+ this.txtHMaterNumber.Name = "txtHMaterNumber";
+ this.txtHMaterNumber.ReadOnly = true;
+ this.txtHMaterNumber.Size = new System.Drawing.Size(128, 21);
+ this.txtHMaterNumber.TabIndex = 56;
+ //
+ // gbUp
+ //
+ this.gbUp.BackColor = System.Drawing.Color.Transparent;
+ this.gbUp.Controls.Add(this.label17);
+ this.gbUp.Controls.Add(this.txtHProcNo);
+ this.gbUp.Controls.Add(this.label16);
+ this.gbUp.Controls.Add(this.txtHICMOBillNo);
+ this.gbUp.Controls.Add(this.label13);
+ this.gbUp.Controls.Add(this.txtHCenterID);
+ this.gbUp.Controls.Add(this.cmdHProcID);
+ this.gbUp.Controls.Add(this.chkHDYFlag);
+ this.gbUp.Controls.Add(this.cmdFZF);
+ this.gbUp.Controls.Add(this.cmdZF);
+ this.gbUp.Controls.Add(this.txtHDeptName);
+ this.gbUp.Controls.Add(this.label12);
+ this.gbUp.Controls.Add(this.txtHBatchNo);
+ this.gbUp.Controls.Add(this.label11);
+ this.gbUp.Controls.Add(this.label10);
+ this.gbUp.Controls.Add(this.txtHSourceID);
+ this.gbUp.Controls.Add(this.label9);
+ this.gbUp.Controls.Add(this.txtHGroupID);
+ this.gbUp.Controls.Add(this.label7);
+ this.gbUp.Controls.Add(this.txtHQty);
+ this.gbUp.Controls.Add(this.label14);
+ this.gbUp.Controls.Add(this.txtHMaterName);
+ this.gbUp.Controls.Add(this.cmdSave);
+ this.gbUp.Controls.Add(this.label5);
+ this.gbUp.Controls.Add(this.cmdSourceBillNo);
+ this.gbUp.Controls.Add(this.txtHBillNo);
+ this.gbUp.Controls.Add(this.cmbHBarCodeType);
+ this.gbUp.Controls.Add(this.label8);
+ this.gbUp.Controls.Add(this.dtpHDate);
+ this.gbUp.Controls.Add(this.label6);
+ this.gbUp.Controls.Add(this.label4);
+ this.gbUp.Controls.Add(this.txtHMaterNumber);
+ this.gbUp.Controls.Add(this.label3);
+ this.gbUp.Controls.Add(this.txtHMaterModel);
+ this.gbUp.Controls.Add(this.txtHProcID);
+ this.gbUp.Controls.Add(this.label2);
+ this.gbUp.Dock = System.Windows.Forms.DockStyle.Top;
+ this.gbUp.Location = new System.Drawing.Point(0, 0);
+ this.gbUp.Name = "gbUp";
+ this.gbUp.Size = new System.Drawing.Size(1105, 218);
+ this.gbUp.TabIndex = 58;
+ this.gbUp.TabStop = false;
+ //
+ // label17
+ //
+ this.label17.AutoSize = true;
+ this.label17.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label17.ForeColor = System.Drawing.Color.Black;
+ this.label17.Location = new System.Drawing.Point(454, 88);
+ this.label17.Name = "label17";
+ this.label17.Size = new System.Drawing.Size(41, 12);
+ this.label17.TabIndex = 324;
+ this.label17.Text = "娴佹按鍙�";
+ //
+ // txtHProcNo
+ //
+ this.txtHProcNo.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHProcNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHProcNo.Location = new System.Drawing.Point(498, 84);
+ this.txtHProcNo.Name = "txtHProcNo";
+ this.txtHProcNo.ReadOnly = true;
+ this.txtHProcNo.Size = new System.Drawing.Size(128, 21);
+ this.txtHProcNo.TabIndex = 325;
+ //
+ // label16
+ //
+ this.label16.AutoSize = true;
+ this.label16.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label16.ForeColor = System.Drawing.Color.Black;
+ this.label16.Location = new System.Drawing.Point(626, 88);
+ this.label16.Name = "label16";
+ this.label16.Size = new System.Drawing.Size(65, 12);
+ this.label16.TabIndex = 320;
+ this.label16.Text = "鐢熶骇璁㈠崟鍙�";
+ //
+ // txtHICMOBillNo
+ //
+ this.txtHICMOBillNo.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHICMOBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHICMOBillNo.Location = new System.Drawing.Point(693, 84);
+ this.txtHICMOBillNo.Name = "txtHICMOBillNo";
+ this.txtHICMOBillNo.ReadOnly = true;
+ this.txtHICMOBillNo.Size = new System.Drawing.Size(128, 21);
+ this.txtHICMOBillNo.TabIndex = 321;
+ //
+ // label13
+ //
+ this.label13.AutoSize = true;
+ this.label13.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label13.ForeColor = System.Drawing.Color.Black;
+ this.label13.Location = new System.Drawing.Point(248, 116);
+ this.label13.Name = "label13";
+ this.label13.Size = new System.Drawing.Size(53, 12);
+ this.label13.TabIndex = 318;
+ this.label13.Text = "宸ヤ綔涓績";
+ //
+ // txtHCenterID
+ //
+ this.txtHCenterID.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHCenterID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHCenterID.Location = new System.Drawing.Point(303, 112);
+ this.txtHCenterID.Name = "txtHCenterID";
+ this.txtHCenterID.ReadOnly = true;
+ this.txtHCenterID.Size = new System.Drawing.Size(128, 21);
+ this.txtHCenterID.TabIndex = 319;
+ //
+ // cmdHProcID
+ //
+ this.cmdHProcID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHProcID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHProcID.Image")));
+ this.cmdHProcID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHProcID.Location = new System.Drawing.Point(409, 83);
+ this.cmdHProcID.Name = "cmdHProcID";
+ this.cmdHProcID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHProcID.TabIndex = 317;
+ this.cmdHProcID.UseVisualStyleBackColor = false;
+ this.cmdHProcID.Click += new System.EventHandler(this.cmdHProcID_Click);
+ //
+ // chkHDYFlag
+ //
+ this.chkHDYFlag.AutoSize = true;
+ this.chkHDYFlag.Location = new System.Drawing.Point(558, 188);
+ this.chkHDYFlag.Margin = new System.Windows.Forms.Padding(2);
+ this.chkHDYFlag.Name = "chkHDYFlag";
+ this.chkHDYFlag.Size = new System.Drawing.Size(72, 16);
+ this.chkHDYFlag.TabIndex = 316;
+ this.chkHDYFlag.Text = "鑷姩鎵撳嵃";
+ this.chkHDYFlag.UseVisualStyleBackColor = true;
+ //
+ // cmdFZF
+ //
+ this.cmdFZF.BackColor = System.Drawing.Color.White;
+ this.cmdFZF.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.cmdFZF.Location = new System.Drawing.Point(729, 174);
+ this.cmdFZF.Margin = new System.Windows.Forms.Padding(2);
+ this.cmdFZF.Name = "cmdFZF";
+ this.cmdFZF.Size = new System.Drawing.Size(86, 32);
+ this.cmdFZF.TabIndex = 157;
+ this.cmdFZF.Text = "鍙嶄綔搴�";
+ this.cmdFZF.UseVisualStyleBackColor = false;
+ this.cmdFZF.Click += new System.EventHandler(this.cmdFZF_Click);
+ //
+ // cmdZF
+ //
+ this.cmdZF.BackColor = System.Drawing.Color.White;
+ this.cmdZF.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.cmdZF.Location = new System.Drawing.Point(635, 174);
+ this.cmdZF.Margin = new System.Windows.Forms.Padding(2);
+ this.cmdZF.Name = "cmdZF";
+ this.cmdZF.Size = new System.Drawing.Size(86, 32);
+ this.cmdZF.TabIndex = 156;
+ this.cmdZF.Text = "浣滃簾";
+ this.cmdZF.UseVisualStyleBackColor = false;
+ this.cmdZF.Click += new System.EventHandler(this.cmdZF_Click);
+ //
+ // txtHDeptName
+ //
+ this.txtHDeptName.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHDeptName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHDeptName.Location = new System.Drawing.Point(498, 28);
+ this.txtHDeptName.Name = "txtHDeptName";
+ this.txtHDeptName.ReadOnly = true;
+ this.txtHDeptName.Size = new System.Drawing.Size(128, 21);
+ this.txtHDeptName.TabIndex = 155;
+ //
+ // label12
+ //
+ this.label12.AutoSize = true;
+ this.label12.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label12.ForeColor = System.Drawing.Color.Black;
+ this.label12.Location = new System.Drawing.Point(466, 32);
+ this.label12.Name = "label12";
+ this.label12.Size = new System.Drawing.Size(29, 12);
+ this.label12.TabIndex = 154;
+ this.label12.Text = "杞﹂棿";
+ //
+ // txtHBatchNo
+ //
+ this.txtHBatchNo.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHBatchNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHBatchNo.Location = new System.Drawing.Point(693, 56);
+ this.txtHBatchNo.Name = "txtHBatchNo";
+ this.txtHBatchNo.ReadOnly = true;
+ this.txtHBatchNo.Size = new System.Drawing.Size(128, 21);
+ this.txtHBatchNo.TabIndex = 153;
+ //
+ // label11
+ //
+ this.label11.AutoSize = true;
+ this.label11.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label11.ForeColor = System.Drawing.Color.Black;
+ this.label11.Location = new System.Drawing.Point(662, 60);
+ this.label11.Name = "label11";
+ this.label11.Size = new System.Drawing.Size(29, 12);
+ this.label11.TabIndex = 152;
+ this.label11.Text = "鎵瑰彿";
+ //
+ // label10
+ //
+ this.label10.AutoSize = true;
+ this.label10.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label10.ForeColor = System.Drawing.Color.Black;
+ this.label10.Location = new System.Drawing.Point(442, 116);
+ this.label10.Name = "label10";
+ this.label10.Size = new System.Drawing.Size(53, 12);
+ this.label10.TabIndex = 150;
+ this.label10.Text = "鐢熶骇璧勬簮";
+ //
+ // txtHSourceID
+ //
+ this.txtHSourceID.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHSourceID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHSourceID.Location = new System.Drawing.Point(498, 112);
+ this.txtHSourceID.Name = "txtHSourceID";
+ this.txtHSourceID.ReadOnly = true;
+ this.txtHSourceID.Size = new System.Drawing.Size(128, 21);
+ this.txtHSourceID.TabIndex = 151;
+ //
+ // label9
+ //
+ this.label9.AutoSize = true;
+ this.label9.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label9.ForeColor = System.Drawing.Color.Black;
+ this.label9.Location = new System.Drawing.Point(39, 116);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(53, 12);
+ this.label9.TabIndex = 148;
+ this.label9.Text = "鐢熶骇鐝粍";
+ //
+ // txtHGroupID
+ //
+ this.txtHGroupID.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHGroupID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHGroupID.Location = new System.Drawing.Point(95, 112);
+ this.txtHGroupID.Name = "txtHGroupID";
+ this.txtHGroupID.ReadOnly = true;
+ this.txtHGroupID.Size = new System.Drawing.Size(128, 21);
+ this.txtHGroupID.TabIndex = 149;
+ //
+ // label7
+ //
+ this.label7.AutoSize = true;
+ this.label7.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label7.ForeColor = System.Drawing.Color.Black;
+ this.label7.Location = new System.Drawing.Point(63, 88);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(29, 12);
+ this.label7.TabIndex = 146;
+ this.label7.Text = "绫虫暟";
+ //
+ // txtHQty
+ //
+ this.txtHQty.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHQty.Location = new System.Drawing.Point(95, 84);
+ this.txtHQty.Name = "txtHQty";
+ this.txtHQty.Size = new System.Drawing.Size(128, 21);
+ this.txtHQty.TabIndex = 147;
+ //
+ // label14
+ //
+ this.label14.AutoSize = true;
+ this.label14.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label14.ForeColor = System.Drawing.Color.Black;
+ this.label14.Location = new System.Drawing.Point(248, 60);
+ this.label14.Name = "label14";
+ this.label14.Size = new System.Drawing.Size(53, 12);
+ this.label14.TabIndex = 144;
+ this.label14.Text = "鐗╂枡鍚嶇О";
+ //
+ // txtHMaterName
+ //
+ this.txtHMaterName.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHMaterName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHMaterName.Location = new System.Drawing.Point(303, 56);
+ this.txtHMaterName.Name = "txtHMaterName";
+ this.txtHMaterName.ReadOnly = true;
+ this.txtHMaterName.Size = new System.Drawing.Size(128, 21);
+ this.txtHMaterName.TabIndex = 145;
+ //
+ // cmdSave
+ //
+ this.cmdSave.BackColor = System.Drawing.Color.White;
+ this.cmdSave.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.cmdSave.Location = new System.Drawing.Point(209, 174);
+ this.cmdSave.Margin = new System.Windows.Forms.Padding(2);
+ this.cmdSave.Name = "cmdSave";
+ this.cmdSave.Size = new System.Drawing.Size(86, 32);
+ this.cmdSave.TabIndex = 139;
+ this.cmdSave.Text = "淇濆瓨";
+ this.cmdSave.UseVisualStyleBackColor = false;
+ this.cmdSave.Click += new System.EventHandler(this.cmdSave_Click);
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label5.ForeColor = System.Drawing.Color.Black;
+ this.label5.Location = new System.Drawing.Point(51, 32);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(41, 12);
+ this.label5.TabIndex = 142;
+ this.label5.Text = "鍗曟嵁鍙�";
+ //
+ // cmdSourceBillNo
+ //
+ this.cmdSourceBillNo.BackColor = System.Drawing.Color.White;
+ this.cmdSourceBillNo.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.cmdSourceBillNo.Location = new System.Drawing.Point(102, 174);
+ this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(2);
+ this.cmdSourceBillNo.Name = "cmdSourceBillNo";
+ this.cmdSourceBillNo.Size = new System.Drawing.Size(86, 32);
+ this.cmdSourceBillNo.TabIndex = 138;
+ this.cmdSourceBillNo.Text = "閫夊崟";
+ this.cmdSourceBillNo.UseVisualStyleBackColor = false;
+ this.cmdSourceBillNo.Click += new System.EventHandler(this.cmdSourceBillNo_Click);
+ //
+ // txtHBillNo
+ //
+ this.txtHBillNo.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHBillNo.Location = new System.Drawing.Point(95, 28);
+ this.txtHBillNo.Name = "txtHBillNo";
+ this.txtHBillNo.ReadOnly = true;
+ this.txtHBillNo.Size = new System.Drawing.Size(128, 21);
+ this.txtHBillNo.TabIndex = 143;
+ //
+ // cmbHBarCodeType
+ //
+ this.cmbHBarCodeType.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.cmbHBarCodeType.FormattingEnabled = true;
+ this.cmbHBarCodeType.Items.AddRange(new object[] {
+ "鍞竴鏉＄爜"});
+ this.cmbHBarCodeType.Location = new System.Drawing.Point(693, 28);
+ this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(2);
+ this.cmbHBarCodeType.Name = "cmbHBarCodeType";
+ this.cmbHBarCodeType.Size = new System.Drawing.Size(128, 20);
+ this.cmbHBarCodeType.TabIndex = 139;
+ //
+ // label8
+ //
+ this.label8.AutoSize = true;
+ this.label8.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label8.ForeColor = System.Drawing.Color.Black;
+ this.label8.Location = new System.Drawing.Point(638, 32);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(53, 12);
+ this.label8.TabIndex = 138;
+ this.label8.Text = "鏉＄爜绫诲瀷";
+ //
+ // dtpHDate
+ //
+ this.dtpHDate.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.dtpHDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
+ this.dtpHDate.Location = new System.Drawing.Point(303, 28);
+ this.dtpHDate.Margin = new System.Windows.Forms.Padding(2);
+ this.dtpHDate.Name = "dtpHDate";
+ this.dtpHDate.Size = new System.Drawing.Size(128, 21);
+ this.dtpHDate.TabIndex = 100;
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label6.ForeColor = System.Drawing.Color.Black;
+ this.label6.Location = new System.Drawing.Point(272, 32);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(29, 12);
+ this.label6.TabIndex = 99;
+ this.label6.Text = "鏃ユ湡";
+ //
+ // grdSub
+ //
+ this.grdSub.AllowUserToAddRows = false;
+ this.grdSub.AllowUserToDeleteRows = false;
+ this.grdSub.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
+ this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
+ dataGridViewCellStyle2.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
+ dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.grdSub.DefaultCellStyle = dataGridViewCellStyle2;
+ this.grdSub.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.grdSub.Location = new System.Drawing.Point(0, 73);
+ this.grdSub.Margin = new System.Windows.Forms.Padding(0);
+ this.grdSub.Name = "grdSub";
+ this.grdSub.ReadOnly = true;
+ this.grdSub.RowHeadersWidth = 51;
+ this.grdSub.RowTemplate.Height = 23;
+ this.grdSub.Size = new System.Drawing.Size(257, 554);
+ this.grdSub.TabIndex = 18;
+ this.grdSub.Paint += new System.Windows.Forms.PaintEventHandler(this.grdSub_Paint);
+ //
+ // tabControl1
+ //
+ this.tabControl1.Controls.Add(this.tabPage1);
+ this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tabControl1.Location = new System.Drawing.Point(0, 218);
+ this.tabControl1.Name = "tabControl1";
+ this.tabControl1.SelectedIndex = 0;
+ this.tabControl1.Size = new System.Drawing.Size(1105, 409);
+ this.tabControl1.TabIndex = 149;
+ //
+ // tabPage1
+ //
+ this.tabPage1.Controls.Add(this.grdMain);
+ this.tabPage1.Location = new System.Drawing.Point(4, 22);
+ this.tabPage1.Name = "tabPage1";
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage1.Size = new System.Drawing.Size(1097, 383);
+ this.tabPage1.TabIndex = 0;
+ this.tabPage1.Text = "鏉＄爜璁板綍";
+ this.tabPage1.UseVisualStyleBackColor = true;
+ //
+ // panel1
+ //
+ this.panel1.Controls.Add(this.grdSub);
+ this.panel1.Controls.Add(this.groupBox1);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
+ this.panel1.Location = new System.Drawing.Point(11, 50);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(257, 627);
+ this.panel1.TabIndex = 59;
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.label1);
+ this.groupBox1.Controls.Add(this.txtHBarCode);
+ this.groupBox1.Controls.Add(this.cmdOK);
+ this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.groupBox1.Location = new System.Drawing.Point(0, 0);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(257, 73);
+ this.groupBox1.TabIndex = 146;
+ this.groupBox1.TabStop = false;
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label1.ForeColor = System.Drawing.Color.Black;
+ this.label1.Location = new System.Drawing.Point(11, 40);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(41, 12);
+ this.label1.TabIndex = 151;
+ this.label1.Text = "鏉″舰鐮�";
+ //
+ // txtHBarCode
+ //
+ this.txtHBarCode.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHBarCode.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHBarCode.Location = new System.Drawing.Point(57, 36);
+ this.txtHBarCode.Name = "txtHBarCode";
+ this.txtHBarCode.Size = new System.Drawing.Size(127, 21);
+ this.txtHBarCode.TabIndex = 152;
+ this.txtHBarCode.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtHBarCode_KeyPress);
+ //
+ // cmdOK
+ //
+ this.cmdOK.BackColor = System.Drawing.Color.White;
+ this.cmdOK.Cursor = System.Windows.Forms.Cursors.Default;
+ this.cmdOK.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.cmdOK.Location = new System.Drawing.Point(189, 33);
+ this.cmdOK.Margin = new System.Windows.Forms.Padding(2);
+ this.cmdOK.Name = "cmdOK";
+ this.cmdOK.Size = new System.Drawing.Size(55, 27);
+ this.cmdOK.TabIndex = 150;
+ this.cmdOK.Text = "纭";
+ this.cmdOK.UseVisualStyleBackColor = false;
+ this.cmdOK.Click += new System.EventHandler(this.cmdOK_Click);
+ //
+ // panel2
+ //
+ this.panel2.Controls.Add(this.tabControl1);
+ this.panel2.Controls.Add(this.gbUp);
+ this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panel2.Location = new System.Drawing.Point(279, 50);
+ this.panel2.Name = "panel2";
+ this.panel2.Size = new System.Drawing.Size(1105, 627);
+ this.panel2.TabIndex = 60;
+ //
+ // 宸︿晶
+ //
+ this.宸︿晶.Dock = System.Windows.Forms.DockStyle.Left;
+ this.宸︿晶.Location = new System.Drawing.Point(0, 50);
+ this.宸︿晶.Name = "宸︿晶";
+ this.宸︿晶.Size = new System.Drawing.Size(11, 627);
+ this.宸︿晶.TabIndex = 61;
+ //
+ // 涓棿
+ //
+ this.涓棿.Dock = System.Windows.Forms.DockStyle.Left;
+ this.涓棿.Location = new System.Drawing.Point(268, 50);
+ this.涓棿.Name = "涓棿";
+ this.涓棿.Size = new System.Drawing.Size(11, 627);
+ this.涓棿.TabIndex = 62;
+ //
+ // 搴曢儴
+ //
+ this.搴曢儴.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.搴曢儴.Location = new System.Drawing.Point(0, 677);
+ this.搴曢儴.Name = "搴曢儴";
+ this.搴曢儴.Size = new System.Drawing.Size(1396, 10);
+ this.搴曢儴.TabIndex = 63;
+ //
+ // 鍙充晶
+ //
+ this.鍙充晶.Dock = System.Windows.Forms.DockStyle.Right;
+ this.鍙充晶.Location = new System.Drawing.Point(1384, 50);
+ this.鍙充晶.Name = "鍙充晶";
+ this.鍙充晶.Size = new System.Drawing.Size(12, 627);
+ this.鍙充晶.TabIndex = 64;
+ //
+ // Kf_WeighToBarCode_StationOutBill
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.AutoSize = true;
+ this.BackColor = System.Drawing.SystemColors.ActiveCaption;
+ this.ClientSize = new System.Drawing.Size(1396, 687);
+ this.Controls.Add(this.panel2);
+ this.Controls.Add(this.涓棿);
+ this.Controls.Add(this.panel1);
+ this.Controls.Add(this.宸︿晶);
+ this.Controls.Add(this.鍙充晶);
+ this.Controls.Add(this.搴曢儴);
+ this.Controls.Add(this.Tool);
+ this.Name = "Kf_WeighToBarCode_StationOutBill";
+ this.Text = "娑ょ憾鍗婃垚鍝佺敓鎴愭潯鐮�";
+ this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+ this.Load += new System.EventHandler(this.Kf_WeighToBarCode_StationOutBill_Load);
+ this.Tool.ResumeLayout(false);
+ this.Tool.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain)).EndInit();
+ this.gbUp.ResumeLayout(false);
+ this.gbUp.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdSub)).EndInit();
+ this.tabControl1.ResumeLayout(false);
+ this.tabPage1.ResumeLayout(false);
+ this.panel1.ResumeLayout(false);
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
+ this.panel2.ResumeLayout(false);
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+ private System.Windows.Forms.ToolStrip Tool;
+ private System.Windows.Forms.ToolStripButton tc;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
+ public System.Windows.Forms.Timer timer1;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
+ private System.Windows.Forms.ToolStripButton mrlk;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
+ private System.Windows.Forms.ToolStripButton bclk;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
+ private System.Windows.Forms.DataGridView grdMain;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.TextBox txtHMaterModel;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.TextBox txtHProcID;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.TextBox txtHMaterNumber;
+ private System.Windows.Forms.GroupBox gbUp;
+ private System.Windows.Forms.DateTimePicker dtpHDate;
+ private System.Windows.Forms.Label label6;
+ private System.Windows.Forms.Button cmdSourceBillNo;
+ private System.Windows.Forms.Button cmdSave;
+ private System.Windows.Forms.Label label8;
+ private System.Windows.Forms.ComboBox cmbHBarCodeType;
+ private System.Windows.Forms.DataGridView grdSub;
+ private System.Windows.Forms.TabControl tabControl1;
+ private System.Windows.Forms.TabPage tabPage1;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.TextBox txtHBillNo;
+ private System.Windows.Forms.Label label14;
+ private System.Windows.Forms.TextBox txtHMaterName;
+ private System.Windows.Forms.ToolStripButton dy;
+ private System.Windows.Forms.ToolStripButton hb;
+ private System.Windows.Forms.ToolStripButton sx;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
+ private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.TextBox txtHBarCode;
+ private System.Windows.Forms.Button cmdOK;
+ private System.Windows.Forms.Panel panel2;
+ private System.Windows.Forms.Label label10;
+ private System.Windows.Forms.TextBox txtHSourceID;
+ private System.Windows.Forms.Label label9;
+ private System.Windows.Forms.TextBox txtHGroupID;
+ private System.Windows.Forms.Label label7;
+ private System.Windows.Forms.TextBox txtHQty;
+ private System.Windows.Forms.TextBox txtHDeptName;
+ private System.Windows.Forms.Label label12;
+ private System.Windows.Forms.TextBox txtHBatchNo;
+ private System.Windows.Forms.Label label11;
+ private System.Windows.Forms.Panel 宸︿晶;
+ private System.Windows.Forms.Panel 涓棿;
+ private System.Windows.Forms.Panel 搴曢儴;
+ private System.Windows.Forms.Panel 鍙充晶;
+ private System.Windows.Forms.Button cmdFZF;
+ private System.Windows.Forms.Button cmdZF;
+ private System.Windows.Forms.CheckBox chkHDYFlag;
+ private System.Windows.Forms.Button cmdHProcID;
+ private System.Windows.Forms.Label label13;
+ private System.Windows.Forms.TextBox txtHCenterID;
+ private System.Windows.Forms.Label label16;
+ private System.Windows.Forms.TextBox txtHICMOBillNo;
+ private System.Windows.Forms.Label label17;
+ private System.Windows.Forms.TextBox txtHProcNo;
+ }
+}
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode_StationOutBill.resx" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode_StationOutBill.resx"
new file mode 100644
index 0000000..0ff34c1
--- /dev/null
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode_StationOutBill.resx"
@@ -0,0 +1,456 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="Tool.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ /9j/4AAQSkZJRgABAQEASABIAAD/4QSARXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
+ AAAAYgEbAAUAAAABAAAAagEoAAMAAAABAAIAAAExAAIAAAAUAAAAcgEyAAIAAAAUAAAAhodpAAQAAAAB
+ AAAAmgAAAMYASAAAAAEAAABIAAAAAQAAQWRvYmUgUGhvdG9zaG9wIDcuMAAyMDA0OjEwOjE0IDE1OjUw
+ OjUwAAADoAEAAwAAAAH//wAAoAIABAAAAAEAAAQAoAMABAAAAAEAAABoAAAAAAAAAAYBAwADAAAAAQAG
+ AAABGgAFAAAAAQAAARQBGwAFAAAAAQAAARwBKAADAAAAAQACAAACAQAEAAAAAQAAASQCAgAEAAAAAQAA
+ A1QAAAAAAAAASAAAAAEAAABIAAAAAf/Y/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMPFB0aHx4d
+ GhwcICQuJyAiLCMcHCg3KSwwMTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIyMjIyMjIy
+ MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy/8AAEQgABgCgAwEhAAIRAQMR
+ Af/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAE
+ EQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElK
+ U1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrC
+ w8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAAB
+ AgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkj
+ M1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5
+ eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm
+ 5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A9P8A+EAsf+fy4o/4QCy/5/Liuv6z/dOf2HmH/CAWX/P5
+ cUf8IBZf8/lz+lH1n+6HsPMP+EAsv+fy5/Oj/hALL/n8uKPrP90PYeYf8IBZf8/lxR/wgFl/z+XFH1n+
+ 6HsPMP8AhALL/n8uKP8AhX9j/wA/lxR9Z/uh7B9w/wCFf2P/AD+XFH/CAWP/AD+XFH1n+6HsH3D/AIQC
+ x/5/Lij/AIQCy/5/Lij6z/dD2HmH/CAWX/P5cUf8K/sf+fy4o+tf3Q9h5h/wgFj/AM/lxR/wgFl/z+XF
+ H1r+6HsPMP8AhALL/n8uKP8AhALL/n8uKPrX90PYeZ//2f/bAEMAAgEBAgEBAgICAgICAgIDBQMDAwMD
+ BgQEAwUHBgcHBwYHBwgJCwkICAoIBwcKDQoKCwwMDAwHCQ4PDQwOCwwMDP/bAEMBAgICAwMDBgMDBgwI
+ BwgMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDP/AABEIACoE
+ AAMBIgACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUE
+ BAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4
+ OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmq
+ srO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEB
+ AQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIy
+ gQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZn
+ aGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV
+ 1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APWB+2p4nH/MN0Qf9w20/wDjNL/w2t4o
+ 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
+</value>
+ </data>
+ <data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
+ znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
+ vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
+ AG0RaJ0Gqp8A+0ICGBIZLkZLifXv8Xb3YnVlRdrdb23gtAHHjpdj5hAVRVdv+vBlaVkes+6pPVzhieHn
+ YQKiwHtHpSFp6+rB4sIn+Y37R+3hB5kNec2SSKV5isvebuiZj8YPxoKxYrSMAR90RyWc2AZqgp/lKSzB
+ Jc91xJI6nEoUdCECchrRJlZl4YA7XgJL+Yl7BszjauvEu9QCZoUk8UFHMq3jW+6HLJS1p+1hniZXO6pq
+ 63Hk5Bkr/Fy9SHvC4+FXhuTa7V6s/dopydbOriXA7Ll/YN7nHrNSENeXMDA4aq0WvP0V2IpLSQFOpuaQ
+ mF+WPSm4Iv7CxmaXNBbWPwUtDpLhZ8/HwyU9ZolvjjkaUH3qrBUuV9WeBkv4mufh42clHWYaz7vwG72U
+ TLZQdeFnAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ /QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
+ 77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
+ aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
+ JWylHvVeGGCm+hBQnNlCNIatWNxW6lGv9B0D3PsIXOrnQts2pGsX0mOdLX3WuYsbjT8gvTyNmsOPeJ+n
+ cOUtAa2bkEdfIbkdkLyuk8rtZGAGUuGCYzxBb/QUYJCAlpAp73+jnIEKN979pNcRPgPQEDSA7HZI4xpW
+ /pgvP+vdRzCwx/Y1AKeP3uZVtjIr0rJKPhMwxMX6RQO41U1AAL45YP77Pny/Ugitc//HAc/8BpD1wIkc
+ xxKuDnOxdh7pbc45rKBuAX4aNexfTiISYQNlALqFpwv068/EcbF0BJdfBEj0IhoGgktAKAisrXIO7yGy
+ mUI6vcPGYe/XePA+QECdF/Jk1gB0ZJWNQgpfQ273QQpeHSmf96oCquiN0R1eF1IPP+AAgRmsjnCqFmoA
+ AAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="sx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFtSURBVDhPtVPLTsJAFOUj+kV+gWv9CaAWBApoITzER6UJ
+ EYMuNLIiigkaCKAGEhWN78ToQqMLTTS60I3GzXHu2CpxCsGFJ5l0eu8959y50zr+DcrYAPoH+4RFcbOk
+ M6jQaIXReDFQf9JRuptA4SqJhfMYAqUhSJLUWYTIe28ZHHzM8GeTiVQedRRvUli6iCN3rCHNxG1FqD1y
+ JvIZZvmeCq1F7nMnER6nvXAccm+8Gmi9Z77JZorDEknvhhDfCohdkED9eZqfXUiaoBp9O4jYhs9eoHQ/
+ icrDVFeB8aaKSHX4q4YC7atwncTKbYon2+Mmn9cnNv0Il70/JrTJHo5i/jSKRXZVeTbt/GWCP393QgIa
+ cxeuk14y+yPIHmnIsUnTtO3I0ZoP6poCpSgLeS6i7wT5lNuT1jG0qhfqugIPI7sKLvuvkoh2zqGyB37W
+ tqfoZmSn6N4NJOBdlSEvu+H8K5lAAlZnPf1MvcPh+AQXey/m/1+IkwAAAABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
+ jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
+ grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
+ FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
+ u3/Bo2wICEG/Oo9XdCIYwhNr8dl8ZRwfdQAAAABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="hb.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
+ d1EcjEwytSiH4SZcRHLQ7FemtlJDOPiZml8XSzMWMz9mK7Xevs/z7DvDzLzr9X2253k+r8+nvn0pM10t
+ hGykjnMndRE1ZWJlVKvF+qdErytIF/1G6k72sMPTBULIRcCF4H2bcOMknC8SNsb/IXheJ8R8hAfPPwUH
+ M4Qz6fKVlXBtJwRWxP99aX/NnKfgcJZwMkfwS9OwdW86TwFLc6MGmxPE2Zok+CwCzwjB5XDkLpbDJHYj
+ cax9ArbHDzukt5HJ9wxbpuGe7+fvvL1esLU6BTmsSHpyfggGRiaxe3yJaJzfhbI/wGHJ7MqKS1ZKv+xx
+ gWFoDDtH57h7jCGeSGDQHoTJGUwL5M6MSrsKFd5y/jst6DaapQkuEI6+4eU1hoZRP4dFFhTMK6FYUKB4
+ SQHVciGKbMpPQafBxAWhiDRBPA7S73O4gH0HWtGtza9BrVslCnUSrSmBPAET3Eee0GO9Ra8tjGQyySUs
+ 8iQ1XvVn58xU1WnxG1zAJmn61pmIPgBiIY95z/CSIgAAAABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
+ rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
+ wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
+ gg==
+</value>
+ </data>
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>102, 16</value>
+ </metadata>
+ <data name="cmdHProcID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ R0lGODlhEAAQAIZBAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
+ /yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
+ /73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
+ /6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+ AABBACwAAAAAEAAQAAAIqACDCBwoMIDBAAQTBjEYIcKECQYVLmQQ44KJFhBmQECYMAAOEAJYnPjgwAHH
+ gQEYqAhBA4YOBDwQIDg5cYcLGyg8LOixYAFNABJkZBBRI8cDEg98ACAIlIOGGylWGOhgwMBSphUq/ACC
+ wQAFClcFEiAAQICAEhZGvDAbloCCDQUAlDUrQO5AtwkKHBgQRK7duwryHmjAV2IQAoIJGxY4QK/ixYwH
+ FIYcEAA7
+</value>
+ </data>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>37</value>
+ </metadata>
+</root>
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
index f90e6ff..eff6b81 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
@@ -992,8 +992,17 @@
//绠卞彿鐢熸垚瑙勫垯 鏃ユ湡 + 鏈哄彴 + 鐝 + 鐗╂枡 鍙鑾峰彇鏈�澶х殑娴佹按鍙�
+ string sBoxYear;
+ string sBoxPeriod;
+ string sBoxDay;
+ DateTime HBoxDate = DBUtility.ClsPub.isDate(DBUtility.ClsPub.GetServerDate(0));
+ sBoxYear = HBoxDate.Year.ToString().Substring(2, 2);
+ sBoxPeriod = "0" + HBoxDate.Month.ToString();
+ sBoxPeriod = HPeriod.Substring(HPeriod.Length - 2, 2);
+ sBoxDay = "0" + HBoxDate.Day.ToString();
+ sBoxDay = HDay.Substring(HDay.Length - 2, 2);
HJT = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("璁惧")].Value);
- HXH = HYear + HPeriod + HDay + HBC + HJT + HMaterNumber;
+ HXH = sBoxYear + sBoxPeriod + sBoxDay + HBC + HJT + HMaterNumber;
Ds99 = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HXH + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
LSH3 = ClsPub.isLong(Ds99.Tables[0].Rows[0][0]) + 1;
LSH4 = LSH3.ToString();
diff --git a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
index b5d40ab..2e4b67e 100644
--- a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
@@ -324,6 +324,10 @@
long HProcID = list[0].HProcID;
int HUSEORGID = list[0].HUSEORGID;
bool HTProcessFlag = list[0].HTProcessFlag;
+ int HQCSchemeID_Fst = list[0].HQCSchemeID_Fst;
+ int HQCSchemeID_Proc = list[0].HQCSchemeID_Proc;
+ int HQCSchemeID_Patrol = list[0].HQCSchemeID_Patrol;
+
@@ -374,13 +378,14 @@
",HTypeFlow,HTypeCount,HDeptNumber,HSNo" +
",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase,HProcessID_K3,HBillSubType,HAutoTrunFlag" +
",HFixPrice,HOverFixPrice,HProcMulID,HProcCheckNote" +
- ",HUSEORGID,HWorkCenterID,HBadWHID,HWasterWHID,HBadCountDevelopWHID,HWWBadWHID,HWWWasterWHID,HWHID,HTProcessFlag) " +
+ ",HUSEORGID,HWorkCenterID,HBadWHID,HWasterWHID,HBadCountDevelopWHID,HWWBadWHID,HWWWasterWHID,HWHID,HTProcessFlag" +
+ ",HQCSchemeID_Fst,HQCSchemeID_Proc,HQCSchemeID_Patrol) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
"," + Convert.ToString(HTypeFlow ? 1 : 0) + "," + Convert.ToString(HTypeCount ? 1 : 0) + ",'" + HDeptNumber + "','" + HSNo.ToString() +
"'," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HDeptID +
",'" + HBarCode + "'," + HProcessID_K3 + ",'" + HBillSubType + "'," + Convert.ToString(HAutoTrunFlag ? 1 : 0) +
",'" + HFixPrice.ToString() + "'," + HOverFixPrice.ToString() + "," + HProcMulID.ToString() + ",'" + HProcCheckNote.ToString() + "'" +
- "," + HUSEORGID + "," + HWorkCenterID + "," + HBadWHID + "," + HWasterWHID + "," + HBadCountDevelopWHID + "," + HWWBadWHID + "," + HWWWasterWHID + "," + HWHID + "," + Convert.ToString(HTProcessFlag ? 1 : 0) + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ "," + HUSEORGID + "," + HWorkCenterID + "," + HBadWHID + "," + HWasterWHID + "," + HBadCountDevelopWHID + "," + HWWBadWHID + "," + HWWWasterWHID + "," + HWHID + "," + Convert.ToString(HTProcessFlag ? 1 : 0) + "," + HQCSchemeID_Fst + "," + HQCSchemeID_Proc + "," + HQCSchemeID_Patrol + ")", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
@@ -419,6 +424,9 @@
",HWWBadWHID= " + HWWBadWHID +
",HWWWasterWHID= " + HWWWasterWHID +
",HWHID= " + HWHID +
+ ",HQCSchemeID_Fst= " + HQCSchemeID_Fst +
+ ",HQCSchemeID_Proc= " + HQCSchemeID_Proc +
+ ",HQCSchemeID_Patrol= " + HQCSchemeID_Patrol +
",HProcCheckNote='" + HProcCheckNote + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
index 2431640..37c65ea 100644
--- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -35,6 +35,7 @@
{
try
{
+ List<object> columnNameList = new List<object>();
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
//if (!DBUtility.ClsPub.Security_Log("Cg_POOrderBillQuery", 1, false, user))
@@ -65,10 +66,18 @@
string sql = "select * from h_v_IF_POOrderBillList where 1 = 1 " + sWhere;
ds = oCN.RunProcReturn(sql, "h_v_IF_POOrderBillList");
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
return objJsonResult;
}
catch (Exception e)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
index 2940b96..7d625ff 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -316,6 +316,733 @@
}
#endregion
+ #region 鎸囧紩鍗℃壂鐮佽幏鍙栦俊鎭�
+ [Route("MES_SampleRecordBill_PDA/SampleRecordBillHBarCode_KeyDown")]
+ [HttpGet]
+ public object SampleRecordBillHBarCode_KeyDown(string HBarCode, string HInterID, string UserID, string HBillType)
+ {
+ try
+ {
+ if (HBarCode == null || HBarCode.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绌虹櫧鐮�,鏉″舰鐮佷笉鑳戒负绌猴紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鎷嗗垎鏉″舰鐮�
+ string sBillBarCode = HBarCode.Trim();
+ string[] NewBarCode;
+ if (sBillBarCode.CompareTo("#") > 0)
+ {
+ NewBarCode = sBillBarCode.Split(Convert.ToChar("#"));
+ sBillBarCode = NewBarCode[0];
+ }
+ string sBillNo = sBillBarCode; //鏉″舰鐮�
+
+ string[] arr = sBillNo.Split('&'); //浠ョ鍙封��&鈥欏垎鍓叉潯褰㈢爜
+ string BillNo_PGD = arr[0]; //鍗曟嵁鍙�
+ string entryid_PGD = "";//瀛恑d
+ if (arr.Length > 1)
+ {
+ entryid_PGD = arr[1];
+ }
+
+
+ //鎴彇鏉＄爜绫诲瀷2 鍓嶅洓浣�
+ string BillNoType2 = BillNo_PGD.Substring(0, Math.Min(4, BillNo_PGD.Length));
+
+ switch (BillNoType2)
+ {
+ case "GXLX"://娴佽浆鍗�
+ string sErr = "";
+ if (oSystemParameter.ShowBill(ref sErr))
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "涔斾竴")
+ { //绯荤粺鍙傛暟鏄惁涓哄彧鏄剧ず褰撳墠鐧诲綍鐢ㄦ埛鍏宠仈鐨勫伐搴忎俊鎭�,N涓哄惁锛孻涓烘槸
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
+ }
+ }
+ break;
+ default:
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉＄爜閿欒!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璇曟牱璁板綍 鏌ヨ鍒楄〃
+ [Route("MES_SampleRecordBill_PDA/SampleRecordList")]
+ [HttpGet]
+ public object SampleRecordList(string sWhere,string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("QC_TestSampleCheckBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string sql = "select * from h_v_QC_TestSampleCheckBillList where 1=1 " + sWhere + " order by 鏃ユ湡 ";
+
+ ds = oCN.RunProcReturn(sql, "h_v_QC_TestSampleCheckBillList");
+
+ DataTable dt = ds.Tables[0];
+
+ //鑾峰彇鍒楀悕
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = dt;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璇曟牱璁板綍鏂板淇濆瓨
+ [Route("MES_SampleRecordBill_PDA/SampleRecordAddBill")]
+ [HttpPost]
+ public object SampleRecordAddBill([FromBody] JObject oMain)
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ try
+ {
+ //鍙嶅簭鍒楀寲
+ string msg2 = "[" + sArray[0].ToString() + "]";
+ string user = sArray[1].ToString();//鐢ㄦ埛鍚�
+ string OperationType = sArray[2].ToString();//绫诲瀷
+
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("QC_TestSampleCheckBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犵紪杈戞潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ List<Model.ClsQC_TestSampleCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_TestSampleCheckBillMain>>(msg2);
+ string BillType = "7510";
+ string HBillSubType = "7510";
+ string eventType = list[0].eventType;
+ long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ string HBillNo = list[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ int HBillStatus = 1;
+ string HMaker = user;//鍒跺崟浜�
+ int HYear = DateTime.Now.Year;
+ double HPeriod = DateTime.Now.Month;
+ long HSourceID = list[0].HSourceID;//鐢熶骇璧勬簮
+ long HICMOInterID = list[0].HICMOInterID;//浠诲姟鍗旾D
+ string HICMOBillNo = list[0].HICMOBillNo;//浠诲姟鍗�
+ string HProcExchBillNo = list[0].HProcExchBillNo;//鎸囧紩鍗�
+ long HMaterID = list[0].HMaterID;//浜у搧ID
+ long HUnitID = list[0].HUnitID;//璁￠噺鍗曚綅
+ long HProcID = list[0].HProcID;//宸ュ簭ID
+ long HPRDORGID = list[0].HPRDORGID;//缁勭粐ID
+ long HLastResult = list[0].HLastResult;//璇曟牱缁撹
+
+ //鍗曟嵁瀹屾暣鎬у垽鏂�
+ if (HProcExchBillNo =="")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佽浆鍗℃病鏈夐�夋嫨锛佽鎵弿鏉″舰鐮佹垨杈撳叆鏉″舰鐮佸悗鍥炶溅";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var num = 0;
+
+ oCN.BeginTran();
+ if ("Add".Equals(eventType))
+ {
+ num = 1;
+
+ ds = oCN.RunProcReturn("select * from QC_TestSampleCheckBillMain where HBillNo='" + HBillNo + "'", "QC_TestSampleCheckBillMain");
+ if (ds.Tables[0].Rows.Count == 1)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.RunProc("Insert Into QC_TestSampleCheckBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
+ ",HYear,HPeriod,HMaterID,HSourceID,HICMOInterID,HICMOBillNo,HProcExchBillNo,HUnitID" +
+ ",HPRDORGID,HLastResult)" +
+ " values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
+ "," + HYear + "," + HPeriod + ",'" + HMaterID + "','" + HSourceID + "'," + HICMOInterID + ",'" + HICMOBillNo + "','" + HProcExchBillNo + "'," + HUnitID +
+ "," + HPRDORGID + ",'" + HLastResult + "') ");
+ }
+ else
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎿嶄綔绫诲瀷鏃犳晥锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璇曟牱璁板綍 瀹℃牳/鍙嶅鏍稿姛鑳�
+ [Route("MES_SampleRecordBill_PDA/CheckSampleRecordBill")]
+ [HttpGet]
+ public object CheckSampleRecordBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("QC_TestSampleCheckBill_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ BillOld.MvarItemKey = "QC_TestSampleCheckBillMain";
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡瀹℃牳
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶉渶瑕佸啀瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //瀹℃牳鍗曟嵁
+ oCN.RunProc(" Update " + BillOld.MvarItemKey + " set HChecker='" + user + "',HCheckDate=getdate(),HBillStatus=2 Where HInterID=" + HInterID.ToString());
+
+ }
+ else
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶅鏍�
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插弽瀹℃牳!涓嶉渶瑕佸啀鍙嶅鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //鍙嶅鏍稿崟鎹�
+ oCN.RunProc(" Update " + BillOld.MvarItemKey + " set HChecker='',HCheckDate=null,HBillStatus=1 Where HInterID=" + HInterID.ToString());
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璇曟牱璁板綍 鍒犻櫎鍔熻兘
+ [Route("MES_SampleRecordBill_PDA/DelSampleRecordBill")]
+ [HttpGet]
+ public object DelSampleRecordBill(Int64 lngBillKey, string user)
+ {
+ DataSet ds;
+ string ModRightNameCheck = "QC_TestSampleCheckBill_Detete";
+ try
+ {
+ //鍒犻櫎鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (lngBillKey == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁id涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+ ds = oCN.RunProcReturn("select * from QC_TestSampleCheckBillMain where HInterID=" + lngBillKey, "QC_TestSampleCheckBillMain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ string HChecker = Convert.ToString(ds.Tables[0].Rows[0]["HChecker"]);
+ if (HChecker != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc("delete from QC_TestSampleCheckBillMain where HInterID=" + lngBillKey);
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "* 鏁版嵁鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 瀵硅壊璁板綍 鏌ヨ鍒楄〃
+ [Route("ColorRecord/ColorRecordList")]
+ [HttpGet]
+ public object ColorRecordList(string sWhere,string user)
+ {
+ try
+ {
+
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("QC_FirstPieceCheckBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string sql = "select * from h_v_QC_FirstPieceCheckBillMainList where 1=1 " + sWhere + " order by 鏃ユ湡 ";
+
+ ds = oCN.RunProcReturn(sql, "h_v_QC_FirstPieceCheckBillMainList");
+
+ DataTable dt = ds.Tables[0];
+
+ //鑾峰彇鍒楀悕
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = dt;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 瀵硅壊璁板綍鏂板淇濆瓨
+ [Route("ColorRecord/ColorRecordAddBill")]
+ [HttpPost]
+ public object ColorRecordAddBill([FromBody] JObject oMain)
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ try
+ {
+ //鍙嶅簭鍒楀寲
+ string msg2 = "[" + sArray[0].ToString() + "]";
+ string user = sArray[1].ToString();//鐢ㄦ埛鍚�
+ string OperationType = sArray[2].ToString();//绫诲瀷
+
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("QC_FirstPieceCheckBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犵紪杈戞潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ List<Model.ClsQC_FirstPieceCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_FirstPieceCheckBillMain>>(msg2);
+ string BillType = "7505";
+ string HBillSubType = "7505";
+ long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ string HBillNo = list[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ int HBillStatus = 1;
+ string HMaker = user;//鍒跺崟浜�
+ int HYear = DateTime.Now.Year;
+ double HPeriod = DateTime.Now.Month;
+ long HSourceID = list[0].HSourceID;//鐢熶骇璧勬簮
+ long HICMOInterID = list[0].HICMOInterID;//浠诲姟鍗旾D
+ string HICMOBillNo = list[0].HICMOBillNo;//浠诲姟鍗�
+ string HProcExchBillNo = list[0].HProcExchBillNo;//鎸囧紩鍗�
+ long HMaterID = list[0].HMaterID;//浜у搧ID
+ //long HUnitID = list[0].HUnitID;//璁￠噺鍗曚綅
+ long HProcID = list[0].HProcID;//宸ュ簭ID
+ long HPRDORGID = list[0].HPRDORGID;//缁勭粐ID
+ bool HLastResult = list[0].HLastResult;//璇曟牱缁撹
+
+ //鍗曟嵁瀹屾暣鎬у垽鏂�
+ if (HProcExchBillNo == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佽浆鍗℃病鏈夐�夋嫨锛佽鎵弿鏉″舰鐮佹垨杈撳叆鏉″舰鐮佸悗鍥炶溅";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var num = 0;
+
+ oCN.BeginTran();
+ if (OperationType=="1")
+ {
+ num = 1;
+
+ ds = oCN.RunProcReturn("select * from QC_FirstPieceCheckBillMain where HBillNo='" + HBillNo + "'", "QC_FirstPieceCheckBillMain");
+ if (ds.Tables[0].Rows.Count == 1)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.RunProc("Insert Into QC_FirstPieceCheckBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
+ ",HYear,HPeriod,HMaterID,HSourceID,HICMOInterID,HICMOBillNo,HProcExchBillNo" +
+ ",HPRDORGID,HLastResult)" +
+ " values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
+ "," + HYear + "," + HPeriod + ",'" + HMaterID + "','" + HSourceID + "'," + HICMOInterID + ",'" + HICMOBillNo + "','" + HProcExchBillNo + "'" +
+ "," + HPRDORGID + ",'" + HLastResult + "') ");
+ }
+ else
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎿嶄綔绫诲瀷鏃犳晥锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 瀵硅壊璁板綍 瀹℃牳/鍙嶅鏍稿姛鑳�
+ [Route("ColorRecord/CheckColorRecordBill")]
+ [HttpGet]
+ public object CheckColorRecordBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("QC_FirstPieceCheckBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ BillOld.MvarItemKey = "QC_FirstPieceCheckBillMain";
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡瀹℃牳
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶉渶瑕佸啀瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //瀹℃牳鍗曟嵁
+ oCN.RunProc(" Update " + BillOld.MvarItemKey + " set HChecker='" + user + "',HCheckDate=getdate(),HBillStatus=2 Where HInterID=" + HInterID.ToString());
+
+ }
+ else
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶅鏍�
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插弽瀹℃牳!涓嶉渶瑕佸啀鍙嶅鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //鍙嶅鏍稿崟鎹�
+ oCN.RunProc(" Update " + BillOld.MvarItemKey + " set HChecker='',HCheckDate=null,HBillStatus=1 Where HInterID=" + HInterID.ToString());
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 瀵硅壊璁板綍 鍒犻櫎鍔熻兘
+ [Route("ColorRecord/DelColorRecordBill")]
+ [HttpGet]
+ public object DelColorRecordBill(Int64 lngBillKey, string user)
+ {
+ DataSet ds;
+ string ModRightNameCheck = "QC_FirstPieceCheckBill_Delete";
+ try
+ {
+ //鍒犻櫎鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (lngBillKey == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁id涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+ ds = oCN.RunProcReturn("select * from QC_FirstPieceCheckBillMain where HInterID=" + lngBillKey, "QC_FirstPieceCheckBillMain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ string HChecker = Convert.ToString(ds.Tables[0].Rows[0]["HChecker"]);
+ if (HChecker != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc("delete from QC_FirstPieceCheckBillMain where HInterID=" + lngBillKey);
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "* 鏁版嵁鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇宸ュ簭
[Route("Sc_StationInBill/autoGetProcNo")]
[HttpGet]
diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index f99321a..118d58b 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -453,7 +453,8 @@
",HProcID_S,HCenterID_S,HWorkQty_S,HSubStdEmpQty_S,HMouldNo,HChangeMould" +
",HPackStd,HPack,HPutArea,HMyWorkDays,HMyFixWorkDays,HPassRate" +
",HTechnologyParameter,HPicNum,HProcCheckNote" +
- ",HOverRate,HProcWorkNum,HBadWHID,HWasterWHID, HWHID,HEstimate,HIsTime " +
+ ",HOverRate,HProcWorkNum,HBadWHID,HWasterWHID, HWHID,HEstimate,HIsTime" +
+ ",HQCSchemeID_Fst,HQCSchemeID_Proc,HQCSchemeID_Patrol" +
") values("
+ HInterID + "," + i + "," + oSub.HProcID.ToString() + ",'" + oSub.HProcNo + "'," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "" +
"," + oSub.HWorkQty.ToString() + "," + oSub.HCenterID.ToString() + ",'" + oSub.HTimeUnit.ToString() + "'," + oSub.HUnitTime.ToString() +
@@ -465,7 +466,8 @@
"," + oSub.HProcID_S.ToString() + "," + oSub.HCenterID_S.ToString() + "," + oSub.HWorkQty_S.ToString() + ", " + oSub.HSubStdEmpQty_S.ToString() + ",'" + oSub.HMouldNo + "'," + oSub.HChangeMould.ToString() +
",'" + oSub.HPackStd + "','" + oSub.HPack + "','" + oSub.HPutArea + "'," + oSub.HMyWorkDays.ToString() + "," + oSub.HMyFixWorkDays.ToString() + "," + oSub.HPassRate.ToString() +
",'" + oSub.HTechnologyParameter.ToString() + "','" + oSub.HPicNum.ToString() + "','" + oSub.HProcCheckNote.ToString() +
- "', " + oSub.HOverRate.ToString() + ",'" + oSub.HProcWorkNum.ToString() + "'," + oSub.HBadWHID.ToString() + "," + oSub.HWasterWHID.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HEstimate.ToString() + "," + Convert.ToString(oSub.HIsTime ? 1 : 0) +
+ "', " + oSub.HOverRate.ToString() + ",'" + oSub.HProcWorkNum.ToString() + "'," + oSub.HBadWHID.ToString() + "," + oSub.HWasterWHID.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HEstimate.ToString() + "," + Convert.ToString(oSub.HIsTime ? 1 : 0) + "," + oSub.HQCSchemeID_Fst + "," +
+ oSub.HQCSchemeID_Proc + "," + oSub.HQCSchemeID_Patrol +
") ");
//璁′环鏂瑰紡涓嶄负璁℃椂锛屽垯鎶婅鏃舵殏浼板瓧娈垫洿鏂颁负绌�
if (oSub.HIsTime == false)
diff --git a/WebAPI/Controllers/QC_ManagementController.cs b/WebAPI/Controllers/QC_ManagementController.cs
index 28e0467..f34840d 100644
--- a/WebAPI/Controllers/QC_ManagementController.cs
+++ b/WebAPI/Controllers/QC_ManagementController.cs
@@ -1204,61 +1204,7 @@
// }
//}
#endregion
-
- /// <summary>
- /// 棣栦欢妫�楠岄�昏緫鍒犻櫎鍔熻兘
- /// </summary>
- /// <returns></returns>
- [Route("DeltetQC_FirstPieceCheck")]
- [HttpGet]
- public object DeltetQC_FirstPieceCheck(string HInterID, string user)
- {
- string ModRightNameCheck = "QC_FirstPieceCheckBill_Delete";
- try
- {
- //鍒犻櫎鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, user))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍒犻櫎澶辫触锛佹棤鏉冮檺锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
- if (string.IsNullOrWhiteSpace(HInterID))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "HInterID涓虹┖锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- //寮�濮嬩簨鐗�
- oCN.BeginTran();
- oCN.RunProc("Delete From QC_FirstPieceCheckBillMain where HInterID = " + HInterID);
- oCN.RunProc("Delete From QC_FirstPieceCheckBillSub where HInterID = " + HInterID);
- oCN.RunProc("Delete From QC_FirstPieceCheckBillSub_ValueGrid where HInterID = " + HInterID);
- oCN.RunProc("Delete From QC_FirstPieceCheckBillSub_Result where HInterID = " + HInterID);
- //鎻愪氦浜嬪姟
- oCN.Commit();
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
- objJsonResult.data = null;
- return objJsonResult;
-
- }
- catch (Exception e)
- {
- oCN.RollBack(); //鍥炴粴浜嬬墿
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
+
#endregion
#region 宸℃
@@ -1277,6 +1223,7 @@
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
string user = sArray[2].ToString();
+ string badmsg = sArray[3].ToString();
string UserName = "";
@@ -1355,10 +1302,34 @@
oItemSub.HRelationQty = 0;
oItemSub.HRelationMoney = 0;
oItemSub.HCloseMan = "";
- oItemSub.HRemark = "";
+ //oItemSub.HRemark = "";
oBill.DetailColl.Add(oItemSub);
}
+ badmsg = badmsg.Substring(1, badmsg.Length - 2);
+ badmsg = badmsg.Replace("\\", "");
+ badmsg = badmsg.Replace("\n", ""); //\n
+ List<Model.ClsQC_PatrolProcCheckBillSub_BadReason> bs = new List<Model.ClsQC_PatrolProcCheckBillSub_BadReason>();
+ bs = oListModels.getObjectByJson_ClsQC_PatrolProcCheckBillSub_BadReason(badmsg);
+ int j = 0;
+ foreach (Model.ClsQC_PatrolProcCheckBillSub_BadReason badSub in bs)
+ {
+ badSub.HBillNo_bak = oBill.omodel.HBillNo;//鍗曟嵁鍙凤紙澶囦唤锛屼互鍏嶅唴鐮佷涪澶憋紝鎵句笉鍒板搴斾富琛級
+ j++;
+ if (string.IsNullOrWhiteSpace(badSub.HBillNo_bak))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病澶囦唤鍗曟嵁鍙凤紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ badSub.HInterID = oBill.omodel.HInterID;
+ badSub.HEntryID = j;
+ badSub.HSEQ = j;
+ oBill.DetailColl_Bad.Add(badSub);
+ }
+
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
bool bResult;
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 3e0472d..af3e59b 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -3681,7 +3681,7 @@
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- string sql = "select c.HItemID HQCCheckItemID,c.HName 妫�楠岄」鐩�,b.HQCStd,b.HQCUnit HUnit,b.HAnalysisMethod,b.HStatus HResult from Gy_QCCheckProjectMain a left join Gy_QCCheckProjectSub b on a.HInterID = b.HInterID left join Gy_QCCheckItem c on b.HQCCheckItemID = c.HItemID where a.HInterID = " + CheckProjectID;
+ string sql = "select * from h_v_Gy_GetQCCheckItemByProject where hmainid = " + CheckProjectID;
ds = oCN.RunProcReturn(sql, "Gy_QCCheckProjectMain");
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\241\346\243\200\345\215\225/QC_PatrolProcCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\241\346\243\200\345\215\225/QC_PatrolProcCheckBillController.cs"
new file mode 100644
index 0000000..9ddc150
--- /dev/null
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\241\346\243\200\345\215\225/QC_PatrolProcCheckBillController.cs"
@@ -0,0 +1,26 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ public class QC_PatrolProcCheckBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+
+
+
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs"
index 992044e..985440c 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs"
@@ -20,6 +20,119 @@
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+
+ #region 宸ュ簭妫�楠屽崟鍒楄〃
+ [Route("QC_ProcessCheckBill/QC_ProcessCheckBillList")]
+ [HttpGet]
+ public object QC_ProcessCheckBillList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ string sql1 = "select * from h_v_QC_ProcessCheckBill where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by hmainid desc";
+ ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessCheckBill");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏌ヨ鍒版暟鎹�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ /// <summary>
+ /// 杩斿洖宸ュ簭妫�楠屽崟鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("QC_ProcessCheckBill/GetProcessCheckBillList")]
+ [HttpGet]
+ public object GetProcessCheckBillList(string sWhere, string user)
+ {
+ try
+ {
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("QC_ProcessCheckBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_QC_ProcessCheckBillListDetail order by hmainid desc ", "h_v_QC_ProcessCheckBillListDetail");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_QC_ProcessCheckBillListDetail where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by hmainid desc ";
+ ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessCheckBillListDetail");
+ }
+
+ //if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ //{
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ //}
+ //else
+ //{
+ //objJsonResult.code = "0";
+ //objJsonResult.count = 0;
+ //objJsonResult.Message = "鏃犳暟鎹�";
+ //objJsonResult.data = null;
+ //return objJsonResult;
+ //}
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
#region 宸ュ簭妫�楠屽崟淇濆瓨
/// <summary>
@@ -269,60 +382,7 @@
return objJsonResult;
}
}
- #endregion
-
-
-
- #region 宸ュ簭妫�楠屽崟鏍规嵁婧愬崟绫诲瀷鑾峰彇淇℃伅-婧愬崟涓虹敓浜х姸鎬佷复鏃惰〃锛�3722锛�
- /// <summary>
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("QC_ProcessCheckBill/get_ICMOBillStatus_Tmp")]
- [HttpGet]
- public object get_ICMOBillStatus_Tmp(int HInterID, int HEntryID, string HBillType)
- {
- try
- {
- if (HInterID == 0 || HBillType.Equals(""))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍙傛暟涓嶅叏锛岃幏鍙栨簮鍗曚俊鎭け璐ワ紒HInterID锛�" + HInterID + "锛汬EntryID锛�" + HEntryID + "锛汬BillType锛�" + HBillType + "锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- ds = oCN.RunProcReturn("exec h_p_QC_GetInfoByICMOStatusBill " + HInterID + "," + HEntryID + "," + HBillType, "h_p_QC_GetInfoByICMOStatusBill");
- }
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
- #endregion
+ #endregion
#region 宸ュ簭妫�楠屽崟Old
/// <summary>
@@ -521,106 +581,7 @@
return objJsonResult;
}
}
-
-
- /// <summary>
- /// 杩斿洖宸ュ簭妫�楠屽崟鍒楄〃
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("QC_ProcessCheckBill/GetProcessCheckBillList")]
- [HttpGet]
- public object GetProcessCheckBillList(string sWhere,string user)
- {
- try
- {
- //鏌ョ湅鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("QC_ProcessCheckBill_Query", 1, false, user))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_QC_ProcessCheckBillListDetail order by hmainid desc ", "h_v_QC_ProcessCheckBillListDetail");
- }
- else
- {
- string sql1 = "select * from h_v_QC_ProcessCheckBillListDetail where 1 = 1 ";
- string sql = sql1 + sWhere+ " order by hmainid desc ";
- ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessCheckBillListDetail");
- }
-
- //if (ds.Tables[0].Rows.Count != 0 || ds != null)
- //{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- //}
- //else
- //{
- //objJsonResult.code = "0";
- //objJsonResult.count = 0;
- //objJsonResult.Message = "鏃犳暟鎹�";
- //objJsonResult.data = null;
- //return objJsonResult;
- //}
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
- #endregion
-
- #region 宸ュ簭妫�楠屽崟鍒楄〃
- [Route("QC_ProcessCheckBill/QC_ProcessCheckBillList")]
- [HttpGet]
- public object QC_ProcessCheckBillList(string sWhere, string user)
- {
- try
- {
- List<object> columnNameList = new List<object>();
-
- string sql1 = "select * from h_v_QC_ProcessCheckBill where 1 = 1 ";
- string sql = sql1 + sWhere + " order by hmainid desc";
- ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessCheckBill");
-
- //娣诲姞鍒楀悕
- foreach (DataColumn col in ds.Tables[0].Columns)
- {
- Type dataType = col.DataType;
- string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
- columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
- }
-
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.list = columnNameList;
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
- #endregion
+ #endregion
/// <summary>
///杩斿洖妫�楠屽�煎垪琛�
@@ -666,5 +627,110 @@
return objJsonResult;
}
}
+
+ #region 棣栦欢妫�楠屽崟鏍规嵁婧愬崟绫诲瀷鑾峰彇淇℃伅-婧愬崟涓哄伐搴忓嚭绔欏崟
+ [Route("QC_ProcessCheckBill/get_StationOutBill")]
+ [HttpGet]
+ public object get_StationOutBill(string HInterID, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ string sReturn = "";
+ string sql = "";
+ if (oSystemParameter.ShowBill(ref sReturn))
+ {
+ switch (oSystemParameter.omodel.QC_ProcessCheckBill_QCSchemeSource)
+ {
+ case "宸ュ簭":
+ sql = "exec h_p_QC_ProcessCheck_GetStationOutBillList " + "'宸ュ簭','" + HInterID + "'";
+ break;
+ case "鐗╂枡":
+ sql = "exec h_p_QC_ProcessCheck_GetStationOutBillList " + "'鐗╂枡','" + HInterID + "'";
+ break;
+ case "宸ヨ壓璺嚎":
+ sql = "exec h_p_QC_ProcessCheck_GetStationOutBillList " + "'宸ヨ壓璺嚎','" + HInterID + "'";
+ break;
+ }
+
+ }
+ ds = oCN.RunProcReturn(sql, "h_p_QC_ProcessCheck_GetStationOutBillList");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸ュ簭妫�楠屽崟鏍规嵁婧愬崟绫诲瀷鑾峰彇淇℃伅-婧愬崟涓虹敓浜х姸鎬佷复鏃惰〃锛�3722锛�
+ /// <summary>
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("QC_ProcessCheckBill/get_ICMOBillStatus_Tmp")]
+ [HttpGet]
+ public object get_ICMOBillStatus_Tmp(int HInterID, int HEntryID, string HBillType)
+ {
+ try
+ {
+ if (HInterID == 0 || HBillType.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙傛暟涓嶅叏锛岃幏鍙栨簮鍗曚俊鎭け璐ワ紒HInterID锛�" + HInterID + "锛汬EntryID锛�" + HEntryID + "锛汬BillType锛�" + HBillType + "锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_QC_GetInfoByICMOStatusBill " + HInterID + "," + HEntryID + "," + HBillType, "h_p_QC_GetInfoByICMOStatusBill");
+ }
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
index 4c7b4ce..8112c58 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
@@ -20,6 +20,59 @@
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+
+ #region 棣栦欢妫�楠屽崟鍒楄〃
+ [Route("QC_FirstPieceCheckBill/QC_FirstPieceCheckBillList")]
+ [HttpGet]
+ public object QC_FirstPieceCheckBillList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ string sql1 = "select * from h_v_QC_FirstPieceCheckBill where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by hmainid desc";
+ ds = oCN.RunProcReturn(sql, "h_v_QC_FirstPieceCheckBill");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏌ヨ鍒版暟鎹�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
#region 棣栦欢妫�楠屽崟淇濆瓨
[Route("QC_FirstPieceCheckBill/set_SaveBill")]
@@ -190,58 +243,7 @@
return objJsonResult;
}
}
- #endregion
-
- #region 棣栦欢妫�楠屽崟鏍规嵁婧愬崟绫诲瀷鑾峰彇淇℃伅-婧愬崟涓虹敓浜х姸鎬佷复鏃惰〃锛�3722锛�
- /// <summary>
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("QC_FirstPieceCheckBill/get_ICMOBillStatus_Tmp")]
- [HttpGet]
- public object get_ICMOBillStatus_Tmp(int HInterID,int HEntryID,string HBillType)
- {
- try
- {
- if (HInterID == 0 || HBillType.Equals(""))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍙傛暟涓嶅叏锛岃幏鍙栨簮鍗曚俊鎭け璐ワ紒HInterID锛�"+ HInterID+ "锛汬EntryID锛�"+ HEntryID + "锛汬BillType锛�"+ HBillType+"锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- ds = oCN.RunProcReturn("exec h_p_QC_GetInfoByICMOStatusBill " + HInterID + "," + HEntryID + "," + HBillType, "h_p_QC_GetInfoByICMOStatusBill");
- }
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
- #endregion
+ #endregion
#region 妫�楠屽�间繚瀛�
[Route("QC_FirstPieceCheckBill/set_SaveValue")]
@@ -376,19 +378,91 @@
}
}
- #region 棣栦欢妫�楠屽崟鍒楄〃
- [Route("QC_FirstPieceCheckBill/QC_FirstPieceCheckBillList")]
+ /// <summary>
+ /// 棣栦欢妫�楠岄�昏緫鍒犻櫎鍔熻兘
+ /// </summary>
+ /// <returns></returns>
+ [Route("DeltetQC_FirstPieceCheck")]
[HttpGet]
- public object QC_FirstPieceCheckBillList(string sWhere, string user)
+ public object DeltetQC_FirstPieceCheck(string HInterID, string user)
+ {
+ string ModRightNameCheck = "QC_FirstPieceCheckBill_Delete";
+ try
+ {
+ //鍒犻櫎鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //寮�濮嬩簨鐗�
+ oCN.BeginTran();
+ oCN.RunProc("Delete From QC_FirstPieceCheckBillMain where HInterID = " + HInterID);
+ oCN.RunProc("Delete From QC_FirstPieceCheckBillSub where HInterID = " + HInterID);
+ oCN.RunProc("Delete From QC_FirstPieceCheckBillSub_ValueGrid where HInterID = " + HInterID);
+ oCN.RunProc("Delete From QC_FirstPieceCheckBillSub_Result where HInterID = " + HInterID);
+ //鎻愪氦浜嬪姟
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack(); //鍥炴粴浜嬬墿
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #region 棣栦欢妫�楠屽崟鏍规嵁婧愬崟绫诲瀷鑾峰彇淇℃伅-婧愬崟涓哄伐搴忚繘绔欏崟
+ [Route("QC_FirstPieceCheckBill/get_StationInBill")]
+ [HttpGet]
+ public object get_StationInBill(string HInterID, string user)
{
try
{
List<object> columnNameList = new List<object>();
- string sql1 = "select * from h_v_QC_FirstPieceCheckBill where 1 = 1 ";
- string sql = sql1 + sWhere + " order by hmainid desc";
- ds = oCN.RunProcReturn(sql, "h_v_QC_FirstPieceCheckBill");
+ string sReturn = "";
+ string sql = "";
+ if (oSystemParameter.ShowBill(ref sReturn))
+ {
+ switch (oSystemParameter.omodel.QC_FirstPieceCheckBill_QCSchemeSource)
+ {
+ case "宸ュ簭":
+ sql = "exec h_p_QC_FirstPiece_GetStationInBillList " + "'宸ュ簭','" + HInterID + "'";
+ break;
+ case "鐗╂枡":
+ sql = "exec h_p_QC_FirstPiece_GetStationInBillList " + "'鐗╂枡','" + HInterID + "'";
+ break;
+ case "宸ヨ壓璺嚎":
+ sql = "exec h_p_QC_FirstPiece_GetStationInBillList " + "'宸ヨ壓璺嚎','" + HInterID + "'";
+ break;
+ }
+
+ }
+ ds = oCN.RunProcReturn(sql, "h_p_QC_FirstPiece_GetStationInBillList");
+
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
{
@@ -396,19 +470,70 @@
string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
-
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
- objJsonResult.list = columnNameList;
objJsonResult.data = ds.Tables[0];
- return objJsonResult;
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
}
catch (Exception e)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 棣栦欢妫�楠屽崟鏍规嵁婧愬崟绫诲瀷鑾峰彇淇℃伅-婧愬崟涓虹敓浜х姸鎬佷复鏃惰〃锛�3722锛�
+ /// <summary>
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("QC_FirstPieceCheckBill/get_ICMOBillStatus_Tmp")]
+ [HttpGet]
+ public object get_ICMOBillStatus_Tmp(int HInterID, int HEntryID, string HBillType)
+ {
+ try
+ {
+ if (HInterID == 0 || HBillType.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙傛暟涓嶅叏锛岃幏鍙栨簮鍗曚俊鎭け璐ワ紒HInterID锛�" + HInterID + "锛汬EntryID锛�" + HEntryID + "锛汬BillType锛�" + HBillType + "锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_QC_GetInfoByICMOStatusBill " + HInterID + "," + HEntryID + "," + HBillType, "h_p_QC_GetInfoByICMOStatusBill");
+ }
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/DLL/ClsGy_Material_Ctl.cs b/WebAPI/DLL/ClsGy_Material_Ctl.cs
index 053c895..b2fd256 100644
--- a/WebAPI/DLL/ClsGy_Material_Ctl.cs
+++ b/WebAPI/DLL/ClsGy_Material_Ctl.cs
@@ -26,14 +26,15 @@
",HKeepDays,HPlanPrice,HstdPrice,HQtyMin,HQtyMax" +
",HSubjoin,HSubjoin2,HColor,HVersion,HEngName,HEngModel,HPropertyTypeID,HSPGroupID,HSPID,HMinPickQty,HUSEORGID,HERPItemID" +
",HSALEUNITID,HSALEPRICEUNITID,HBASEUNITID,HSTOREUNITID,HCHECKINCOMING,HCHECKPRODUCT,HPERUNITSTANDHOUR" +
- ",HSTDLABORPREPARETIME,HSTDMACHINEPREPARETIME,HWidth,HWeight,HColorRemark) " +
+ ",HSTDLABORPREPARETIME,HSTDMACHINEPREPARETIME,HWidth,HWeight,HColorRemark,HQCSchemeID_Fst,HQCSchemeID_Proc,HQCSchemeID_Patrol) " +
" Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" +
",'" + oModel.HModel + "'," + oModel.HUnitID.ToString() + "," + oModel.HMaterClsID.ToString() + "," + oModel.HMaterTypeID.ToString() + "," + oModel.HUnitGroupID.ToString() +
", " + oModel.HWhID.ToString() + "," + oModel.HRoutingID.ToString() + "," + oModel.HBomID.ToString() + "," + oModel.HSecUnitID.ToString() + "," + oModel.HSecUnitRate.ToString() +
", " + oModel.HHighStock.ToString() + "," + oModel.HLowStock.ToString() + "," + oModel.HSafeStock.ToString() + "," + oModel.HOrderPrice.ToString() + ",'" + oModel.HSalePrice + "'" +
", " + oModel.HKeepDays.ToString() + "," + oModel.HPlanPrice.ToString() + "," + oModel.HstdPrice.ToString() + "," + oModel.HQtyMin.ToString() + "," + oModel.HQtyMax.ToString() +
- ",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString() + "," + oModel.HMinPickQty.ToString() + "," + oModel.HUSEORGID + "," + oModel.HERPItemID + "," + oModel.HSALEUNITID + "," + oModel.HSALEPRICEUNITID + "," + oModel.HBASEUNITID + "," + oModel.HSTOREUNITID + "," + oModel.HCHECKINCOMING + "," + oModel.HCHECKPRODUCT + "," + oModel.HPERUNITSTANDHOUR + "," + oModel.HSTDLABORPREPARETIME + "," + oModel.HSTDMACHINEPREPARETIME + ","+ oModel.HWidth + "," + oModel.HWeight + ",'"+ oModel.HColorRemark + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ ",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString() + "," + oModel.HMinPickQty.ToString() + "," + oModel.HUSEORGID + "," + oModel.HERPItemID + "," + oModel.HSALEUNITID + "," + oModel.HSALEPRICEUNITID + "," + oModel.HBASEUNITID + "," + oModel.HSTOREUNITID + "," + oModel.HCHECKINCOMING + "," + oModel.HCHECKPRODUCT + "," + oModel.HPERUNITSTANDHOUR + "," + oModel.HSTDLABORPREPARETIME + "," + oModel.HSTDMACHINEPREPARETIME + ","+ oModel.HWidth + "," + oModel.HWeight + ",'"+ oModel.HColorRemark + "'," + oModel.HQCSchemeID_Fst + ","
+ + oModel.HQCSchemeID_Proc + "," + oModel.HQCSchemeID_Patrol + ")", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCn.Commit();
@@ -140,6 +141,9 @@
",HWeight=" + oModel.HWeight.ToString() +
",HWidth=" + oModel.HWidth.ToString() +
",HColorRemark='" + oModel.HColorRemark.ToString() + "'" +
+ ",HQCSchemeID_Fst= " + oModel.HQCSchemeID_Fst +
+ ",HQCSchemeID_Proc= " + oModel.HQCSchemeID_Proc +
+ ",HQCSchemeID_Patrol= " + oModel.HQCSchemeID_Patrol +
",HSTDMACHINEPREPARETIME=" + oModel.HSTDMACHINEPREPARETIME.ToString() + "Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
diff --git a/WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs b/WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs
index d1dc5c0..f90c9ce 100644
--- a/WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs
+++ b/WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs
@@ -9,11 +9,12 @@
{
public Model.ClsQC_PatrolProcCheckBillMain omodel = new Model.ClsQC_PatrolProcCheckBillMain();
public List<Model.ClsQC_PatrolProcCheckBillSub> DetailColl = new List<Model.ClsQC_PatrolProcCheckBillSub>();
+ public List<Model.ClsQC_PatrolProcCheckBillSub_BadReason> DetailColl_Bad = new List<Model.ClsQC_PatrolProcCheckBillSub_BadReason>();
//public List<Model.ClsQC_PatrolProcCheckBillSub_Item> DetailColl1 = new List<Model.ClsQC_PatrolProcCheckBillSub_Item>();
public ClsQC_PatrolProcCheckBill()
{
base.MvarItemKeySub = "QC_PatrolProcCheckBillSub";
- base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub2 = "QC_PatrolProcCheckBillSub_BadReason";
base.MvarItemKeySub3 = "";
base.MvarItemKeySub4 = "";
base.MvarItemKey="QC_PatrolProcCheckBillMain";
@@ -59,20 +60,21 @@
//",HCloseType="+omodel.HCloseType.ToString()+
//",HDeleteMan='" + omodel.HDeleteMan + "'" +
//",HDeleteDate='" + omodel.HDeleteDate + "'" +
- ",HPrintQty=" + omodel.HPrintQty.ToString() +
+ //",HPrintQty=" + omodel.HPrintQty.ToString() +
//========================================
//",HSupID=" + omodel.HSupID.ToString() +
//",HEmpID=" + omodel.HEmpID.ToString() +
- ",HSourceID=" + omodel.HSourceID.ToString() +
- ",HICMOInterID=" + omodel.HICMOInterID.ToString() +
- ",HICMOBillNo='" + omodel.HICMOBillNo + "'" +
- ",HICMOQty=" + omodel.HICMOQty.ToString() +
- ",HProcExchInterID=" + omodel.HICMOQty.ToString() +
- ",HProcExchEntryID=" + omodel.HICMOQty.ToString() +
- ",HProcExchBillNo='" + omodel.HProcExchBillNo + "'" +
- ",HProcExchQty=" + omodel.HICMOQty.ToString() +
- ",HMaterID=" + omodel.HMaterID.ToString() +
+ //",HSourceID=" + omodel.HSourceID.ToString() +
+ //",HICMOInterID=" + omodel.HICMOInterID.ToString() +
+ //",HICMOBillNo='" + omodel.HICMOBillNo + "'" +
+ //",HICMOQty=" + omodel.HICMOQty.ToString() +
+ //",HProcExchInterID=" + omodel.HICMOQty.ToString() +
+ //",HProcExchEntryID=" + omodel.HICMOQty.ToString() +
+ //",HProcExchBillNo='" + omodel.HProcExchBillNo + "'" +
+ //",HProcExchQty=" + omodel.HICMOQty.ToString() +
+ //",HMaterID=" + omodel.HMaterID.ToString() +
",HFirstCheckEmp=" + omodel.HFirstCheckEmp.ToString() +
+ ",HMainProcID=" + omodel.HMainProcID.ToString() +
" where HInterID=" + lngBillKey.ToString();
//鏇存柊涓昏〃
oCn.RunProc(sqlerro);
@@ -80,8 +82,11 @@
DeleteRelation(ref sReturn, lngBillKey);
//鍒犻櫎瀛愯〃
DeleteBillSub(lngBillKey);
+ //鍒犻櫎瀛愯〃2
+ DeleteBillSub2(lngBillKey);
//鎻掑叆瀛愯〃
omodel.HInterID = lngBillKey;
+ //鎻掑叆瀛愯〃
foreach (Model.ClsQC_PatrolProcCheckBillSub oSub in DetailColl)
{
oCn.RunProc("Insert into QC_PatrolProcCheckBillSub " +
@@ -89,14 +94,28 @@
",HEntryCloseDate,HCloseType,HRemark,HSourceInterID" +
",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HQCCheckItemID,HQCStd,HQCNote1,HQCNote2,HQCNote3,HQCNote4" +
- ",HQCNote5,HQCNote6,HQCNote7,HQCNote8,HQCNote9,HQCNote10"+
+ ",HQCNote5,HQCNote6,HQCNote7,HQCNote8,HQCNote9,HQCNote10" +
") values("
+ omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
"," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
- "," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HQCNote1 + "','" + oSub.HQCNote2 + "','" + oSub.HQCNote3+ "','" + oSub.HQCNote4+ "'" +
- ",'" + oSub.HQCNote5+ "','" + oSub.HQCNote6 + "','" + oSub.HQCNote7 + "','" + oSub.HQCNote8 + "','" + oSub.HQCNote9 + "','" + oSub.HQCNote10 + "'" +
+ "," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HQCNote1 + "','" + oSub.HQCNote2 + "','" + oSub.HQCNote3 + "','" + oSub.HQCNote4 + "'" +
+ ",'" + oSub.HQCNote5 + "','" + oSub.HQCNote6 + "','" + oSub.HQCNote7 + "','" + oSub.HQCNote8 + "','" + oSub.HQCNote9 + "','" + oSub.HQCNote10 + "'" +
") ");
+ }
+
+ //鎻掑叆瀛愯〃2
+ foreach (Model.ClsQC_PatrolProcCheckBillSub_BadReason oBad in DetailColl_Bad)
+ {
+ oCn.RunProc("Insert into QC_PatrolProcCheckBillSub_BadReason " +
+ " (HInterID,HBillNo_bak,HEntryID,HSEQ" +
+ ",HCreateDate,HBadReasonID,HEmpID,HProcID" +
+ ",HCheckEmpID,HFinishDate,HMaterID,HQty,HRemark" +
+ ") values("
+ + omodel.HInterID.ToString() + ",'" + oBad.HBillNo_bak + "'," + oBad.HEntryID + "," + oBad.HSEQ + ",'" + oBad.HCreateDate + "',"
+ + oBad.HBadReasonID + "," + oBad.HEmpID + "," + oBad.HProcID + "," + oBad.HCheckEmpID + ",'" + oBad.HFinishDate + "',"
+ + oBad.HMaterID + "," + oBad.HQty + ",'" + oBad.HRemark + "'"
+ + ") ");
}
//foreach (Model.ClsQC_PatrolProcCheckBillSub_Item oSub2 in DetailColl1)
//{
@@ -150,12 +169,12 @@
"(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
",HYear,HPeriod,HRemark" +
",HSourceID,HICMOInterID,HICMOBillNo,HICMOQty,HProcExchInterID,HProcExchEntryID" +
- ",HProcExchBillNo,HProcExchQty,HMaterID,HFirstCheckEmp" +
+ ",HProcExchBillNo,HProcExchQty,HMaterID,HFirstCheckEmp,HMainProcID" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",'" + omodel.HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
"," + omodel.HSourceID.ToString() + "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HICMOQty.ToString() + "," + omodel.HProcExchInterID.ToString() + "," + omodel.HProcExchEntryID.ToString() +
- ",'" + omodel.HProcExchBillNo + "'," + omodel.HProcExchQty.ToString() + "," + omodel.HMaterID.ToString() + "," + omodel.HFirstCheckEmp.ToString() +
+ ",'" + omodel.HProcExchBillNo + "'," + omodel.HProcExchQty.ToString() + "," + omodel.HMaterID.ToString() + "," + omodel.HFirstCheckEmp.ToString() + "," + omodel.HMainProcID +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsQC_PatrolProcCheckBillSub oSub in DetailColl)
@@ -174,6 +193,19 @@
",'" + oSub.HQCNote5 + "','" + oSub.HQCNote6 + "','" + oSub.HQCNote7 + "','" + oSub.HQCNote8 + "','" + oSub.HQCNote9 + "','" + oSub.HQCNote10 + "'" +
") ");
}
+ //鎻掑叆瀛愯〃2
+ foreach (Model.ClsQC_PatrolProcCheckBillSub_BadReason oBad in DetailColl_Bad)
+ {
+ oCn.RunProc("Insert into QC_PatrolProcCheckBillSub_BadReason " +
+ " (HInterID,HBillNo_bak,HEntryID,HSEQ" +
+ ",HCreateDate,HBadReasonID,HEmpID,HProcID" +
+ ",HCheckEmpID,HFinishDate,HMaterID,HQty,HRemark" +
+ ") values("
+ + omodel.HInterID.ToString() + ",'" + oBad.HBillNo_bak + "'," + oBad.HEntryID + "," + oBad.HSEQ + ",'" + oBad.HCreateDate + "',"
+ + oBad.HBadReasonID + "," + oBad.HEmpID + "," + oBad.HProcID + "," + oBad.HCheckEmpID + ",'" + oBad.HFinishDate + "',"
+ + oBad.HMaterID + "," + oBad.HQty + ",'" + oBad.HRemark + "'"
+ + ") ");
+ }
//foreach (Model.ClsQC_PatrolProcCheckBillSub_Item oSub2 in DetailColl1)
//{
// oCn.RunProc("Insert into QC_PatrolProcCheckBillSub_Item " +
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 85716be..9e12c0a 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -492,6 +492,17 @@
return list;
}
+ /// <summary>
+ /// 澶勭悊鏂板宸℃鍗曞瓙琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsQC_PatrolProcCheckBillSub_BadReason> getObjectByJson_ClsQC_PatrolProcCheckBillSub_BadReason(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsQC_PatrolProcCheckBillSub_BadReason> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_PatrolProcCheckBillSub_BadReason>>(jsonString);
+ return list;
+ }
/// <summary>
/// 澶勭悊鏂板妯″叿缁翠慨涓昏〃鐨刯son
diff --git a/WebAPI/Models/ClsGy_Material_Model.cs b/WebAPI/Models/ClsGy_Material_Model.cs
index 7271bc3..afabbda 100644
--- a/WebAPI/Models/ClsGy_Material_Model.cs
+++ b/WebAPI/Models/ClsGy_Material_Model.cs
@@ -57,5 +57,9 @@
public double HPERUNITSTANDHOUR; //鏍囧噯宸ユ椂
public double HSTDLABORPREPARETIME; //鏍囧噯浜哄憳鍑嗗宸ユ椂
public double HSTDMACHINEPREPARETIME; //鏍囧噯鏈哄櫒鍑嗗宸ユ椂
+
+ public int HQCSchemeID_Fst;
+ public int HQCSchemeID_Proc;
+ public int HQCSchemeID_Patrol;
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/Gy_RoutingBillSub.cs b/WebAPI/Models/Gy_RoutingBillSub.cs
index c8d16f4..e11c427 100644
--- a/WebAPI/Models/Gy_RoutingBillSub.cs
+++ b/WebAPI/Models/Gy_RoutingBillSub.cs
@@ -72,5 +72,9 @@
public double HEstimate;//璁℃椂鏆備及
public bool HIsTime;//鏄惁璁℃椂
+
+ public int HQCSchemeID_Fst;
+ public int HQCSchemeID_Proc;
+ public int HQCSchemeID_Patrol;
}
}
\ No newline at end of file
diff --git "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs" "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs"
index 44a6c82..a1a1b3a 100644
--- "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs"
+++ "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs"
@@ -45,5 +45,8 @@
public long HWWBadWHID { get; set; }
public long HWWWasterWHID { get; set; }
public long HWHID { get; set; }
+ public int HQCSchemeID_Fst { get; set; }
+ public int HQCSchemeID_Proc { get; set; }
+ public int HQCSchemeID_Patrol { get; set; }
}
}
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index b970d4d..ec80c87 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -482,7 +482,7 @@
<Compile Include="Controllers\鍗氭棩鑷姩鎵爜绾縗ScanlineAPIController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\浜х嚎璐ㄦ骞冲彴\Sc_ICMOBillQualityStatus_TmpController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\浜х嚎杩斾慨骞冲彴\Sc_SourceLineRepairBillController.cs" />
- <Compile Include="Controllers\鍝佽川绠＄悊\瀹㈣瘔澶勭悊鍗昞Crm_CustomerAppealBillController.cs" />
+ <Compile Include="Controllers\鍝佽川绠＄悊\宸℃鍗昞QC_PatrolProcCheckBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_COMMONCONTACTBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CustLocationController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DutyBillController.cs" />
@@ -1002,6 +1002,7 @@
<Folder Include="Views\ProductionPlanReport\" />
<Folder Include="Views\ProductionReturnBill\" />
<Folder Include="Views\QC_Management\" />
+ <Folder Include="Views\QC_PatrolProcCheckBill\" />
<Folder Include="Views\Sb_EquipRepairSendWorkBill\" />
<Folder Include="Views\Sb_EquipSparepartsBill\" />
<Folder Include="Views\Sb_EquipSparepartsChangeBill\" />
--
Gitblit v1.9.1