From d291af0ea6fbda27a326d19a6a51d99c1cedff59 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 09 八月 2024 15:49:05 +0800
Subject: [PATCH] 直接调拨核对模块，扫源单方法增加私有云模式时通过WEBAPI重新同步单据功能；领料出库核对模块，扫物料条码调用方法修改，增加系统参数判断，安瑞先解析条码；新增设备维修记录报表调用方法
---
WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
index 0b4b6be..a797923 100644
--- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -1945,7 +1945,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- if (ds.Tables[0].Rows[0]["鐘舵��"].ToString() == "瀹℃牳涓�")
+ if (ds.Tables[0].Rows[0]["HBillStatus"].ToString() == "6")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -2339,7 +2339,7 @@
#region 閲囪喘璁㈠崟闇�瑕佹垜瀹℃壒娴佸鎵圭殑
[Route("Cg_POOrderBill/NeedChecklist")]
[HttpGet]
- public object NeedChecklist(string user)
+ public object NeedChecklist(string user,string userid)
{
try
{
@@ -2355,10 +2355,12 @@
return objJsonResult;
}
//鎼滅储闇�瑕佸鏍哥殑
- string sql = " select a.*,c.HItemID as HCheckFlowStatusID,m.HName as 瀹℃壒娴佸悕绉�,c.HCheckFlowID,m.HName as 瀹℃壒椤圭洰鍚嶇О,c.HCheckItemID,c.HChecker as 瀹℃壒娴佸鏍镐汉,c.HCheckNote as 瀹℃壒娴佸鏍稿缓璁�,c.HCheckDate 瀹℃壒娴佸鏍告棩鏈� from h_v_Cg_POOrderBillList AS a LEFT JOIN Xt_BillCheckFlowStatus AS c ON a.hmainid = c.HBillInterID and a.鍗曟嵁绫诲瀷 = c.HBillTypeID" +
+ string sql = " select a.*,c.HItemID as HCheckFlowStatusID,m.HName as 瀹℃壒娴�,c.HCheckFlowID,i.HName as 瀹℃壒椤圭洰鍚嶇О,c.HCheckItemID,c.HChecker as 椤圭洰瀹℃牳浜�,c.HCheckNote as 瀹℃壒娴佸鏍稿缓璁�,c.HCheckDate 瀹℃壒娴佸鏍告棩鏈� from h_v_Cg_POOrderBillList AS a LEFT JOIN Xt_BillCheckFlowStatus AS c ON a.hmainid = c.HBillInterID and a.鍗曟嵁绫诲瀷 = c.HBillTypeID" +
" LEFT JOIN Xt_CheckFlowMain as m ON m.HInterID = c.HCheckFlowID" +
+ " LEFT JOIN Cg_POOrderBillMain as po ON a.hmainid = po.HInterID" +
" LEFT JOIN Xt_CheckItem as i ON i.HItemID = c.HCheckItemID" +
- " where c.HCheckDate is NUll and c.HChecker = '" + user + "'";
+ " LEFT JOIN Xt_CheckUserRight as cr ON cr.HCheckItemID = i.HItemID and cr.HCheckFlowInterID = m.HInterID" +
+ " where po.HBillStatus = 6 and po.HCheckItemNowID = i.HItemID and cr.HUserID = '" + userid +"'" ;
ds = oCN.RunProcReturn(sql, "h_v_Cg_POOrderBillList");
foreach (DataColumn col in ds.Tables[0].Columns)
{
@@ -2405,7 +2407,7 @@
return objJsonResult;
}
//鎼滅储闇�瑕佸鏍哥殑
- string sql = " select a.*,c.HItemID as HCheckFlowStatusID,m.HName as 瀹℃壒娴佸悕绉�,c.HCheckFlowID,m.HName as 瀹℃壒椤圭洰鍚嶇О,c.HCheckItemID,c.HChecker as 瀹℃壒娴佸鏍镐汉,c.HCheckNote as 瀹℃壒娴佸鏍稿缓璁�,c.HCheckDate 瀹℃壒娴佸鏍告棩鏈� from h_v_Cg_POOrderBillList AS a LEFT JOIN Xt_BillCheckFlowStatus AS c ON a.hmainid = c.HBillInterID and a.鍗曟嵁绫诲瀷 = c.HBillTypeID" +
+ string sql = " select DISTINCT a.*,c.HItemID as HCheckFlowStatusID,m.HName as 瀹℃壒娴�,c.HCheckFlowID,i.HName as 瀹℃壒椤圭洰鍚嶇О,c.HCheckItemID,c.HChecker as 椤圭洰瀹℃牳浜�,c.HCheckNote as 瀹℃壒娴佸鏍稿缓璁�,c.HCheckDate 瀹℃壒娴佸鏍告棩鏈� from h_v_Cg_POOrderBillList AS a LEFT JOIN Xt_BillCheckFlowStatus AS c ON a.hmainid = c.HBillInterID and a.鍗曟嵁绫诲瀷 = c.HBillTypeID" +
" LEFT JOIN Xt_CheckFlowMain as m ON m.HInterID = c.HCheckFlowID" +
" LEFT JOIN Xt_CheckItem as i ON i.HItemID = c.HCheckItemID" +
" where c.HCheckDate is not NUll and c.HChecker = '" + user + "'";
@@ -2499,9 +2501,8 @@
#region 閲囪喘璁㈠崟 鍙戣捣瀹℃壒
[Route("Cg_POOrderBill/StartCheckFlow_POOrderBill")]
[HttpGet]
- public object StartCheckFlow_POOrderBill(int HInterID, int HCheckFlowID_select, string CurUserName)
+ public object StartCheckFlow_POOrderBill(int HInterID,string CurUserName)
{
- string ModRightNameCheck = "Cg_POOrderBill_Check";
DBUtility.ClsPub.CurUserName = CurUserName;
try
{
@@ -2529,9 +2530,9 @@
Int64 lngBillKey = 0;
lngBillKey = DBUtility.ClsPub.isLong(HInterID); //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
DAL.ClsCg_POOrderBill oBill = new DAL.ClsCg_POOrderBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
-
+
//鍙戣捣瀹℃壒
- if (oBill.startCheckFlow(lngBillKey, HCheckFlowID_select, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ if (oBill.startCheckFlow(lngBillKey,ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -2914,7 +2915,7 @@
{
//鍙嶅鏍告彁浜bandonCheck
- if (oBill.AbandonCheck(oCN, oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Xs_SeOrderBill_AfterUnCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ if (oBill.AbandonCheck(oCN, oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Cg_POOrderBill_AfterUnCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
//鏇存柊鍗曟嵁涓昏〃鐨勫鎵规祦鏁版嵁
string sql04 = "update " + oBill.MvarItemKey + " set HCheckItemNowID=" + HCheckItemNowID + ",HCheckItemNextID=" + HCheckItemNextID + ",HBillStatus=6 "+" where HInterID = " + lngBillKey;
--
Gitblit v1.9.1