From 131d7e49484ad2734c99bf5c2930738064ae5189 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期一, 03 四月 2023 21:32:15 +0800
Subject: [PATCH] 新增称重入库模块

---
 WebAPI/Controllers/CJGL/Cj_StationInBillController.cs |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
index 6d8ee64..d884619 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -95,7 +95,7 @@
                 long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
                 string HBillNo = list[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
                 int HBillStatus = 0;
-                string HMaker = list[0].HMaker;//鍒跺崟浜�
+                string HMaker = user;//鍒跺崟浜�
                 int HYear = 2021;
                 double HPeriod = 1;
                 string HRemark = list[0].HRemark;//澶囨敞
@@ -967,6 +967,17 @@
                         return objJsonResult;
                     }
 
+                    ds = oCn.RunProcReturn($"exec h_p_DelOutInBill {HInterID},'MES_StationInBill_DeleteRelationCtl'", "h_p_DelOutInBill");
+
+                    if (ds.Tables[0].Rows[0][0].ToString() == "0")
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "绯荤粺鍙傛暟鎺у埗,宸叉湁涓嬮亾宸ュ簭,涓嶈兘鍒犻櫎锛�";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+
                     //鍐欏叆鍒犻櫎鏃ュ織 
                     string WorkList = "鍒犻櫎杩涚珯鍗曪細" + oBill.omodel.HBillNo;
                     if (!oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HProcExchInterID, oBill.omodel.HProcExchEntryID, ref DBUtility.ClsPub.sExeReturnInfo))

--
Gitblit v1.9.1