From 523086c6262bddd439e030c8a6507b2b34404cb5 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期五, 23 四月 2021 17:04:21 +0800
Subject: [PATCH] 工序出站
---
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 94 +++++++++++++++++++++++++++++++---------------
1 files changed, 63 insertions(+), 31 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 41eac07..0b119b7 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -10,7 +10,7 @@
namespace WebAPI.Controllers
{
- //宸ュ簭鍑虹珯鍙戝嚭鍗旵ontroller
+ //宸ュ簭鍑虹珯姹囨姤鍗旵ontroller
public class Cj_StationOutBillController : ApiController
{
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
@@ -38,63 +38,93 @@
//鍙嶅簭鍒楀寲
msg1 = "[" + msg1.ToString() + "]";
List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg1);
- string BillType = "3790";
+
+ string BillType = "3791";
+ string HBillSubType = "3791";
long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
string HBillNo = list[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
int HBillStatus = 0;
string HMaker = list[0].HMaker;//鍒跺崟浜�
+ string HMouldNum = list[0].HMouldNum;//妯＄┐鍙�
int HYear = 2021;
double HPeriod = 1;
string HRemark = list[0].HRemark;//澶囨敞
+ string HSourceName = list[0].HSourceName;//鐢熶骇璧勬簮鍚嶇О
+ double HPieceQty = list[0].HPieceQty;//杩涚珯PCS鏁�
+ double HWasterQty = list[0].HWasterQty;//鎶ュ簾鏁伴噺
+ double HPlanPieceQty = list[0].HPlanPieceQty;//杩涚珯PNL鏁�
+ double HBadPNL = list[0].HBadPNL;//鎶ュ簾PNL鏁�
long HICMOInterID = list[0].HICMOInterID;//浠诲姟鍗旾D
string HICMOBillNo = list[0].HICMOBillNo;//浠诲姟鍗�
int HProcPlanInterID = 0;
int HProcPlanEntryID = 0;
string HProcPlanBillNo = "";
- int HProcExchInterID = 0;
- int HProcExchEntryID = 0;
+ long HProcExchInterID = list[0].lngBillKey;
+ long HProcExchEntryID = list[0].lngBillSubKey;
string HProcExchBillNo = list[0].HProcExchBillNo;//娴佽浆鍗�
long HMaterID = list[0].HMaterID;//浜у搧ID
- long HProcID = list[0].HProcID;//褰撳墠宸ュ簭
+ long HProcID = list[0].HProcID;//褰撳墠宸ュ簭ID
double HICMOQty = list[0].HICMOQty;//浠诲姟鍗曟暟閲�
- double HPlanQty = list[0].HPlanQty;//娴佽浆鍗℃暟閲�
+ double HPlanQty = list[0].HPlanQty;//绉讳氦PNL鏁�
+ DateTime HStationOutTime = list[0].HStationOutTime;//姹囨姤鏃堕棿
long HSourceID = list[0].HSourceID;//鐢熶骇璧勬簮ID
+ long HPayProcID = list[0].HPayProcID;//鏍哥畻宸ュ簭ID
long HGroupID = list[0].HGroupID;//鐝粍ID
long HDeptID = 0;
- long HEmpID = list[0].HEmpID;//鎺ユ敹浜篒D
+ long HEmpID = list[0].HEmpID;//鎿嶄綔鍛業D
string HBarCode = list[0].HBarCode;//鏉″舰鐮�
string HAddr = "";
string HBarCodeMaker = "";
+ long HSourceID2 = list[0].HSourceID2;//鐢熶骇璧勬簮2ID
+ long HSourceID3 = list[0].HSourceID3;//鐢熶骇璧勬簮3ID
+ long HSourceID4 = list[0].HSourceID4;//鐢熶骇璧勬簮4ID
+ long HSourceID5 = list[0].HSourceID5;//鐢熶骇璧勬簮5ID
long HSupID = 0;
- double HQty = list[0].HQty;//鎺ユ敹鏁伴噺
+ double HQty = list[0].HQty;//鍚堟牸鏁伴噺
double HPrice = 0;
double HMoney = 0;
- double HPieceQty = list[0].HPieceQty;//鎺ユ敹浠舵暟
- string HSourceName = list[0].HSourceName;//鐢熶骇璧勬簮鍚嶇О
+ double HBadCount = list[0].HBadCount;//涓嶈壇鏁伴噺
long HCenterID = list[0].HCenterID;//宸ヤ綔涓績ID
string HProcNo = list[0].HProcNo;//娴佹按鍙�
string HOrderProcNO = list[0].HOrderProcNO;//璁㈠崟璺熻釜鍙�
+ string HSourceNameList = list[0].HSourceNameList;//璁惧娓呭崟
+ long HMainSourceInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ string HMainSourceBillNo = list[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ string HMainSourceBillType = "3790";
+ bool HLastSubProc = list[0].HLastSubProc;//杞笅宸ュ簭
+ long HEmpID2 = list[0].HEmpID2;//鎿嶄綔鍛�2ID
+ long HEmpID3 = list[0].HEmpID3;//鎿嶄綔鍛�3ID
+ long HEmpID4 = list[0].HEmpID4;//鎿嶄綔鍛�4ID
+ long HEmpID5 = list[0].HEmpID5;//鎿嶄綔鍛�5ID
+ double HDSQty = list[0].HDSQty;//鎶樺集鍒�鏁�
+ double HChongQty = list[0].HChongQty;//NCT鍐叉鏁�
+ double HPriceRate = list[0].HPriceRate;//绯绘暟
+ double HWorkTimes = list[0].HWorkTimes;//宸ユ椂
+ long HQCCheckID = list[0].HQCCheckID;//妫�楠屽憳ID
+
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
//涓昏〃
- oCN.RunProc("Insert Into Sc_StationInBillMain " +
- "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
- ",HYear,HPeriod,HRemark" +
+ oCN.RunProc("Insert Into Sc_StationOutBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate,HMouldNum" +
+ ",HYear,HPeriod,HRemark,HSourceName,HPieceQty,HWasterQty,HPlanPieceQty,HBadPNL" +
",HICMOInterID,HICMOBillNo,HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID" +
- ",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationInTime,HSourceID" +
- ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" +
- ",HSupID,HQty,HPrice,HMoney,HPieceQty,HSourceName,HCenterID" +
- ",HProcNo,HOrderProcNO" +
+ ",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationOutTime,HSourceID,HPayProcID" +
+ ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate,HSourceID2,HSourceID3,HSourceID4,HSourceID5" +
+ ",HSupID,HQty,HPrice,HMoney,HBadCount,HCenterID,HProcNo,HOrderProcNO,HSourceNameList" +
+ ",HMainSourceInterID,HMainSourceBillNo,HMainSourceBillType,HLastSubProc" +
+ ",HEmpID2,HEmpID3,HEmpID4,HEmpID5,HDSQty,HChongQty,HPriceRate,HWorkTimes,HQCCheckID" +
") " +
- " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
- "," + HYear + "," + HPeriod + ",'" + HRemark + "'" +
+ " values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate(),'" + HMouldNum + "'" +
+ "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HSourceName + "'," + HPieceQty + "," + HWasterQty + "," + HPlanPieceQty + "," + HBadPNL +
"," + HICMOInterID + ",'" + HICMOBillNo + "'," + HProcPlanInterID + "," + HProcPlanEntryID + ",'" + HProcPlanBillNo + "'," + HProcExchInterID + "," + HProcExchEntryID +
- ",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",getdate()," + HSourceID +
- "," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" +
- "," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HPieceQty + ",'" + HSourceName + "'," + HCenterID +
- ",'" + HProcNo + "','" + HOrderProcNO + "'" +
- ") ");
- ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID + "", "h_p_MES_StationInBill_QtyCtrl");
+ ",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",'" + HStationOutTime + "'," + HSourceID + "," + HPayProcID +
+ "," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" + "," + HSourceID2 + "," + HSourceID3 + "," + HSourceID4 + "," + HSourceID5 +
+ "," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HBadCount + "," + HCenterID + "," + HProcNo + ",'" + HOrderProcNO + "'" + ",'" + HSourceNameList + "'" +
+ "," + HMainSourceInterID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + Convert.ToString(HLastSubProc ? 1 : 0) +
+ "," + HEmpID2 + "," + HEmpID3 + "," + HEmpID4 + "," + HEmpID5 + "," + HDSQty + "," + HChongQty + "," + HPriceRate + "," + HWorkTimes + "," + HQCCheckID +
+ ") ");
+ ds = oCN.RunProcReturn("exec h_p_MES_StationOutBill_QtyCtrl " + HInterID + "", "h_p_MES_StationOutBill_QtyCtrl");
if (ds == null)
{
oCN.RollBack();
@@ -118,20 +148,22 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.Message = "鏁伴噺鎺у埗," + ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
objJsonResult.data = null;
return objJsonResult;
}
- oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_In " + HInterID + ",1");
- //鍒ゆ柇鏄惁鏄� 棣栭亾宸ュ簭
+ oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Out " + HInterID + ",1");
+ oCN.RunProc("exec h_p_Mes_ProcessExchangeChangeStatus " + HInterID + " ");
+ oCN.RunProc("exec h_p_Mes_StationOutBillBackBarCode " + HInterID + " ");
+ //鍒ゆ柇鏄惁鏄� 鏈亾宸ュ簭
ds1 = oCN.RunProcReturn(" select HLastProc,HFstProc from Sc_ProcessExchangeBillMain a " +
" inner join Sc_ProcessExchangeBillSub b on a.HInterID=b.HInterID " +
" Where a.HInterID=" + HProcExchInterID + " and b.HEntryID=" + HProcExchEntryID + " ", "Sc_ProcessExchangeBillMain");
- if (ds1 == null || ds1.Tables[0].Rows.Count == 0)
+ if (ds1 == null || ds1.Tables[0].Rows.Count == 0 || HLastSubProc == false)
{
}
- else if (ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HFstProc"]) == "鏄�")
+ else if (ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HLastProc"]) == "鏄�")
{
}
@@ -155,7 +187,7 @@
/// <summary>
- /// 杩斿洖宸ュ簭鍑虹珯鍙戝嚭鍗曞垪琛�
+ /// 杩斿洖宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
--
Gitblit v1.9.1