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

zzr99

2022-05-16 820074f0ce1c04edfb4a9fb4ed5b3fa784e6e8d0

 WorkM/Á÷ת¿¨¹ÜÀí/MES_StationOutBill.cs

@@ -190,7 +190,8 @@
                    cmdBF.Enabled = true;
                    cmdXG.Enabled = true;
                    cmdCancel.Enabled = true;
                    cmdChecker.Enabled = true; 
                    cmdChecker.Enabled = true;
                    cmdBFChecker.Enabled = true;
                    txtHBarCode.Enabled = false;
                    Sub_LrtextStatus(false);
                    break;
@@ -202,6 +203,7 @@
                    cmdXG.Enabled = false;
                    cmdCancel.Enabled = true;
                    cmdChecker.Enabled = false;
                    cmdBFChecker.Enabled = false;
                    Sub_LrtextStatus(true);
                    break;
                case DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify:
@@ -212,6 +214,7 @@
                    cmdXG.Enabled = false;
                    cmdCancel.Enabled = true;
                    cmdChecker.Enabled = false;
                    cmdBFChecker.Enabled = false;
                    Sub_LrtextStatus(true);
                    break;
            }
@@ -588,9 +591,26 @@
                MessageBox.Show("工作中心没有选择！", "提示");
                return false;
            }
            if (DBUtility.ClsPub.isDoule(txtHQty.Text) + DBUtility.ClsPub.isDoule(txtHWasterQty.Text) <= 0)
            if (DBUtility.ClsPub.isDoule(txtHQty.Text) 
                + DBUtility.ClsPub.isDoule(txtHWasterQty.Text) 
                + DBUtility.ClsPub.isDoule(txtHBadCount.Text)  <= 0)
            {
                MessageBox.Show("数量不能为0！", "提示");
                return false;
            }
            if (DBUtility.ClsPub.isDoule(txtHQty.Text.Trim()) < 0)
            {
                MessageBox.Show("合格个数不能小于0！", "提示");
                return false;
            }
            if (DBUtility.ClsPub.isDoule(txtHWasterQty.Text.Trim()) < 0)
            {
                MessageBox.Show("不合格数不能小于0！", "提示");
                return false;
            }
            if (DBUtility.ClsPub.isDoule(txtHBadCount.Text.Trim()) < 0)
            {
                MessageBox.Show("不良品数不能小于0！", "提示");
                return false;
            }
            if (DBUtility.ClsPub.isDoule(txtHWorkTimes.Text)   <= 0)
@@ -649,6 +669,35 @@
                MessageBox.Show("单据号重复！", "提示");
                return false;
            }

            //根据不同客户，对录入总工时与标准总工时进行对比判断
            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
            long sMaterID = DBUtility.ClsPub.isLong(this.txtHMaterID.Tag);
            long sProcID = DBUtility.ClsPub.isLong(this.txtHProcID.Tag);
            double sQty = DBUtility.ClsPub.isDoule(this.txtHQty.Text);
            double sBadCount = DBUtility.ClsPub.isDoule(this.txtHBadCount.Text);
            double sWasterQty = DBUtility.ClsPub.isDoule(this.txtHWasterQty.Text);
            double sWorkTimes = DBUtility.ClsPub.isSingle(this.txtHWorkTimes.Text);
            DataSet Ds;
            Ds = oCn.RunProcReturn("exec h_p_MES_StationOutBill_WorkTimesCtrl  " + sMaterID.ToString() + "," + sProcID.ToString() + "," + sQty.ToString() + "," + sBadCount.ToString() + "," + sWasterQty.ToString() + "," + sWorkTimes.ToString(), "h_p_MES_StationOutBill_WorkTimesCtrl");
            if (Ds == null || Ds.Tables[0].Rows.Count == 0)
            {
                MessageBox.Show("录入总工时与标准总工时对比判断失败！", "提示");
                return false;
            }
            else
            {
                if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 1)
                {
                    MessageBox.Show(DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]));
                    return false;
                }
                else if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 2)
                {
                    MessageBox.Show(DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]));
                }
            }

            return true;
        }
        //保存单据
@@ -671,8 +720,18 @@
            if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify)
                BillNew.omodel.HInterID = BillOld.omodel.HInterID;
            //主类赋值
            BillNew.omodel.HYear = 2011;
            BillNew.omodel.HPeriod = 1;
            //判断会计期是否合理
            string s = "";
            int sYear = 0;
            int sPeriod = 0;
            if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DBUtility.ClsPub.isDate(this.txtHStationOutTime.Text), ref sYear, ref sPeriod, ref s) == false)
            {
                MessageBox.Show(s, "提示");
                return false;
            } 
            //
            BillNew.omodel.HYear = sYear;
            BillNew.omodel.HPeriod = sPeriod;
            BillNew.omodel.HBillNo = this.txtHBillNo.Text.Trim();
            BillNew.omodel.HICMOBillNo = this.txtHICMOBillNo.Text.Trim();
            BillNew.omodel.HICMOInterID = DBUtility.ClsPub.isLong(this.txtHICMOBillNo.Tag);
@@ -1563,6 +1622,40 @@
            oBF.HMainSourceInterID = BillOld.omodel.HInterID;
            oBF.HProcExchInterID = lngBillKey;
            oBF.HProcExchEntryID = lngBillSubKey;
            oBF.HBillSubType = "不良评审";
            oBF.txtHLotNo.Text = txtHProcExchBillNo.Text;
            oBF.txtHOrderProcNo.Text = txtHOrderProcNO.Text;
            oBF.txtHMaterID.Text = txtHMaterName.Text;
            oBF.txtHMaterNumber.Text = txtHMaterID.Text;
            oBF.txtHModel.Text = txtHMaterModel.Text;
            oBF.txtHMaterID.Tag = txtHMaterID.Tag;
            oBF.txtHProcID.Tag = txtHProcID.Tag;
            oBF.txtHProcID.Text = txtHProcID.Text;
            oBF.txtHWorkCenterID.Text = txtHCenterID.Text;
            oBF.txtHWorkCenterID.Tag = txtHCenterID.Tag;
            oBF.txtHICMOInterID.Text = Pub_Class.ClsPub.isStrNull(txtHICMOBillNo.Tag);
            oBF.txtHICMOBillNo.Text = txtHICMOBillNo.Text;
            oBF.txtHProcExchQty.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHPlanQty.Text));
            oBF.txtHPlanQty.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHBadCount.Text));
            oBF.txtHPlanPNL.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHBadPNL.Text));
            oBF.txtHBadPNL.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHBadPNL.Text));
            oBF.txtHBadQty.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHBadCount.Text));
            oBF.ShowDialog();
            if (oBF.BillChange)
            {
                this.Sub_ShowBill();
            }
        }

        //报废品质确认按钮
        private void cmdBFChecker_Click(object sender, EventArgs e)
        {
            QC_NoPassProdCheckBill oBF = new QC_NoPassProdCheckBill();
            oBF.BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
            oBF.HMainSourceInterID = BillOld.omodel.HInterID;
            oBF.HProcExchInterID = lngBillKey;
            oBF.HProcExchEntryID = lngBillSubKey;
            oBF.HBillSubType = "报废评审";
            oBF.txtHLotNo.Text = txtHProcExchBillNo.Text;
            oBF.txtHOrderProcNo.Text = txtHOrderProcNO.Text;
            oBF.txtHMaterID.Text = txtHMaterName.Text;
@@ -1584,7 +1677,7 @@
            if (oBF.BillChange)
            {
                this.Sub_ShowBill();
            } 
            }
        }

        private void label20_Click(object sender, EventArgs e)