From 3652ccd21dffadf73d58ab241938c49c1929ff5b Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 04 八月 2025 10:30:59 +0800
Subject: [PATCH] 页面过滤条件:开始时间和结束时间(根据检验信息中的创建时间进行过滤)、站台(检验信息中的检验工序)、料号(PNL布局信息名称)、批次(lot号) 2.柱状图:x轴lot号,y轴良品率。根据开始时间和结束时间、站台、料号 过滤检验信息并去重(一个PNL里的PCS不能有重复记录),然后根据料号、批次分组合计得到该料号每个批次的不良PCS的数量合计。然后获取该料号每个批次中PNL条码的数量(PNL条码不能重复)并乘PNL布局信息中子表的记录数(该料号中的PCS数量)得到每个批次的PCS总数。对每个批次进行((PCS总数-不良PCS数量)/PCS总数 *100)得到每个批次的良品率。 3.饼状图:根据开始时间和结束时间、站台、料号 过滤检验信息并去重(一个PNL里的PCS不能有重复记录),然后根据检验信息中的不良原因分组统计各个原因的数量。在饼状图显示 4.表格:根据开始时间和结束时间、站台、料号 过滤检验信息,表头包含(站台、料号、PNL条码、PCS号、正反面、不良原因),并针对表头字段进行去重

---
 WebAPI/Controllers/ProductInController.cs |  157 ++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 121 insertions(+), 36 deletions(-)

diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs
index 8291829..23d2708 100644
--- a/WebAPI/Controllers/ProductInController.cs
+++ b/WebAPI/Controllers/ProductInController.cs
@@ -42,6 +42,7 @@
         public ClsGy_BarCodeBill_WMS_Model_View oView =new ClsGy_BarCodeBill_WMS_Model_View();
         public ClsKF_PonderationBillMain_Temp model = new ClsKF_PonderationBillMain_Temp();
         public ClsKf_ICStockBill_WMS oBar = new Model.ClsKf_ICStockBill_WMS();
+        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
         //public ClsKf_ICStockBill_WMS oBar = new ClsKf_ICStockBill_WMS();
         public double sRelQty = 0;
        // private DataBaseServices objDataBaseServices = new DataBaseServices();
@@ -263,8 +264,11 @@
             //oBar = webserver.get_CheckTypeByBarCode(sCode, sInterID, sBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
             WebS.WebService1 oWebs = new WebS.WebService1();
             WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
-            string sExpressNumber = "";
-            //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
+
+            Kf_MateOutBillController obill = new Kf_MateOutBillController();
+            //閲嶆柊鍚屾鐢熶骇棰嗘枡鍗�
+            objJsonResult = obill.GetKf_MateOutBill_Sync_Json(HBillNo, HBillType);
+
             WebSoBar = oWebs.get_BillBarCode_MateOutCheck(HBillNo, HBillType, HMaker, HOwnerID, ref DBUtility.ClsPub.sErrInfo);
             if (WebSoBar == null)
             {
@@ -300,8 +304,11 @@
             //oBar = webserver.get_CheckTypeByBarCode(sCode, sInterID, sBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
             WebS.WebService1 oWebs = new WebS.WebService1();
             WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
-            string sExpressNumber = "";
-            //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
+
+            Kf_MoveStockBillController obill = new Kf_MoveStockBillController();
+            //閲嶆柊鍚屾鐩存帴璋冩嫧鍗�
+            objJsonResult = obill.GetKf_MoveStockBill_Sync_Json(HBillNo, HBillType);
+
             WebSoBar = oWebs.get_BillBarCode_MoveStockCheck(HBillNo, HBillType, HMaker, HOwnerID, ref DBUtility.ClsPub.sErrInfo);
             if (WebSoBar == null)
             {
@@ -358,28 +365,56 @@
         {
             WebS.WebService1 oWebs = new WebS.WebService1();
             WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
-            string sBarCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker);
-            string sExpressNumber = "";
-            WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sBarCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, (double)sQty, HOWNERID, ref ClsPub.sErrInfo);
-            bool flag = WebSoBar == null;
-            object result;
-            if (flag)
+            //鑾峰彇绯荤粺鍙傛暟
+            string sErrMsg = "";
+            string sJXCode = "";
+            if (oSystemParameter.ShowBill(ref sErrMsg) == true)
             {
-                this.objJsonResult.code = "0";
-                this.objJsonResult.count = 0;
-                this.objJsonResult.Message = ClsPub.sErrInfo;
-                this.objJsonResult.data = null;
-                result = this.objJsonResult;
+                if (oSystemParameter.omodel.WMS_CampanyName == "瀹夌憺") //绯荤粺鍙傛暟  瀹㈡埛瀹氬埗鍖栧悕绉�     绌虹櫧涓洪�氱敤
+                {
+                    sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker);
+                }
+                else
+                {
+                    sJXCode = sCode;
+                }
+                try
+                {
+                    WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, (double)sQty, HOWNERID, ref ClsPub.sErrInfo);
+                    if (WebSoBar == null)
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    else
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 1;
+                        objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+                        objJsonResult.data = WebSoBar;
+                        return objJsonResult;
+                    }
+                }
+                catch (Exception e)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鎵弿鏉$爜澶辫触锛�" + e.ToString();
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
             }
             else
             {
-                this.objJsonResult.code = "0";
-                this.objJsonResult.count = 1;
-                this.objJsonResult.Message = ClsPub.sErrInfo;
-                this.objJsonResult.data = WebSoBar;
-                result = this.objJsonResult;
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
+                objJsonResult.data = null;
+                return objJsonResult;
             }
-            return result;
         }
 
 
@@ -393,24 +428,54 @@
         {
             WebS.WebService1 oWebs = new WebS.WebService1();
             WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
-            var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker);
-            string sExpressNumber = "";
-            //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
-            WebSoBar = oWebs.get_BarCode_MoveStockBillCheck(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, SCWhID, SCSPID, sQty, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
-            if (WebSoBar == null)
+            //鑾峰彇绯荤粺鍙傛暟
+            string sErrMsg = "";
+            string sJXCode = "";
+            if (oSystemParameter.ShowBill(ref sErrMsg) == true)
             {
-                objJsonResult.code = "0";
-                objJsonResult.count = 0;
-                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
-                objJsonResult.data = null;
-                return objJsonResult;
+                if (oSystemParameter.omodel.WMS_CampanyName == "瀹夌憺") //绯荤粺鍙傛暟  瀹㈡埛瀹氬埗鍖栧悕绉�     绌虹櫧涓洪�氱敤
+                {
+                    sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker);
+                }
+                else
+                {
+                    sJXCode = sCode;
+                }
+                try
+                {
+                    WebSoBar = oWebs.get_BarCode_MoveStockBillCheck(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, SCWhID, SCSPID, sQty, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
+                    if (WebSoBar == null)
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    else
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 1;
+                        objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+                        objJsonResult.data = WebSoBar;
+                        return objJsonResult;
+                    }
+                }
+                catch (Exception e)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鎵弿鏉$爜澶辫触锛�" + e.ToString();
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
             }
             else
             {
                 objJsonResult.code = "0";
-                objJsonResult.count = 1;
-                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
-                objJsonResult.data = WebSoBar;
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
+                objJsonResult.data = null;
                 return objJsonResult;
             }
         }
@@ -1249,18 +1314,37 @@
                 clsKf_ProductInBillMain.HDeptID = list[0].HDeptID;
                 clsKf_ProductInBillMain.HEmpID = list[0].HEmpID;
                 clsKf_ProductInBillMain.HKeeperID = list[0].HKeeperID;
+                clsKf_ProductInBillMain.HSecManagerID = list[0].HSecManagerID;
                 clsKf_ProductInBillMain.HRemark = list[0].HRemark;
                 clsKf_ProductInBillMain.HMaker = list[0].HMaker;
+                clsKf_ProductInBillMain.HBillerID = list[0].HBillerID;
                 clsKf_ProductInBillMain.HWHID = list[0].HWHID;
                 clsKf_ProductInBillMain.HSupID = list[0].HSupID;
                 clsKf_ProductInBillMain.HExplanation = list[0].HExplanation;
                 clsKf_ProductInBillMain.HBillType = "1202";
+                if (list[0].HBillType == "3714")
+                {
+                    clsKf_ProductInBillMain.HMainSourceBillType = "宸ュ簭姹囨姤鍗�";
+                }
+                else if (list[0].HBillType == "3711")
+                {
+                    clsKf_ProductInBillMain.HMainSourceBillType = "鐢熶骇姹囨姤鍗�";
+                }
+                else if (list[0].HBillType == "3710")
+                {
+                    clsKf_ProductInBillMain.HMainSourceBillType = "鐢熶骇璁㈠崟";
+                }
+                else
+                {
+                    clsKf_ProductInBillMain.HMainSourceBillType = "鎵嬪伐褰曞叆";
+                }
                 bool flag = this.webserver.set_SaveProductInBill_New(clsKf_ProductInBillMain, hbillType, ref ClsPub.sErrInfo);
                 if (flag)
                 {
                     this.objJsonResult.code = "0";
                     this.objJsonResult.count = 1;
-                    this.objJsonResult.Message = "鐢熸垚浜у搧鍏ュ簱鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
+                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //鎴愬姛锛�
+                    //this.objJsonResult.Message = "鐢熸垚浜у搧鍏ュ簱鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
                     this.objJsonResult.data = null;
                     result = this.objJsonResult;
                 }
@@ -1268,7 +1352,8 @@
                 {
                     this.objJsonResult.code = "0";
                     this.objJsonResult.count = 0;
-                    this.objJsonResult.Message = "涓婁紶澶辫触锛�" + ClsPub.sErrInfo;
+                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //澶辫触锛�
+                    //this.objJsonResult.Message = "涓婁紶澶辫触锛�" + ClsPub.sErrInfo;
                     this.objJsonResult.data = null;
                     result = this.objJsonResult;
                 }

--
Gitblit v1.9.1