From 60c4f385f229b15dd19690efd1e2feb2d5c945fd Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期四, 05 二月 2026 18:06:47 +0800
Subject: [PATCH] 生产退料单，生产领料单
---
WebAPI/Controllers/条码管理/WEBSController.cs | 2 +-
DAL/仓库管理/ClsKf_ProductReceiveMaterialBill.cs | 3 ++-
WebAPI/DLL/ClsKf_MateOutBackBill.cs | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git "a/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_ProductReceiveMaterialBill.cs" "b/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_ProductReceiveMaterialBill.cs"
index a02bf52..e03fd58 100644
--- "a/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_ProductReceiveMaterialBill.cs"
+++ "b/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_ProductReceiveMaterialBill.cs"
@@ -77,6 +77,7 @@
oCn.RunProc("UpDate Kf_ProductReceiveMaterialBillMain set " +
" HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
",HDate='" + omodel.HDate + "'" +
+ ",HBillSubType='" + omodel.HBillSubType + "'" +
",HYear='" + omodel.HYear + "'" +
",HPeriod='" + omodel.HPeriod + "'" +
",HRemark='" + omodel.HRemark + "'" +
@@ -195,7 +196,7 @@
",HEmpID,HDeptID,HKeeperID,HOrgID) " +
" values(" +
"'" + this.BillType + "'" +
- ",'" + this.HBillSubType + "'" +
+ ",'" + omodel.HBillSubType.ToString() + "'" +
"," + omodel.HInterID.ToString() + "" +
",'" + omodel.HBillNo + "'" +
",'" + omodel.HDate + "'" +
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index 901d82f..3f081cb 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -13976,7 +13976,7 @@
{
try
{
- ds = oCn.RunProcReturn("select * from GetMaterMesByCarBarCode where 灏忚溅='" + CarBarCode.ToString() + "'" , "GetMaterMesByCarBarCode");
+ ds = oCn.RunProcReturn("select * from GetMaterMesByCarBarCode where HQty>=0 and 灏忚溅='" + CarBarCode.ToString() + "'" , "GetMaterMesByCarBarCode");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
diff --git a/WebAPI/DLL/ClsKf_MateOutBackBill.cs b/WebAPI/DLL/ClsKf_MateOutBackBill.cs
index 96919a4..4caa717 100644
--- a/WebAPI/DLL/ClsKf_MateOutBackBill.cs
+++ b/WebAPI/DLL/ClsKf_MateOutBackBill.cs
@@ -46,6 +46,7 @@
",HDate='" + omodel.HDate + "'" +
",HYear='" + omodel.HYear.ToString() + "'" +
",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HBillSubType='" + omodel.HBillSubType.ToString() + "'" +
",HRemark='" + omodel.HRemark + "'" +
",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
",HUpDateDate=getdate()" +
@@ -124,7 +125,7 @@
",HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" +
") " +
- " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
+ " values('" + this.BillType + "','" + omodel.HBillSubType.ToString() + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
", " + omodel.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() +
", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
--
Gitblit v1.9.1