From dfcab5f73b1f07e63ca9483d457bcfddccc95bf3 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 10 十月 2024 14:27:44 +0800
Subject: [PATCH] 班组列表返回数据调用方法修改，增加根据用户过滤显示班组；PDA模块所调用的班组返回数据方法新增
---
DAL/车间管理/ClsSc_AssemblyBill.cs | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_AssemblyBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_AssemblyBill.cs"
index bd6f57e..dc410b9 100644
--- "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_AssemblyBill.cs"
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_AssemblyBill.cs"
@@ -86,7 +86,11 @@
try
{
//寰楀埌mainid
- omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ if (omodel.HInterID == 0 || omodel.HInterID.ToString() == null || omodel.HInterID.ToString() == "undefined")
+ {
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCn.BeginTran();
//涓昏〃
@@ -94,12 +98,12 @@
"(HYear,HPeriod,HBillType,HInterID" +
",HDate,HBillNo,HBillStatus,HRemark,HICMOInterID" +
",HICMOBillNo,HBarCode_P,HMaterID,HUnitID" +
- ",HMaker,HMakeDate" +
+ ",HMaker,HMakeDate,HBillSubType" +
") " +
" values(" + omodel.HYear + "," + omodel.HPeriod + ",'" + this.BillType + "'," + omodel.HInterID + "" +
",'" + omodel.HDate + "','" + omodel.HBillNo.ToString() + "'," + omodel.HBillStatus + ",'" + omodel.HRemark + "'," + omodel.HICMOInterID + "" +
",'" + omodel.HICMOBillNo.ToString() + "','" + omodel.HBarCode_P.ToString() + "'," + omodel.HMaterID + "," + omodel.HUnitID + "" +
- ",'" + DBUtility.ClsPub.CurUserName + "','" + DBUtility.ClsPub.GetServerDate(-1) + "'" +
+ ",'" + DBUtility.ClsPub.CurUserName + "','" + DBUtility.ClsPub.GetServerDate(-1) + "','" + this.BillType + "'" +
") ");
////鎻掑叆瀛愯〃
foreach (Model.ClsSc_AssemblyBillSub oSub in DetailColl)
@@ -108,12 +112,12 @@
" (HInterID,HEntryID,HMaterID,HUnitID,HQty,HSourceID" +
",HEquipID,HGroupID,HWorkerID,HScanDate,HBarCode,HBarCode_P" +
",HCloseMan,HCloseType,HRemark" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney)" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HBillNo_bak)" +
" values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HSourceID.ToString() + "" +
"," + oSub.HEquipID.ToString() + "," + oSub.HGroupID.ToString() + "," + oSub.HWorkerID.ToString() + ",'" + oSub.HScanDate.ToShortDateString() + "','" + oSub.HBarCode + "','" + oSub.HBarCode_P + "'" +
",'" + oSub.HCloseMan + "'," + 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.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + ",'" + omodel.HBillNo + "'" +
") ");
}
sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
--
Gitblit v1.9.1