From 2566524594675a8d742f9ba0eff35dd5d8d33fa2 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 31 三月 2025 12:43:22 +0800
Subject: [PATCH] 排产：Excel导入功能，上传文件时，如果时宝工，则返回excel文件中维护的数量，不然则取生产订单的数量
---
WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs b/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
index 58bebf3..386af06 100644
--- a/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
@@ -38,7 +38,7 @@
try
{
- ds = oCN.RunProcReturn("select * from h_v_IF_POInStockBillList where hmainid=" + HInterID, "h_v_IF_POInStockBillList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_POInStockBillEdit where hmainid=" + HInterID, "h_v_IF_POInStockBillList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -646,10 +646,22 @@
}
string sql= $@"update Cg_POInStockBillMain set " +
- "HRemark='" + HRemark + "', HUpDater ='" + HMaker + "', HUpDateDate=getdate()"+ ",HBillNo='" + HBillNo + "'" +
- ",HSupID=" + HSupID + ",HCurID=" + HCurID
- + ",HExRate=" + HExRate + ",HEmpID=" + HEmpID + ",HManagerID=" + HManagerID + ",HDeptID=" + HDeptID
- + ",HAddress='" + HAddress + "',HInnerBillNo='" + HInnerBillNo + "',HProjectID="+ HProjectID + ",HInvoiceBillNo='"+ HInvoiceBillNo + "' where HInterID=" + HInterID;
+ "HRemark='" + HRemark + "'" +
+ ", HUpDater ='" + HMaker + "'" +
+ ", HUpDateDate=getdate()"+ "" +
+ ",HBillNo='" + HBillNo + "'" +
+ ",HWHID=" + HWHID + "" +
+ ",HSupID=" + HSupID + "" +
+ ",HCurID=" + HCurID + "" +
+ ",HExRate=" + HExRate + "" +
+ ",HEmpID=" + HEmpID + "" +
+ ",HManagerID=" + HManagerID + "" +
+ ",HDeptID=" + HDeptID + "" +
+ ",HAddress='" + HAddress + "'" +
+ ",HInnerBillNo='" + HInnerBillNo + "'" +
+ ",HProjectID="+ HProjectID + "" +
+ ",HInvoiceBillNo='"+ HInvoiceBillNo + "' " +
+ " where HInterID=" + HInterID;
oCN.RunProc(sql);
@@ -775,14 +787,14 @@
foreach (ClsCg_POInStockBillSub oSub in DetailColl)
{
i++;
- if (oSub.HQty <= 0 || oSub.HQty == null)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "绗�" + i + "琛岋紝鏁伴噺涓嶈兘涓�0鎴栬�呭皬浜�0";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //if (oSub.HQty <= 0 || oSub.HQty == null)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "绗�" + i + "琛岋紝鏁伴噺涓嶈兘涓�0鎴栬�呭皬浜�0";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
if (oSub.HMaterID == 0)
{
--
Gitblit v1.9.1