雅琪诺MES智能条码管理系统
parent: 8bbdd99a | 补丁 | 提交 | ignore whitespace
ouyangqing
2021-02-21 70c01e521e88f9e097ce6f23d31db78fdfc08cbd 
Merge branch 'master' of http://101.37.171.70:10101/r/YqnMes
6个文件已修改
17956 ■■■■■ 已修改文件
BaseSet/BaseSet.csproj 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
NETSCM/ClsShowMod.cs 17897 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SCM.v12.suo 补丁 | 查看 | 原始文档 | blame | 历史
SCM/单据资料/Sc_ICMOReportToBarCode.cs 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SCM/单据资料/Sc_PackUnionBill.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SCM/条码打印/Gy_BarCodeBill.cs 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 BaseSet/BaseSet.csproj


@@ -318,11 +318,11 @@


    </ProjectReference>



  </ItemGroup>



  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />



  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 


       Other similar extension points exist, see Microsoft.Common.targets.


  <Target Name="BeforeBuild">


  </Target>


  <Target Name="AfterBuild">


  </Target>


  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 


       Other similar extension points exist, see Microsoft.Common.targets.



  <Target Name="BeforeBuild">



  </Target>



  <Target Name="AfterBuild">



  </Target>



  -->



</Project>




 NETSCM/ClsShowMod.cs


Diff too large




 SCM.v12.suo

Binary files differ



 SCM/µ¥¾Ý×ÊÁÏ/Sc_ICMOReportToBarCode.cs


@@ -239,14 +239,14 @@


                txtHUnitName.Text = oTable.Rows[0]["计量单位"].ToString();



                txtHUnitName.Tag = oTable.Rows[0]["HUnitID"].ToString();



                txtHBatchNo.Text = oTable.Rows[0]["批次"].ToString();



                txtHSumQty.Text = DBUtility.ClsPub.isDoule(oTable.Rows[0]["数量"].ToString(), 1);



                txtHSumQty.Text = DBUtility.ClsPub.isDoule(oTable.Rows[0]["数量"].ToString(), 2);



                txtHRelationQty.Text = oTable.Rows[0]["已生成条码数量"].ToString();



                txtHSYQty.Text = oTable.Rows[0]["未生成条码数量"].ToString();



                txtHKSQty.Text = lblHNowQty.Text;



                txtHDQQty.Text = lblHNowQty.Text;



                if (DBUtility.ClsPub.isDoule(txtHDQQty.Text) - DBUtility.ClsPub.isDoule(txtHKSQty.Text) > 0)



                {



                    txtHSJQty.Text = DBUtility.ClsPub.isDoule(DBUtility.ClsPub.isDoule(txtHDQQty.Text) - DBUtility.ClsPub.isDoule(txtHKSQty.Text), 1);



                    txtHSJQty.Text = DBUtility.ClsPub.isDoule(DBUtility.ClsPub.isDoule(txtHDQQty.Text) - DBUtility.ClsPub.isDoule(txtHKSQty.Text), 2);



                }



                else



                {



@@ -296,10 +296,10 @@


            //冻结 



            ClsPub1.DisplayGrid(grdSub, this.Name + "grdSub", s, FrCol);



            /////////////////////////////



            txtHRelationQty.Text = DBUtility.ClsPub.isDoule(DSet.Tables[2].Rows[0]["关联数量"], 1);



            txtHRelationQty.Text = DBUtility.ClsPub.isDoule(DSet.Tables[2].Rows[0]["关联数量"], 2);



            if (DBUtility.ClsPub.isDoule(txtHSumQty.Text) - DBUtility.ClsPub.isDoule(txtHRelationQty.Text) >= 0)



            {



                txtHSYQty.Text = DBUtility.ClsPub.isDoule(DBUtility.ClsPub.isDoule(txtHSumQty.Text) - DBUtility.ClsPub.isDoule(txtHRelationQty.Text), 1);



                txtHSYQty.Text = DBUtility.ClsPub.isDoule(DBUtility.ClsPub.isDoule(txtHSumQty.Text) - DBUtility.ClsPub.isDoule(txtHRelationQty.Text), 2);



            }



            else



            {



@@ -495,7 +495,7 @@


                }



                if (DBUtility.ClsPub.isDoule(txtHDQQty.Text) - DBUtility.ClsPub.isDoule(txtHKSQty.Text) >= 0)



                {



                    txtHSJQty.Text = DBUtility.ClsPub.isDoule(DBUtility.ClsPub.isDoule(txtHDQQty.Text) - DBUtility.ClsPub.isDoule(txtHKSQty.Text), 1); //实际米数= å½“前米数-开始米数



                    txtHSJQty.Text = DBUtility.ClsPub.isDoule(DBUtility.ClsPub.isDoule(txtHDQQty.Text) - DBUtility.ClsPub.isDoule(txtHKSQty.Text), 2); //实际米数= å½“前米数-开始米数



                    lblHRelQty.Text = txtHSJQty.Text;



                }



                else



@@ -503,7 +503,7 @@


                    if (MessageBox.Show("当前米数小于开始米数，是否确定要清零开始米数", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)



                    {



                        txtHKSQty.Text = "0";



                        txtHSJQty.Text = DBUtility.ClsPub.isDoule(DBUtility.ClsPub.isDoule(txtHDQQty.Text), 1); //实际米数= å½“前米数-开始米数



                        txtHSJQty.Text = DBUtility.ClsPub.isDoule(DBUtility.ClsPub.isDoule(txtHDQQty.Text), 2); //实际米数= å½“前米数-开始米数



                        lblHRelQty.Text = txtHSJQty.Text;



                    }



                }



@@ -599,14 +599,14 @@


                {



                    HQty = DBUtility.ClsPub.isDoule(txtHSumQty.Text);



                    HRelQty = DBUtility.ClsPub.isDoule(txtHSJQty.Text);



                    HPrintQty = HRelQty;



                    //HPrintQty = HRelQty;



                    HRelDiffQty = DBUtility.ClsPub.isDoule(txtHSJQty.Text) - DBUtility.ClsPub.isDoule(txtHSumQty.Text);



                }



                else



                {



                    HQty = DBUtility.ClsPub.isDoule(txtHSJQty.Text);



                    HRelQty = DBUtility.ClsPub.isDoule(txtHSJQty.Text);



                    HPrintQty = HRelQty;



                    //HPrintQty = HRelQty;



                    HRelDiffQty = 0;



                }



                //



@@ -711,7 +711,7 @@


                HGBBarCode = "";



                POOrderBillNo = "";



                string sSQLMul = " insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +



                            ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +



                            ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty,HLabelQty" +



                            ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +



                            ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +



                            ",HCusID,HCusType,HEndDate,HWorkLineName,HJiaYe " +



@@ -722,7 +722,7 @@


                            ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HBadReasonList,HProdLev " +



                            ") values ("



                            + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()



                            + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HRelDiffQty.ToString()



                            + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HRelDiffQty.ToString() + "," + HRelQty.ToString()



                            + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillTypeID + "','" + HWei + "'"



                            + ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"



                            + ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + HJiaYe2 + "'"



@@ -820,10 +820,18 @@


                Report.FieldByName("物料名称").AsString = ClsPub.isStrNull(txtHMaterName.Text);



                Report.FieldByName("规格型号").AsString = ClsPub.isStrNull(txtHMaterModel.Text);



                Report.FieldByName("条码编号").AsString = HBarCode;



                Report.FieldByName("数量").AsString = ClsPub.isStrNull(txtHSJQty.Text);



                //获取数量； é”€å”®è£åˆ‡æ•°é‡ä¸ºè®¢å•æ•°é‡å³æºå•æ•°é‡ï¼›  


                if (HSourceBillType == "生产订单") //销售裁切



                {



                    Report.FieldByName("数量").AsString = ClsPub.isStrNull(txtHSumQty.Text);



                }



                else



                {



                    Report.FieldByName("数量").AsString = ClsPub.isStrNull(txtHSJQty.Text);



                }



                Report.FieldByName("实际数量").AsString = ClsPub.isStrNull(txtHSJQty.Text);



                Report.FieldByName("班组").AsString = ClsPub.isStrNull(txtHGroupID.Text);



                Report.FieldByName("组员").AsString = ClsPub.isStrNull(txtHEmpID.Text) + ";" + ClsPub.isStrNull(txtHEmpID2.Text) + ";" + ClsPub.isStrNull(txtHEmpID3.Text);



                Report.FieldByName("数量").AsString = ClsPub.isStrNull(txtHSJQty.Text);



                Report.FieldByName("旧物料编码").AsString = ClsPub.isStrNull(txtHOldMaterNumber.Text);



                //Report.FieldByName("源单单号").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HSourceBillNoCol].Value);



                //Report.FieldByName("销售订单号").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HSeOrderBillNo2Col].Value);



@@ -1238,19 +1246,19 @@


            }



            else



            {



                newStr = DBUtility.ClsPub.isDoule(NewQty, 1);



                newStr = DBUtility.ClsPub.isDoule(NewQty, 2);



            }



            //



            lblHNowQty.Text = newStr;  //当前米数  æ ‡ç­¾



            txtHDQQty.Text = newStr; //当前数量  æ–‡æœ¬



            if (DBUtility.ClsPub.isDoule(txtHDQQty.Text) - DBUtility.ClsPub.isDoule(txtHKSQty.Text) > 0)



            {



                txtHSJQty.Text = DBUtility.ClsPub.isDoule(DBUtility.ClsPub.isDoule(txtHDQQty.Text) - DBUtility.ClsPub.isDoule(txtHKSQty.Text), 1); //实际米数= å½“前米数-开始米数



                txtHSJQty.Text = DBUtility.ClsPub.isDoule(DBUtility.ClsPub.isDoule(txtHDQQty.Text) - DBUtility.ClsPub.isDoule(txtHKSQty.Text), 2); //实际米数= å½“前米数-开始米数



                lblHRelQty.Text = txtHSJQty.Text;



            }



            else



            {



                txtHSJQty.Text = DBUtility.ClsPub.isDoule(DBUtility.ClsPub.isDoule(txtHDQQty.Text), 1); //实际米数= å½“前米数-开始米数



                txtHSJQty.Text = DBUtility.ClsPub.isDoule(DBUtility.ClsPub.isDoule(txtHDQQty.Text), 2); //实际米数= å½“前米数-开始米数



                lblHRelQty.Text = txtHSJQty.Text;



            }



        }



@@ -1580,7 +1588,7 @@


        private void cmdZero_Click(object sender, EventArgs e)



        {



            txtHKSQty.Text = "0";



            txtHSJQty.Text = DBUtility.ClsPub.isDoule(DBUtility.ClsPub.isDoule(txtHDQQty.Text) - DBUtility.ClsPub.isDoule(txtHKSQty.Text), 1);



            txtHSJQty.Text = DBUtility.ClsPub.isDoule(DBUtility.ClsPub.isDoule(txtHDQQty.Text) - DBUtility.ClsPub.isDoule(txtHKSQty.Text), 2);







        }









 SCM/µ¥¾Ý×ÊÁÏ/Sc_PackUnionBill.cs


@@ -401,7 +401,11 @@


                DisBillEntryList_Webs();


                //DisplaySub();  


                //根据界面选择打印模板，打印条形码


                Sub_SetReport(cmbDYMB.Text);


                //根据销售订单的客户，找到对应的打印模板；


                string HLogoName = "";




                //


                Sub_SetReport(cmbDYMB.Text + HLogoName);


                Report.PrintPreview(false);


                Thread.Sleep(500);


                cmdHSaveBill.Enabled = false;




 SCM/ÌõÂë´òÓ¡/Gy_BarCodeBill.cs


@@ -213,6 +213,7 @@


            cmbSourceBillType.Items.Add("生产订单");


            cmbSourceBillType.Items.Add("采购订单");


            cmbSourceBillType.Items.Add("收料通知单");


            cmbSourceBillType.Items.Add("生产汇报单");


            //cmbSourceBillType.Items.Add("委外订单");


            cmbSourceBillType.SelectedIndex = 0;


            //