ch
2022-03-10 0e86ae3692dc5e5c1dca33615d76660b589a8fd5
快速生成条码模块
6个文件已修改
662 ■■■■ 已修改文件
WarM/WarM.csproj.user 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WarM/条码打印/Sc_ICMOToBarCode.cs 314 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WarM/条码打印/Sc_ICMOToBarCode.designer.cs 129 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/MateOutController.cs 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/POStockInBillController.cs 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Sc_PckSplitBillController.cs 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WarM/WarM.csproj.user
@@ -9,5 +9,6 @@
    <ErrorReportUrlHistory />
    <FallbackCulture>zh-CN</FallbackCulture>
    <VerifyUploadedFiles>false</VerifyUploadedFiles>
    <ProjectView>ShowAllFiles</ProjectView>
  </PropertyGroup>
</Project>
WarM/ÌõÂë´òÓ¡/Sc_ICMOToBarCode.cs
@@ -37,6 +37,10 @@
        public string sDlgWhere = "";  //外窗体递入
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;
        public Int64 HInterID = 0;
        public const string ModName1 = "3783";
        public Int64 HInterID_TTM = 0;
        public string HBillNo_TTM = "";
        ClsCN SubCn = new ClsCN();
        //
        private void initGrid()
        {
@@ -46,7 +50,6 @@
        private void Display()
        {
            ClsCN SubCn = new ClsCN();
            DataSet DSet;
            string sSql = "";
            string sFastSQL = "";
@@ -90,8 +93,8 @@
            //{
            //    sFastSQL = sFastSQL + " and æ—¥æœŸ<='" + dtpHEndDate.Value.ToShortDateString() + "'";
            //}
            string HEndDate = "";
            HEndDate = dtpHEndDate.Value.ToShortDateString();
            //string HEndDate = "";
            //HEndDate = dtpHEndDate.Value.ToShortDateString();
            //if (sFastSQL.Trim() == "")
            //{
            //    MessageBox.Show("没有输入条件!");
@@ -101,7 +104,7 @@
            //过滤条件
            //
            DSet = SubCn.RunProcReturn("exec h_p_KSTMSC '" + HSeOrderBillNo + "' ,'" + HICMOBillNo + "' , '" + HMaterName + "' , '" + HSourceName + "' ,'" + HEmpName + "' ,'" + HBeginDate + "', '" + HEndDate + "'", "h_p_KSTMSC", ref DBUtility.ClsPub.sExeReturnInfo);
            DSet = SubCn.RunProcReturn("exec h_p_KSTMSC '" + HSeOrderBillNo + "' ,'" + HICMOBillNo + "' , '" + HMaterName + "' , '" + HSourceName + "' ,'" + HEmpName + "' ,'" + HBeginDate + "'", "h_p_KSTMSC", ref DBUtility.ClsPub.sExeReturnInfo);
            //生成首行标题
            if (DSet == null)
            {
@@ -758,6 +761,15 @@
            Display();
        }
        string TTM = "";            //托条码
        string HTTMNumber = "";
        string HICMOBillNo = "";    //生产订单号
        int TLSH = 0;
        string TLSH2 = "";
        string HOrgNumber = "";
        private void button4_Click(object sender, EventArgs e)
        {
            //1.获取界面上面整箱数量框输入的数量 èµ‹å€¼ç»™å˜é‡  å¹¶åˆ·æ–°ç½‘æ ¼
@@ -771,31 +783,38 @@
            }
            Display();
            //2.获取网格选中行物料ID
            int a = grdMain.CurrentRow.Index;
            long HMaterID = 0;
            HMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[a].Cells[Fun_GetCol("HMaterID")].Value);
                if (HMaterID == 0)
                {
                    MessageBox.Show("没有选中任何记录!");
                    return;
                }
            //int a = grdMain.CurrentRow.Index;
            //long HMaterID = 0;
            ////HMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[a].Cells[Fun_GetCol("HMaterID")].Value);
            //    if (HMaterID == 0)
            //    {
            //        MessageBox.Show("没有选中任何记录!");
            //        return;
            //    }
            //3.定义是否组托的变量
            int Mul = 0;
            //4.根据单据类型获取本次条码主内码HInterID
            HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
            //5.从网格第一行循环至最后一行  åˆ¤æ–­I行的物料内码与M是否一致;如果不一致则循环下一行;
            for (int i = 0; i < grdMain.Rows.Count; i++)
            {
                long HGrdMaterID = 0;
                HGrdMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.Rows[i].Index].Cells[Fun_GetCol("HMaterID")].Value);
                if (HMaterID == HGrdMaterID)
                {
                    double HDDQty = 0;
                    HDDQty = DBUtility.ClsPub.isDoule(grdMain.Rows[grdMain.Rows[i].Index].Cells[Fun_GetCol("订单数量")].Value);
                //获取网格里面每一行订单对应的订单数量
                double HDDQty = 0;
                HDDQty = DBUtility.ClsPub.isDoule(grdMain.Rows[grdMain.Rows[i].Index].Cells[Fun_GetCol("订单数量")].Value);
                //获取当前系统登陆组织代码
                HOrgNumber = ClsPub.HOrgNumber;
                //自动匹配逻辑  åˆ¤æ–­è®¢å•数量是否大于整箱数量   å¦‚果订单数量大于整箱数量  ç›´æŽ¥ç”Ÿæˆå”¯ä¸€ç 
                //如果订单数量小于整箱数量  åˆ™å¾ªçŽ¯ç”Ÿæˆå”¯ä¸€ç    ç”Ÿæˆå¯¹åº”的托条码
                    if (HDDQty >= HZXQty)
                    {
                        HBarCodeQty = HZXQty;
                        this.Sub_SaveBill();
                        this.Sub_SaveBill_TTM();
                        Display();
                        Mul = Mul + 1;
                        break;
@@ -804,11 +823,45 @@
                    {
                        HBarCodeQty = HDDQty;
                        HZXQty = HZXQty - HDDQty;
                        this.Sub_SaveBill();
                        this.Sub_SaveBill_TTM();
                        Mul = Mul + 1;
                        continue;
                    }
                }
                //如果Mul>1 æ–°å¢žç»„托单主表
            }
            if (Mul > 1)
            {
                //HICMOBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[Fun_GetCol("生产订单号")].Value);
                DataSet DS1;
                HTTMNumber = HOrgNumber + HICMOBillNo;
                DS1 = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HTTMNumber + "'", "h_p_WMS_GetMaxNo");    //获取最大流水号
                TLSH = ClsPub.isInt(DS1.Tables[0].Rows[0][0]);
                TLSH2 = TLSH.ToString();
                TTM = HTTMNumber + TLSH2;
                HInterID_TTM = DBUtility.ClsPub.CreateBillID_Prod(ModName1, ref DBUtility.ClsPub.sExeReturnInfo);
                HBillNo_TTM = DBUtility.ClsPub.CreateBillCode_Prod(ModName1, ref DBUtility.ClsPub.sExeReturnInfo, true);//得到新单号
                string HDate = "";
                string HYear = "";
                string HPeriod = "";
                string HDay = "";
                HDate = DateTime.Now.ToShortDateString();
                HYear = ClsPub.isDate(HDate).Year.ToString().Substring(2, 2);
                HPeriod = "0" + ClsPub.isDate(HDate).Month.ToString();
                HPeriod = HPeriod.Substring(HPeriod.Length - 2, 2);
                HDay = "0" + ClsPub.isDate(HDate).Day.ToString();
                HDay = HDay.Substring(HDay.Length - 2, 2);
                oCn.RunProc("insert into Sc_PackUnionBillMain (HYear,HPeriod,HBillType,HInterID,HDate" +
                                   ",HBillNo,HBillStatus,HICMOBillNo,HBarCode_Pack,HMaterID,HUnitID,HWeight" +
                                   ",HPWeight,HProdOrgID,HDeptID,HEmpID,HSNum,HPackNum,HBarCode_Cus,HBatchNo " +
                                   ") values ("
                                   + HYear + "," + HPeriod + ",'3783'," + HInterID_TTM + ",'" + HDate + "'"
                                   + ", " + HBillNo_TTM.ToString() + ",1,''," + TTM.ToString() + ",0,0,0"
                                   + ",0,1,0,0,0,0,'','')");
            }
@@ -872,10 +925,10 @@
            string WeiShu = "";         //尾数
            int LSHlen = 6;             //流水号长度
            string TM = "";             //条码
            for (int j = 0; j < grdMain.SelectedRows.Count; j++)
            for (int j = 0; j < grdMain.Rows.Count; j++)
            {
                HMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.SelectedRows[j].Index].Cells[Fun_GetCol("物料代码")].Value);
                HBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.SelectedRows[j].Index].Cells[Fun_GetCol("批次")].Value);
                HMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("物料代码")].Value);
                HBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("批次")].Value);
                HDate = DateTime.Now.ToShortDateString();
                HYear = ClsPub.isDate(HDate).Year.ToString().Substring(2, 2);
                HPeriod = "0" + ClsPub.isDate(HDate).Month.ToString();
@@ -887,7 +940,7 @@
                //HBQty = HBQty + ClsPub.isInt(txtHBQty.Text);
                HZXQty = ClsPub.isDoule(txtHZXQty.Text);
                HDDQty = DBUtility.ClsPub.isDoule(grdMain.Rows[grdMain.SelectedRows[j].Index].Cells[Fun_GetCol("订单数量")].Value);
                HDDQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[Fun_GetCol("订单数量")].Value);
                if (cmbHBarCodeType.Text == "唯一条码")
@@ -954,14 +1007,14 @@
                        HWei = WeiShu;
                        HBarCode = TM;
                        HBarCodeType = ClsPub.isStrNull(cmbHBarCodeType.Text);
                        HMaterID1 = ClsPub.isLong(grdMain.SelectedRows[j].Cells[Fun_GetCol("HMaterID")].Value);
                        HMaterID1 = ClsPub.isLong(grdMain.Rows[j].Cells[Fun_GetCol("HMaterID")].Value);
                        HAuxPropID = 0;
                        HUnitID = 0;
                        HQty2 = HZXQty;
                        HBatchNo2 = ClsPub.isStrNull(grdMain.SelectedRows[j].Cells[Fun_GetCol("批次")].Value);
                        HBatchNo2 = ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("批次")].Value);
                        HSourceInterID = 0;
                        HSourceEntryID = 0;
                        HSourceBillNo = ClsPub.isStrNull(grdMain.SelectedRows[j].Cells[Fun_GetCol("生产订单号")].Value);
                        HSourceBillNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("生产订单号")].Value);
                        HSourceBillType = "3710";
                        HBarcodeQtys = 0;
                        HBarcodeNo = 0;
@@ -970,13 +1023,13 @@
                        HWhID = 0;
                        HSPID = 0;
                        HRemark = "";
                        HMaterName = ClsPub.isStrNull(grdMain.SelectedRows[j].Cells[Fun_GetCol("物料名称")].Value);
                        HMaterModel = ClsPub.isStrNull(grdMain.SelectedRows[j].Cells[Fun_GetCol("规格型号")].Value);
                        HMaterName = ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("物料名称")].Value);
                        HMaterModel = ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("规格型号")].Value);
                        HPinfan = "";
                        HMTONo = "";
                        HCusID = 0;
                        HCusType = "";
                        HEndDate = ClsPub.isDate(grdMain.SelectedRows[j].Cells[Fun_GetCol("日期")].Value);
                        HEndDate = ClsPub.isDate(grdMain.Rows[j].Cells[Fun_GetCol("日期")].Value);
                        HWorkLineName = "";
                        HSeOrderBillNo = "";
                        HInnerBillNo = "";
@@ -1006,6 +1059,178 @@
                        oCn.RollBack();
                        MessageBox.Show("条码生成失败!" + e1.Message);
                    }
            }
        }
        private void Sub_SaveBill_TTM()
        {
            HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
            HInterID_TTM = DBUtility.ClsPub.CreateBillID_Prod(ModName1, ref DBUtility.ClsPub.sExeReturnInfo);
            HBillNo_TTM = DBUtility.ClsPub.CreateBillCode_Prod(ModName1, ref DBUtility.ClsPub.sExeReturnInfo, true);//得到新单号
            string HMaterNumber = "";
            string HBatchNo = "";
            string HDate = "";
            string HYear = "";
            string HPeriod = "";
            string HDay = "";
            string HTMNumber = "";
            string HOrgNumber = "";
            DataSet Ds;
            int LSH = 0;                //流水号
            string LSH2 = "";           //流水号转换成字符
            double HZXQty = 0;         //装箱数量
            double HDDQty = 0;         //订单数量
            double HBQty = 0;         //箱数
            int k = 0;
            int n = 0;                  //同一批生成条码中的第几条
            string WeiShu = "";         //尾数
            int LSHlen = 6;             //流水号长度
            string TM = "";             //条码
            for (int j = 0; j < grdMain.Rows.Count; j++)
            {
                HMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("物料代码")].Value);
                HBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("批次")].Value);
                HDate = DateTime.Now.ToShortDateString();
                HYear = ClsPub.isDate(HDate).Year.ToString().Substring(2, 2);
                HPeriod = "0" + ClsPub.isDate(HDate).Month.ToString();
                HPeriod = HPeriod.Substring(HPeriod.Length - 2, 2);
                HDay = "0" + ClsPub.isDate(HDate).Day.ToString();
                HDay = HDay.Substring(HDay.Length - 2, 2);
                HOrgNumber = ClsPub.HOrgNumber;
                //HBQty = HBQty + ClsPub.isInt(txtHBQty.Text);
                HZXQty = ClsPub.isDoule(txtHZXQty.Text);
                HDDQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[Fun_GetCol("订单数量")].Value);
                HICMOBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("生产订单号")].Value);
                if (cmbHBarCodeType.Text == "唯一条码")
                {
                    HTMNumber = HOrgNumber + HMaterNumber + HYear + HPeriod + HDay;
                    Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HTMNumber + "'", "h_p_WMS_GetMaxNo");    //获取最大流水号
                    LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
                }
                else if (cmbHBarCodeType.Text == "批次条码")
                {
                    TM = HOrgNumber + HMaterNumber + HBatchNo;
                }
                n = 0;
                LSH2 = LSH.ToString();
                while (LSH2.Length < LSHlen)  //如果流水号小于6位数前面补0
                {
                    LSH2 = "0" + LSH2;
                }
                if (cmbHBarCodeType.Text == "唯一条码")
                {
                    //条码编号 = æ¡ç å‰ç¼€ + æµæ°´å·
                    TM = HTMNumber + LSH2;
                }
                if (TM.Trim() == "")
                {
                    MessageBox.Show("条形码不能为空,不能生成条码!");
                    return;
                }
                string HWei = "";      //尾数
                string HBarCode = "";
                string HBarCodeType = "";
                Int64 HMaterID1 = 0;
                Int64 HAuxPropID = 0;
                Int64 HUnitID = 0;
                double HQty2 = 0;
                string HBatchNo2 = "";
                Int64 HSupID = 0;
                Int64 HGroupID = 0;
                int HPrintQty = 0;
                Int64 HSourceInterID = 0;
                Int64 HSourceEntryID = 0;
                string HSourceBillNo = "";
                string HSourceBillType = "";
                Int64 HBarcodeNo = 0;       //托号
                Int64 HBarcodeQtys = 0;     //总托数
                Int64 HDeptID = 0;
                Int64 HWhID = 0;
                Int64 HSPID = 0;
                string HRemark = "";
                string HMaterName = "";
                string HMaterModel = "";
                string HPinfan = "";
                string HMTONo = "";
                Int64 HCusID = 0;
                string HCusType = "";
                DateTime HEndDate;
                string HWorkLineName = "";
                string HSeOrderBillNo = "";
                string HInnerBillNo = "";
                try
                {
                    oCn.BeginTran();
                    HWei = WeiShu;
                    HBarCode = TM;
                    HBarCodeType = ClsPub.isStrNull(cmbHBarCodeType.Text);
                    HMaterID1 = ClsPub.isLong(grdMain.Rows[j].Cells[Fun_GetCol("HMaterID")].Value);
                    HAuxPropID = 0;
                    HUnitID = 0;
                    HQty2 = HZXQty;
                    HBatchNo2 = ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("批次")].Value);
                    HSourceInterID = 0;
                    HSourceEntryID = 0;
                    HSourceBillNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("生产订单号")].Value);
                    HSourceBillType = "3710";
                    HBarcodeQtys = 0;
                    HBarcodeNo = 0;
                    HSupID = 0;
                    HDeptID = 0;
                    HWhID = 0;
                    HSPID = 0;
                    HRemark = "";
                    HMaterName = ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("物料名称")].Value);
                    HMaterModel = ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("规格型号")].Value);
                    HPinfan = "";
                    HMTONo = "";
                    HCusID = 0;
                    HCusType = "";
                    HEndDate = ClsPub.isDate(grdMain.Rows[j].Cells[Fun_GetCol("日期")].Value);
                    HWorkLineName = "";
                    HSeOrderBillNo = "";
                    HInnerBillNo = "";
                    oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
                                        ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
                                        ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
                                        ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
                                        ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
                                        ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID " +
                                        ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
                                        ") values ("
                                        + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID1.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
                                        + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
                                        + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HWei + "'"
                                        + ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
                                        + ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + HDate + "'"
                                        + ", " + ClsPub.HOrgID.ToString() + "," + ClsPub.HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString()
                                        + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "')");
                    oCn.RunProc("insert into Sc_PackUnionBillSub (HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo" +
                                        ",HSourceBillType,HMaterID,HUnitID,HQty,HSourceID,HEquipID,HGroupID" +
                                        ",HWorkerID,HScanDate,HBarCode,HBarCode_Pack,HStatus,HICMOEntryID " +
                                        ") values ("
                                        +  HInterID_TTM + "," + j + ",0,0,''"
                                        + ",'3710'," + HMaterID1.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString() + ",0,0,0"
                                        + ", 0,getdate(),'" + HBarCode + "','" + TTM + "',0,0)");
                    oCn.Commit();
                    MessageBox.Show("条码生成完毕!");
                    //grdSub.RowCount = 0;
                    DisplayTM();
                }
                catch (Exception e1)
                {
                    oCn.RollBack();
                    MessageBox.Show("条码生成失败!" + e1.Message);
                }
            }
        }
@@ -1365,5 +1590,30 @@
            grdSub.DataSource = null;
            grdMain.DataSource = null;
        }
        private void button2_Click(object sender, EventArgs e)
        {
            //获取网格第一行HInterID的值
            Int64 HInterID = 0;
            HInterID = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells[Fun_GetCol("HInterID")].Value);
            DataSet DSBefore;
            DSBefore =  SubCn.RunProcReturn("exec h_p_PreviousMater "+ HInterID, "h_p_PreviousMater", ref DBUtility.ClsPub.sExeReturnInfo);
            grdMain.DataSource = DSBefore.Tables[0].DefaultView;
        }
        private void button3_Click(object sender, EventArgs e)
        {
            //根据
            Int64 HInterID = 0;
            HInterID = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells[Fun_GetCol("HInterID")].Value);
            DataSet DSBefore;
            DSBefore = SubCn.RunProcReturn("exec h_p_NextMater " + HInterID, "h_p_NextMater", ref DBUtility.ClsPub.sExeReturnInfo);
            grdMain.DataSource = DSBefore.Tables[0].DefaultView;
        }
        private void button7_Click(object sender, EventArgs e)
        {
        }
    }
}
WarM/ÌõÂë´òÓ¡/Sc_ICMOToBarCode.designer.cs
@@ -54,11 +54,11 @@
            this.txtHMaterID = new System.Windows.Forms.TextBox();
            this.cmdHMaterID = new System.Windows.Forms.Button();
            this.gbUp = new System.Windows.Forms.GroupBox();
            this.txtHSeOrderBillNo = new System.Windows.Forms.TextBox();
            this.label9 = new System.Windows.Forms.Label();
            this.cmbHBarCodeType = new System.Windows.Forms.ComboBox();
            this.label8 = new System.Windows.Forms.Label();
            this.cmdHSaveBill = new System.Windows.Forms.Button();
            this.dtpHEndDate = new System.Windows.Forms.DateTimePicker();
            this.label5 = new System.Windows.Forms.Label();
            this.dtpHBeginDate = new System.Windows.Forms.DateTimePicker();
            this.label6 = new System.Windows.Forms.Label();
            this.button4 = new System.Windows.Forms.Button();
@@ -87,8 +87,9 @@
            this.tabPage1 = new System.Windows.Forms.TabPage();
            this.tabPage2 = new System.Windows.Forms.TabPage();
            this.grdList = new System.Windows.Forms.DataGridView();
            this.txtHSeOrderBillNo = new System.Windows.Forms.TextBox();
            this.label9 = new System.Windows.Forms.Label();
            this.button2 = new System.Windows.Forms.Button();
            this.button3 = new System.Windows.Forms.Button();
            this.button7 = new System.Windows.Forms.Button();
            this.Tool.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
            this.gbUp.SuspendLayout();
@@ -349,8 +350,6 @@
            this.gbUp.Controls.Add(this.cmbHBarCodeType);
            this.gbUp.Controls.Add(this.label8);
            this.gbUp.Controls.Add(this.cmdHSaveBill);
            this.gbUp.Controls.Add(this.dtpHEndDate);
            this.gbUp.Controls.Add(this.label5);
            this.gbUp.Controls.Add(this.dtpHBeginDate);
            this.gbUp.Controls.Add(this.label6);
            this.gbUp.Controls.Add(this.label4);
@@ -370,6 +369,27 @@
            this.gbUp.TabIndex = 58;
            this.gbUp.TabStop = false;
            // 
            // txtHSeOrderBillNo
            //
            this.txtHSeOrderBillNo.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHSeOrderBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHSeOrderBillNo.Location = new System.Drawing.Point(112, 79);
            this.txtHSeOrderBillNo.Name = "txtHSeOrderBillNo";
            this.txtHSeOrderBillNo.ReadOnly = true;
            this.txtHSeOrderBillNo.Size = new System.Drawing.Size(123, 30);
            this.txtHSeOrderBillNo.TabIndex = 141;
            //
            // label9
            //
            this.label9.AutoSize = true;
            this.label9.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label9.ForeColor = System.Drawing.Color.Black;
            this.label9.Location = new System.Drawing.Point(19, 85);
            this.label9.Name = "label9";
            this.label9.Size = new System.Drawing.Size(88, 16);
            this.label9.TabIndex = 140;
            this.label9.Text = "销售订单号";
            //
            // cmbHBarCodeType
            // 
            this.cmbHBarCodeType.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -377,7 +397,7 @@
            this.cmbHBarCodeType.Items.AddRange(new object[] {
            "唯一条码",
            "批次条码"});
            this.cmbHBarCodeType.Location = new System.Drawing.Point(871, 77);
            this.cmbHBarCodeType.Location = new System.Drawing.Point(642, 79);
            this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(2);
            this.cmbHBarCodeType.Name = "cmbHBarCodeType";
            this.cmbHBarCodeType.Size = new System.Drawing.Size(140, 28);
@@ -388,7 +408,7 @@
            this.label8.AutoSize = true;
            this.label8.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label8.ForeColor = System.Drawing.Color.Black;
            this.label8.Location = new System.Drawing.Point(793, 84);
            this.label8.Location = new System.Drawing.Point(557, 86);
            this.label8.Name = "label8";
            this.label8.Size = new System.Drawing.Size(72, 16);
            this.label8.TabIndex = 138;
@@ -398,7 +418,7 @@
            // 
            this.cmdHSaveBill.BackColor = System.Drawing.Color.White;
            this.cmdHSaveBill.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.cmdHSaveBill.Location = new System.Drawing.Point(1026, 66);
            this.cmdHSaveBill.Location = new System.Drawing.Point(862, 68);
            this.cmdHSaveBill.Margin = new System.Windows.Forms.Padding(2);
            this.cmdHSaveBill.Name = "cmdHSaveBill";
            this.cmdHSaveBill.Size = new System.Drawing.Size(112, 50);
@@ -406,27 +426,6 @@
            this.cmdHSaveBill.Text = "查询";
            this.cmdHSaveBill.UseVisualStyleBackColor = false;
            this.cmdHSaveBill.Click += new System.EventHandler(this.cmdHSaveBill_Click);
            //
            // dtpHEndDate
            //
            this.dtpHEndDate.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.dtpHEndDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
            this.dtpHEndDate.Location = new System.Drawing.Point(602, 76);
            this.dtpHEndDate.Margin = new System.Windows.Forms.Padding(2);
            this.dtpHEndDate.Name = "dtpHEndDate";
            this.dtpHEndDate.Size = new System.Drawing.Size(154, 30);
            this.dtpHEndDate.TabIndex = 102;
            //
            // label5
            //
            this.label5.AutoSize = true;
            this.label5.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label5.ForeColor = System.Drawing.Color.Black;
            this.label5.Location = new System.Drawing.Point(523, 84);
            this.label5.Name = "label5";
            this.label5.Size = new System.Drawing.Size(72, 16);
            this.label5.TabIndex = 101;
            this.label5.Text = "结束日期";
            // 
            // dtpHBeginDate
            // 
@@ -447,13 +446,13 @@
            this.label6.Name = "label6";
            this.label6.Size = new System.Drawing.Size(72, 16);
            this.label6.TabIndex = 99;
            this.label6.Text = "开始日期";
            this.label6.Text = "日    æœŸ";
            // 
            // button4
            // 
            this.button4.BackColor = System.Drawing.Color.White;
            this.button4.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.button4.Location = new System.Drawing.Point(1036, 218);
            this.button4.Location = new System.Drawing.Point(1036, 189);
            this.button4.Margin = new System.Windows.Forms.Padding(2);
            this.button4.Name = "button4";
            this.button4.Size = new System.Drawing.Size(112, 50);
@@ -466,7 +465,7 @@
            // 
            this.button5.BackColor = System.Drawing.Color.White;
            this.button5.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.button5.Location = new System.Drawing.Point(1036, 297);
            this.button5.Location = new System.Drawing.Point(1036, 247);
            this.button5.Margin = new System.Windows.Forms.Padding(2);
            this.button5.Name = "button5";
            this.button5.Size = new System.Drawing.Size(112, 42);
@@ -479,7 +478,7 @@
            // 
            this.button6.BackColor = System.Drawing.Color.White;
            this.button6.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.button6.Location = new System.Drawing.Point(1036, 379);
            this.button6.Location = new System.Drawing.Point(1036, 296);
            this.button6.Margin = new System.Windows.Forms.Padding(2);
            this.button6.Name = "button6";
            this.button6.Size = new System.Drawing.Size(112, 44);
@@ -511,7 +510,7 @@
            // 
            this.label7.AutoSize = true;
            this.label7.Font = new System.Drawing.Font("宋体", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label7.Location = new System.Drawing.Point(877, 349);
            this.label7.Location = new System.Drawing.Point(883, 349);
            this.label7.Name = "label7";
            this.label7.Size = new System.Drawing.Size(174, 27);
            this.label7.TabIndex = 144;
@@ -742,26 +741,44 @@
            this.grdList.Size = new System.Drawing.Size(866, 269);
            this.grdList.TabIndex = 20;
            // 
            // txtHSeOrderBillNo
            // button2
            // 
            this.txtHSeOrderBillNo.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHSeOrderBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHSeOrderBillNo.Location = new System.Drawing.Point(112, 79);
            this.txtHSeOrderBillNo.Name = "txtHSeOrderBillNo";
            this.txtHSeOrderBillNo.ReadOnly = true;
            this.txtHSeOrderBillNo.Size = new System.Drawing.Size(123, 30);
            this.txtHSeOrderBillNo.TabIndex = 141;
            this.button2.BackColor = System.Drawing.Color.White;
            this.button2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.button2.Location = new System.Drawing.Point(900, 436);
            this.button2.Margin = new System.Windows.Forms.Padding(2);
            this.button2.Name = "button2";
            this.button2.Size = new System.Drawing.Size(112, 44);
            this.button2.TabIndex = 150;
            this.button2.Text = "上一个物料";
            this.button2.UseVisualStyleBackColor = false;
            this.button2.Click += new System.EventHandler(this.button2_Click);
            // 
            // label9
            // button3
            // 
            this.label9.AutoSize = true;
            this.label9.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label9.ForeColor = System.Drawing.Color.Black;
            this.label9.Location = new System.Drawing.Point(19, 85);
            this.label9.Name = "label9";
            this.label9.Size = new System.Drawing.Size(88, 16);
            this.label9.TabIndex = 140;
            this.label9.Text = "销售订单号";
            this.button3.BackColor = System.Drawing.Color.White;
            this.button3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.button3.Location = new System.Drawing.Point(1036, 378);
            this.button3.Margin = new System.Windows.Forms.Padding(2);
            this.button3.Name = "button3";
            this.button3.Size = new System.Drawing.Size(112, 44);
            this.button3.TabIndex = 151;
            this.button3.Text = "下一个物料";
            this.button3.UseVisualStyleBackColor = false;
            this.button3.Click += new System.EventHandler(this.button3_Click);
            //
            // button7
            //
            this.button7.BackColor = System.Drawing.Color.White;
            this.button7.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.button7.Location = new System.Drawing.Point(1036, 436);
            this.button7.Margin = new System.Windows.Forms.Padding(2);
            this.button7.Name = "button7";
            this.button7.Size = new System.Drawing.Size(112, 44);
            this.button7.TabIndex = 152;
            this.button7.Text = "超额生产";
            this.button7.UseVisualStyleBackColor = false;
            this.button7.Click += new System.EventHandler(this.button7_Click);
            // 
            // Sc_ICMOToBarCode
            // 
@@ -769,6 +786,9 @@
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.BackColor = System.Drawing.SystemColors.ActiveCaption;
            this.ClientSize = new System.Drawing.Size(1172, 869);
            this.Controls.Add(this.button7);
            this.Controls.Add(this.button3);
            this.Controls.Add(this.button2);
            this.Controls.Add(this.tabControl1);
            this.Controls.Add(this.整箱数量);
            this.Controls.Add(this.txtHZXQty);
@@ -830,8 +850,6 @@
        private System.Windows.Forms.Button cmdHMaterID;
        private System.Windows.Forms.GroupBox gbUp;
        private System.Windows.Forms.Button cmdHSaveBill;
        private System.Windows.Forms.DateTimePicker dtpHEndDate;
        private System.Windows.Forms.Label label5;
        private System.Windows.Forms.DateTimePicker dtpHBeginDate;
        private System.Windows.Forms.Label label6;
        private System.Windows.Forms.Button button4;
@@ -865,5 +883,8 @@
        private System.Windows.Forms.ToolStripButton cz;
        private System.Windows.Forms.TextBox txtHSeOrderBillNo;
        private System.Windows.Forms.Label label9;
        private System.Windows.Forms.Button button2;
        private System.Windows.Forms.Button button3;
        private System.Windows.Forms.Button button7;
    }
}
WebAPI/Controllers/MateOutController.cs
@@ -1052,43 +1052,5 @@
                return objJsonResult;
            }
        }
        //刷新表体  è¿”回条码库存信息
        [Route("KF_ICInventoryByMaterID/GetBillEntry_TmpList_Pack")]
        [HttpGet]
        public object GetBillEntry_TmpList_Pack(string HBarCode, long sHWHID, long sHSPID, long HOWNERID, string sWhere)
        {
            try
            {
                WebS.WebService1 oWebs = new WebS.WebService1();
                ds = oWebs.Get_ICInventoryByMaterIDList(HBarCode, sHWHID, sHSPID, HOWNERID, sWhere);
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录!";
                    objJsonResult.data = null;
                    return objJsonResult;
                    //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功!";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
    }
}
WebAPI/Controllers/POStockInBillController.cs
@@ -114,6 +114,59 @@
            }
           
        }
        /// <summary>
        /// ç”Ÿäº§æ±‡æŠ¥/扫条码/直接调用webservice
        /// </summary>
        /// <returns></returns>
        [Route("ICMOReportBill/get_CheckTypeByBarCode_Json1")]
        [HttpGet]
        public Object get_CheckTypeByBarCode_Json1(string sCode, Int64 sInterID, string sBillType, string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Double sQty, bool sRedBlue, bool SourceFlag, string sSourceBillNo, string sSourceType, Int64 HOWNERID)
        {
            try
            {
                //if (sRedBlue == true)
                //{
                //    HBillType = "1239";
                //}
                //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);
                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 = 1;
                objJsonResult.Message = e.Message + ";" + e.StackTrace;
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        /// <summary>
        /// ä¸€é”®æ‰«ç çº¢å­—
        /// </summary>
@@ -288,9 +341,9 @@
        /// </summary>
        /// <param name="HSourceBillNo"></param>
        /// <returns></returns>
        [Route("ICMOReportBill/set_SaveICMOReportBill")]
        [Route("ICMOReportBill/set_SavePonderationBillMain_Temp_Source_Fast_Json_New")]
        [HttpGet]
        public object set_SaveICMOReportBill(string HSourceBillType, string HSourceBillNo, Int64 sInterID, string sBillNo)
        public object set_SavePonderationBillMain_Temp_Source_Fast_Json_New(string HSourceBillType, string HSourceBillNo, Int64 sInterID, string sBillNo)
        {
            try
            {
@@ -716,7 +769,7 @@
                websLsmain.HInterID = lsmain[0].HInterID;
                websLsmain.HBillNo = lsmain[0].HBillNo;
                websLsmain.HBillType = "1201";//固定值
                websLsmain.HBillType = "3711";//固定值
                websLsmain.HDate = lsmain[0].HDate;
                websLsmain.HDeptID = lsmain[0].HDeptID;
                websLsmain.HEmpID = 0;
@@ -761,7 +814,6 @@
                ds = webserver.GetSPInfoByIDandHWHIDandOrg(HSpID, HWHID, HStockOrgID, ref sErrMsg);
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录!";
WebAPI/Controllers/Sc_PckSplitBillController.cs
@@ -60,9 +60,89 @@
        }
        /// <summary>
        /// è£…箱单扫描托条码/直接调用webservice
        /// </summary>
        /// <returns></returns>
        [Route("PackUnionBill/SetPackBarCode_Webs1")]
        [HttpGet]
        public Object SetPackBarCode_Webs1(Int64 sInterID, string sBillNo, string sBillType, string HTBarCode, string sMaker, Int64 HOWNERID)
        {
            try
            {
                WebS.WebService1 oWebs = new WebS.WebService1();
                WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
                //string sExpressNumber = "";
                WebSoBar = oWebs.get_CheckTypeByPackBarCode_Pack(sInterID, sBillNo, sBillType, HTBarCode, sMaker, 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 = 1;
                objJsonResult.Message = e.Message + ";" + e.StackTrace;
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        [Route("PackSplitBill/GetBillEntry_TmpList_Pack")]
        [HttpGet]
        public object GetBillEntry_TmpList_Pack(Int64 HBillID, string HBillNo, string HBillType)
        {
            try
            {
                WebS.WebService1 oWebs = new WebS.WebService1();
                ds = oWebs.GetBillEntry_TmpList_Pack(HBillID, HBillNo, HBillType, ref DBUtility.ClsPub.sErrInfo);
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录!";
                    objJsonResult.data = null;
                    return objJsonResult;
                    //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功!";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        [Route("PackUnionBill/GetBillEntry_TmpList_Pack1")]
        [HttpGet]
        public object GetBillEntry_TmpList_Pack1(Int64 HBillID, string HBillNo, string HBillType)
        {
            try
            {
@@ -139,6 +219,46 @@
        }
        /// <summary>
        /// æ‹†ç®±å•扫描拆箱条码/直接调用webservice
        /// </summary>
        /// <returns></returns>
        [Route("PackUnionBill/get_CheckTypeByBarCode_Json1")]
        [HttpGet]
        public Object get_CheckTypeByBarCode_Json1(string HBarCode, Int64 sInterID, string HBillType, string sBillNo, string HTBarCode, string sMaker, Int64 HOWNERID)
        {
            try
            {
                WebS.WebService1 oWebs = new WebS.WebService1();
                if (oWebs.get_CheckTypeByBarCode_PackUnion(HBarCode, sInterID, HBillType, sBillNo, HTBarCode, sMaker, HOWNERID, ref DBUtility.ClsPub.sErrInfo))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "扫码成功!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = e.Message + ";" + e.StackTrace;
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        [Route("PackSplit/Delete")]
        [HttpGet]
        public object Delete(long HInterID, string  HBarCode,string HBillType)