From 0f7f19c41c4b6c29176a2829f96b9b54fe47d498 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 19 一月 2022 00:47:29 +0800
Subject: [PATCH] 雅琪诺报工台产量汇报修改
---
WebAPI/Controllers/生产管理/报工台工序/Sc_MESBeginStepWorkBillController.cs | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
index 2c43492..afebc15 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
@@ -1,11 +1,15 @@
锘縰sing Newtonsoft.Json.Linq;
+using NPOI.HSSF.UserModel;
+using NPOI.SS.UserModel;
using Pub_Class;
using System;
using System.Collections.Generic;
using System.Data;
+using System.IO;
using System.Linq;
using System.Net;
using System.Net.Http;
+using System.Net.Http.Headers;
using System.Web.Http;
using WebAPI.Models;
@@ -603,14 +607,14 @@
,b.HSourceInterID,b.HSourceEntryID,b.HSourceBillNo,b.HSourceBillType
from Sc_ProcessReportMain a
inner join Sc_ProcessReportSub b on a.HInterID=B.HInterID
- inner join (select max(HProcNo) HProcNo,HBillNo,HProcID,HSourceInterID,HSourceEntryID,HSourceBillNo
- from Sc_ProcessPlanSub group by HBillNo,HProcID,HSourceInterID,HSourceEntryID,HSourceBillNo)
- pr on b.HSourceBillNo=pr.HSourceBillNo and b.HSourceInterID=pr.HSourceInterID and b.HSourceEntryID=pr.HSourceEntryID
+ inner join (select max(HProcNo) HProcNo
+ from Sc_ProcessPlanSub group by HBillNo,HSourceBillNo)
+ pr on b.HProcID=pr.HProcNo
left join Gy_Process p on b.HProcID=p.HItemID
left join Gy_Material m on a.HMaterID=m.hitemid
left join Gy_Source s on b.HSourceID=s.HItemID
left join Gy_Group g on a.HGroupID=g.HItemID
- left join Gy_Employee e on b.HEmpID=e.HItemID "+sWhere+" and HRelationInterID='0'");
+ left join Gy_Employee e on b.HEmpID=e.HItemID " + sWhere+" and HRelationInterID='0'");
return new SQLHelper.ClsCN().RunProcReturn(sql, "Sc_ICMOBillWorkQtyStatus_Tmp");
}
#endregion
@@ -761,6 +765,16 @@
oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
//oItemSub.HRemark = ""; //澶囨敞
oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ oItemSub.HProcPlanBillNo = ""; //宸ュ簭璁″垝鍗�
+ oItemSub.HSeOrderBillNo = "";
+ oItemSub.HRemark = "鎶ュ伐鍙板伐搴忔眹鎶�";
+ oItemSub.HOtherItem1 = "";
+ oItemSub.HOtherItem2 = "";
+ oItemSub.HOtherItem3 = "";
+ oItemSub.HOtherItem4 = "";
+ oItemSub.HOtherItem5 = "";
+ oItemSub.HPackType = "";
+ oItemSub.HBatchNo="";
//oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
//oItemSub.HRepairID = 0; //缁翠慨椤圭洰
//oItemSub.HRepairExplanation =""; //缁翠慨瑕佹眰
--
Gitblit v1.9.1