Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

lan

2024-05-23 edbb3dfdc024641c81829b3ddb4af13dbcf9d9ba

 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();
@@ -393,24 +394,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,12 +1280,30 @@
                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)
                {