From 1b1a4db47dc1e689737bf17635f97c32558bdd71 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期二, 06 六月 2023 13:23:23 +0800
Subject: [PATCH] 新增换托调拨单模块调用方法，采购入库直接扫描源单条码调用方法
---
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs | 62 +++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 11 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
index 5bc4ed7..71507cb 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -7,6 +7,7 @@
using System.Data;
using System.Data.SqlClient;
using System.Web.Http;
+using System.Windows.Forms;
using WebAPI.Models;
namespace WebAPI.Controllers
@@ -37,6 +38,7 @@
//濮斿宸ュ簭鍙戝嚭鍙嶅簭鍒楀寲
string msg2 = "[" + sArray[0].ToString() + "]";
string user = sArray[1].ToString();
+ string HComputerName = SystemInformation.ComputerName; //璁惧鍚嶇О
//鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Edit", 1, false, user))
@@ -124,6 +126,7 @@
long HCenterID = list[0].HCenterID;//宸ヤ綔涓績ID
string HOrderProcNO = list[0].HOrderProcNO;//璁㈠崟璺熻釜鍙�
long HPRDOrgID = list[0].HPRDOrgID;//缁勭粐ID
+ double HmaterOutqty = list[0].HmaterOutqty;//鐧藉澂鍙戝竷
//鍗曟嵁瀹屾暣鎬у垽鏂�
if (HMaterID <= 0)
{
@@ -133,6 +136,23 @@
objJsonResult.data = null;
return objJsonResult;
}
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "涔斾竴") //绯荤粺鍙傛暟 鍒ゆ柇瀹㈡埛
+ {
+ //鍒ゆ柇鐢熶骇璧勬簮
+ if (HSourceID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐢熶骇璧勬簮娌℃湁閫夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+
if (HCenterID <= 0)
{
objJsonResult.code = "0";
@@ -191,6 +211,7 @@
",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" +
",HSupID,HQty,HPrice,HMoney,HPieceQty,HSourceName,HCenterID" +
",HProcNo,HOrderProcNO,HMainInterID,HPRDOrgID" +
+ ",HmaterOutqty" +
") " +
" values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
"," + HYear + "," + HPeriod + ",'" + HRemark + "'" +
@@ -199,7 +220,10 @@
"," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" +
"," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HPieceQty + ",'" + HSourceName + "'," + HCenterID +
",'" + HProcNo + "','" + HOrderProcNO + "','" + HMainInterID + "'," + HPRDOrgID +
- ") ");
+ ","+ HmaterOutqty + ") ");
+
+ LogService.Write("鐢ㄦ埛:" + user + ",鏃ユ湡:" + DateTime.Now + ",鏂板宸ュ簭杩涚珯鍗曟嵁:" + HBillNo);
+ oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "鏂板宸ュ簭杩涚珯鍗曟嵁锛�" + HBillNo + "','LMES-宸ュ簭杩涚珯妯″潡','" + DBUtility.ClsPub.IPAddress + "','鏂板鍗曟嵁'", ref DBUtility.ClsPub.sExeReturnInfo);
}
else if ("Modify".Equals(eventType))
{
@@ -227,6 +251,7 @@
",HProcExchBillNo='" + HProcExchBillNo + "'" +
",HMaterID=" + HMaterID +
",HProcID=" + HProcID +
+ ",HmaterOutqty=" + HmaterOutqty +
",HICMOQty=" + HICMOQty +
",HPlanQty=" + HPlanQty +
",HStationInTime=getdate()" +
@@ -241,6 +266,9 @@
",HProcNo='" + HProcNo + "'" +
",HOrderProcNO='" + HOrderProcNO + "'" +
" where HInterID=" + HInterID);
+
+ LogService.Write("鐢ㄦ埛:" + user + ",鏃ユ湡:" + DateTime.Now + ",淇敼宸ュ簭杩涚珯鍗曟嵁:" + HBillNo);
+ oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "淇敼宸ュ簭杩涚珯鍗曟嵁锛�" + HBillNo + "','LMES-宸ュ簭杩涚珯妯″潡','" + DBUtility.ClsPub.IPAddress + "','淇敼鍗曟嵁'", ref DBUtility.ClsPub.sExeReturnInfo);
}
else
{
@@ -294,7 +322,7 @@
}
oCN.Commit();
- string sReturn = "";
+
if (oSystemParameter.ShowBill(ref sReturn) == true)
{
if (oSystemParameter.omodel.MES_StationInBill_SaveAutoAddnew == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
@@ -396,7 +424,7 @@
}
//寰楀埌淇℃伅锛堝澶栨爣璁颁负0鏃讹紝娴佽浆鏍囪涓�1鏃讹級
- ds = oCN.RunProcReturn("select top 2 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + sBillNo + "' and 涓嬮亾娴佽浆宸ュ簭<>'杞�' and 濮斿鏍囪=0 and 娴佽浆鏍囪=1 and 宸ュ簭鍙�<='" + sProcNo + "' order by cast(宸ュ簭鍙� as int) desc", "h_v_Sc_ProcessExchangeBillList");
+ ds = oCN.RunProcReturn("select top 2 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + sBillNo + "' and 涓嬮亾娴佽浆宸ュ簭<>'杞�' and 濮斿鏍囪=0 and 娴佽浆鏍囪=1 and cast(宸ュ簭鍙� as int)<='" + sProcNo + "' order by cast(宸ュ簭鍙� as int) desc", "h_v_Sc_ProcessExchangeBillList");
//Ds = oCn.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + sBillNo + "' and 宸ュ簭鍙�='" + sProcNo + "' and 濮斿鏍囪=0 and 娴佽浆鏍囪=1 ", "h_v_Sc_ProcessExchangeBillList");
//鍐欏叆淇℃伅
if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -962,6 +990,7 @@
{
try
{
+ string HComputerName = SystemInformation.ComputerName; //璁惧鍚嶇О
//缂栬緫鏉冮檺
if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Drop", 1, false, HDeleteMan))
{
@@ -974,14 +1003,22 @@
DAL.ClsSc_StationInBill oBill = new DAL.ClsSc_StationInBill();
if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
{
- if (oBill.omodel.HMaker != HDeleteMan && (HDeleteMan != "admin" && HDeleteMan != "Admin"))
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn))
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍙兘鍒犻櫎鏈汉鐨勫崟鎹紒";
- objJsonResult.data = null;
- return objJsonResult;
+ if (oSystemParameter.omodel.MES_StationInBill_DeleteCtl == "Y")
+ {
+ if (oBill.omodel.HMaker != HDeleteMan && (HDeleteMan != "admin" && HDeleteMan != "Admin"))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙兘鍒犻櫎鏈汉鐨勫崟鎹紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
}
+
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
DataSet ds;
@@ -1023,8 +1060,7 @@
return objJsonResult;
}
- //鍐欏叆鍒犻櫎鏃ュ織
- string WorkList = "鍒犻櫎杩涚珯鍗曪細" + oBill.omodel.HBillNo;
+
if (!oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HProcExchInterID, oBill.omodel.HProcExchEntryID, ref DBUtility.ClsPub.sExeReturnInfo))
{
objJsonResult.code = "0";
@@ -1035,6 +1071,10 @@
}
else
{
+ //鍐欏叆鍒犻櫎鏃ュ織
+ LogService.Write("鐢ㄦ埛:" + HDeleteMan + ",鏃ユ湡:" + DateTime.Now + ",鍒犻櫎宸ュ簭杩涚珯鍗曟嵁:" + oBill.omodel.HBillNo);
+ oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + HDeleteMan + "','" + HComputerName + "','" + "鍒犻櫎宸ュ簭杩涚珯鍗曟嵁锛�" + oBill.omodel.HBillNo + "','LMES-宸ュ簭杩涚珯妯″潡','" + DBUtility.ClsPub.IPAddress + "','鍒犻櫎鍗曟嵁'", ref DBUtility.ClsPub.sExeReturnInfo);
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
--
Gitblit v1.9.1