From a1709bcc95fe641126f5c34e0a344e406b467f88 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 16 五月 2023 11:11:15 +0800
Subject: [PATCH] 流转卡和生产订单只能自己删除自己的单据。pda进站单增加白坯发布字段，放在接收数量后面，不允许编辑，每次扫进站单出站单的时候，自动把白坯发布的汇总数量显示。生产订单模块增加一个字段，是否取库存,底部备注，做成下拉框。生产报表这个字段有值的不计算产能。工艺路线批量插入白坯定型和染厂（第一道和第二道）（把以前所有的流水号加20，在把白坯定型（10），和染厂（20）刷进去
---
DAL/质检管理/ClsQC_NoPassProdCheckBill.cs | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_NoPassProdCheckBill.cs" "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_NoPassProdCheckBill.cs"
index 8a00be1..22bfcb6 100644
--- "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_NoPassProdCheckBill.cs"
+++ "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_NoPassProdCheckBill.cs"
@@ -172,19 +172,19 @@
//鏍规嵁鍐呯爜 鍥炲～瀵瑰簲娴佽浆鍗� 涓嶈壇鍏宠仈鏁伴噺
oCn.RunProc("exec h_p_QC_NoPassProdCheckBillToProcExch " + omodel.HInterID.ToString() + ",1");
//////////////////////////////
- //DataSet Ds;
- //Ds = oCn.RunProcReturn("exec h_p_QC_NoPassProdCheckBillQtyCtrl " + omodel.HInterID.ToString(), "h_p_QC_NoPassProdCheckBillQtyCtrl");
- //if (Ds == null || Ds.Tables[0].Rows.Count == 0)
- //{
- // oCn.RollBack();
- // return false;
- //}
- //if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBack"]) == "2")
- //{
- // sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackRemark"]);
- // oCn.RollBack();
- // return false;
- //}
+ DataSet Ds;
+ Ds = oCn.RunProcReturn("exec h_p_QC_NoPassProdCheckBill_QtyCtrl " + omodel.HInterID.ToString(), "h_p_QC_NoPassProdCheckBill_QtyCtrl");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBack"]) == "2")
+ {
+ sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
////////////////////////
@@ -219,7 +219,7 @@
",HMaterID,HProcID,HMainSourceInterID" +
",HProcExchInterID,HProcExchEntryID,HProcExchBillNo,HOrderProcNo,HProcExchQty" +
") " +
- " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",'" + omodel.HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+ " values('" + this.BillType + "','" + omodel.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",'" + omodel.HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HGroupName.ToString() + "'" +
"," + omodel.HSourceID.ToString() + "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HInStockQty.ToString() + "," + omodel.HCheckQty.ToString() + "," + omodel.HRightQty.ToString() +
"," + omodel.HBadQty.ToString() + "," + omodel.HPlanQty.ToString() + "," + omodel.HBadPNL.ToString() + "," + omodel.HPlanPNL.ToString() + "," + omodel.HFirstCheckEmp.ToString() +
@@ -275,19 +275,19 @@
oCn.RunProc("exec h_p_QC_NoPassProdCheckBillToProcExch " + omodel.HInterID.ToString() + ",1");
//
//////////////////////////////
- //DataSet Ds;
- //Ds = oCn.RunProcReturn("exec h_p_QC_NoPassProdCheckBillQtyCtrl " + omodel.HInterID.ToString(), "h_p_QC_NoPassProdCheckBillQtyCtrl");
- //if (Ds == null || Ds.Tables[0].Rows.Count == 0)
- //{
- // oCn.RollBack();
- // return false;
- //}
- //if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBack"]) == "2")
- //{
- // sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackRemark"]);
- // oCn.RollBack();
- // return false;
- //}
+ DataSet Ds;
+ Ds = oCn.RunProcReturn("exec h_p_QC_NoPassProdCheckBill_QtyCtrl " + omodel.HInterID.ToString(), "h_p_QC_NoPassProdCheckBill_QtyCtrl");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBack"]) == "2")
+ {
+ sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
////////////////////////
//
--
Gitblit v1.9.1