乔一优化

yangle

2023-04-04 a5ac8ae1764596ada3aa17eb087185456c592cfd

乔一优化

 DAL/³µ¼ä¹ÜÀí/ClsSc_ProcessExchangeBill.cs

@@ -103,6 +103,14 @@
                ",HAuxQty='" + omodel.HAuxQty + "'" +
                ",HAuxUnit='" + omodel.HAuxUnit + "'" +
                ",HSplitNo='" + omodel.HSplitNo + "'" +
                ",HHeight='" + omodel.HHeight + "'" +
                ",HInches='" + omodel.HInches + "'" +
                ",HAl1Long='" + omodel.HAl1Long + "'" +
                ",HDensity='" + omodel.HDensity + "'" +
                ",HTela='" + omodel.HTela + "'" +
                ",HUnderTela='" + omodel.HUnderTela + "'" +
                ",HSizing='" + omodel.HSizing + "'" +
                ",HSellDate='" + omodel.HSellDate + "'" +
                ",HProdMaterCode='" + omodel.HProdMaterCode + "'" +
                ",HSeOrderBillNo='" + omodel.HSeOrderBillNo + "'" +
                ",HCusShortName='" + omodel.HCusShortName + "'" +
@@ -305,7 +313,8 @@
                ",HMaterNumber_B,HMaterNumber_C,HMaterNumber_D,HProdType,HMaterShortName" +
                ",HMaterIDA,HMaterIDB,HMaterIDC,HMaterIDD,HICMOEntryID" +       
",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HVerNum,HPRDORGID,HBLFlag,HCusNumber,HPickLabel,HPickLabelNumber,HXTNumber,HXTModel,HWorkBillSortNo" +
               ", HRoutingBillID,HMaterModel,HWidth,HWeight,HAuxQty,HAuxUnit,HSplitNo) " +
               ", HRoutingBillID,HMaterModel,HWidth,HWeight,HAuxQty,HAuxUnit,HSplitNo" +
               ",HHeight,HInches,HAl1Long,HDensity,HTela,HUnderTela,HSizing,HSellDate) " +
                " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()," + "" + (omodel.HPrevMainSourceInterID == 0 ? omodel.HInterID : omodel.HPrevMainSourceInterID) +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HBatchNo + "'," + omodel.HMainMaterID.ToString() + "," + omodel.HKeyMaterID.ToString() + "," + omodel.HNo.ToString() + ",'" + omodel.HOrderProcNO + "'" +
                "," + omodel.HWWOrderInterID.ToString() + "," + omodel.HWWOrderEntryID.ToString() + ",'" + omodel.HWWOrderBillNo + "'," + omodel.HICMOInterID.ToString() + "," + omodel.HEquipMentID.ToString() +
@@ -317,7 +326,8 @@
                ",'" + omodel.HMaterNumber_B + "','" + omodel.HMaterNumber_C + "','" + omodel.HMaterNumber_D + "','" + omodel.HProdType + "','" + omodel.HMaterShortName + "'" +
                ",'" + omodel.HMaterIDA + "','" + omodel.HMaterIDB + "','" + omodel.HMaterIDC + "','" + omodel.HMaterIDD + "'," + omodel.HICMOEntryID +
                ",'" + omodel.HPicNumVer + "','" + omodel.HPicNumAssemble + "','" + omodel.HMaterTexture + "','" + omodel.HProductNum + "','" + omodel.HVerNum + "','"+ omodel.HPRDORGID+ "','" + (omodel.HBLFlag ? 1 : 0) + "','" + omodel.HCusNumber + "','" + omodel.HPickLabel + "','" + omodel.HPickLabelNumber + "','" + omodel.HXTNumber + "','" + omodel.HXTModel + "','" + omodel.HWorkBillSortNo + 
                "',"+ omodel.HRoutingBillID + ",'"+ omodel.HMaterModel + "',"+ omodel.HWidth + ","+ omodel.HWeight + ","+ omodel.HAuxQty + ","+ omodel.HAuxUnit +","+ omodel.HSplitNo +")" );
                "',"+ omodel.HRoutingBillID + ",'"+ omodel.HMaterModel + "',"+ omodel.HWidth + ","+ omodel.HWeight + ","+ omodel.HAuxQty + ","+ omodel.HAuxUnit +","+ omodel.HSplitNo +"" +
                ",'" + omodel.HHeight + "','" + omodel.HInches + "','" + omodel.HAl1Long + "','" + omodel.HDensity + "','" + omodel.HTela + "','" + omodel.HUnderTela + "','" + omodel.HSizing + "','" + omodel.HSellDate + "')");
                sErr = sErr + "1;";
                //插入子表
                foreach (Model.ClsSc_ProcessExchangeBillSub oSub in DetailColl)

 Model/³µ¼ä¹ÜÀí/ClsSc_ProcessExchangeBillMain.cs

@@ -72,6 +72,16 @@
        public string HPickLabelNumber;
        public string HXTNumber;
        public string HXTModel;

        public string HHeight;//毛高
        public string HInches;//寸数组织
        public string HAl1Long;//全毛长
        public string HDensity;//坏布密度
        public string HTela;//毛纱名称及规格
        public string HUnderTela;//底丝
        public string HSizing;//定型浆料
        public string HSellDate;//交货日期

        public string HRoutingBillID;//工艺路线ID
        public string HMaterModel;//材料规格
        public double HWidth;//幅宽

 WebAPI/Controllers/BaseSet/Gy_CustomerController.cs

@@ -42,7 +42,22 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string sql1 = string.Format(@"select * from h_v_Gy_CustomerList where ç»„织名称='" + Organization + "'");
                string sql1 = "";
                //客户制定
                string sErr = "";
                if (oSystemParameter.ShowBill(ref sErr))
                {
                    if (oSystemParameter.omodel.WMS_CampanyName == "乔一")
                    {
                         sql1 = string.Format(@"select * from h_v_Gy_CustomerList where 1=1");
                    }
                    else
                    {
                         sql1 = string.Format(@"select * from h_v_Gy_CustomerList where ç»„织名称='" + Organization + "'");
                    }
                }

             
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by å®¢æˆ·ä»£ç  ", "h_v_Gy_CustomerList");

 WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs

@@ -193,7 +193,7 @@
                            { //系统参数是否为只显示当前登录用户关联的工序信息,N为否，Y为是
                                if (oSystemParameter.omodel.MES_StationInBill_ShowUSERProcess == "Y")
                                {
                                    ds = oCN.RunProcReturn($"exec h_p_ProcessExchangeBillLastHProNo '{BillNo_PGD}','{UserID}'", "h_v_Gy_ProcessList_GetProcNoByUser");
                                    ds = oCN.RunProcReturn($"exec h_p_ProcessExchangeBillLastHProNo '{BillNo_PGD}','{UserID}','In'", "h_v_Gy_ProcessList_GetProcNoByUser");
                                }
                                else
                                {

 WebAPI/Controllers/CJGL/Cj_StationInBillController.cs

@@ -379,6 +379,51 @@
        #endregion


        #region å·¥åºè¿›ç«™æŽ¥æ”¶å•æµæ°´å·å›žè½¦èŽ·å–工序信息
        [Route("Cj_StationInBill/txtHProcNo_KeyDown_qiaoyi")]
        [HttpGet]
        public object txtHProcNo_KeyDown_qiaoyi(string sBillNo, string sProcNo)
        {
            try
            {
                if (sBillNo.Equals("") || sProcNo.Equals(""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "条形码不能为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                //得到信息（委外标记为0时，流转标记为1时）
                ds = oCN.RunProcReturn("select top 2 * from h_v_Sc_ProcessExchangeBillList  where å•æ®å·= '" + sBillNo + "' and ä¸‹é“流转工序<>'转' and å§”外标记=0 and æµè½¬æ ‡è®°=1  and å·¥åºå·<='" + sProcNo + "' order by cast(工序号 as int) desc", "h_v_Sc_ProcessExchangeBillList");
                //Ds = oCn.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList  where å•æ®å·= '" + sBillNo + "' and å·¥åºå·='" + sProcNo + "' and å§”外标记=0 and æµè½¬æ ‡è®°=1 ", "h_v_Sc_ProcessExchangeBillList");
                //写入信息
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "工序号错误或者当前工序号不允许进站，请重新输入！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion



        #region å·¥åºè¿›ç«™æŽ¥æ”¶å•æ ¹æ®èŒå‘˜ä»£ç æ¨¡ç³Šå›žè½¦æŸ¥è¯¢

 WebAPI/Controllers/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillController.cs

@@ -507,6 +507,28 @@
        public json AddBillSub_NoTable(string msg3, long HInterID, int OperationType,int HEntryID)
        {
            ClsSc_ICMOBillSub oSub = Newtonsoft.Json.JsonConvert.DeserializeObject<ClsSc_ICMOBillSub>(msg3);

            //客户制定
            string sErr = "";
            if (oSystemParameter.ShowBill(ref sErr))
            {
                if (oSystemParameter.omodel.WMS_CampanyName == "乔一")
                {

                }
                else
                {
                    if (oSub.HDeptID == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "生产车间不能为空";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
            }

            if (oSub.HQty <= 0 || oSub.HQty == null)
            {
                objJsonResult.code = "0";
@@ -525,14 +547,7 @@
                return objJsonResult;
            }

            if (oSub.HDeptID == 0)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "生产车间不能为空";
                objJsonResult.data = null;
                return objJsonResult;
            }
          

            if (oSub.HUnitID == 0)
            {