blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
YL
2022-01-19 0f7f19c41c4b6c29176a2829f96b9b54fe47d498 
 WebAPI/Controllers/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/Sc_MESBeginStepWorkBillController.cs


@@ -1,11 +1,15 @@


using 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 ="";   //维修要求