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

duhe

2026-04-07 0f5bec6a347f28316ce32be18ca8010cce95720d

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

 WarM/ÌõÂë´òÓ¡/Kf_WeighToBarCode.cs

@@ -1232,29 +1232,29 @@
            HBarCode_Pack = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.SelectedRows[0].Index].Cells[Fun_GetCol("条码编号")].Value);
            cmdHBPack.Enabled = false;

            sBarCodeItemID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.SelectedRows[0].Index].Cells[Fun_GetCol("HItemID")].Value).ToString();
            //自动打印
            //if (chkHDYFlag.Checked == true)
            //sBarCodeItemID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.SelectedRows[0].Index].Cells[Fun_GetCol("HItemID")].Value).ToString();
            ////自动打印
            ////if (chkHDYFlag.Checked == true)
            ////{
            ////    //打印条码
            ////    Sub_SetReport("托盘条码");
            ////    Report.Print(false);
            ////    Thread.Sleep(1000);
            ////}
            ////else
            //{
            //    //打印条码
            //    Sub_SetReport("托盘条码");
            //    Report.Print(false);
            //    Thread.Sleep(1000);
            //    //选择打印模板
            //    BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
            //    oFrm.sBillName = ModName;
            //    oFrm.sBillModel = ModCaption;
            //    oFrm.ShowDialog();
            //    if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
            //    {
            //        Sub_SetReport(oFrm.sOpenTmp);
            //        Report.Print(false);
            //        Thread.Sleep(1000);
            //    }
            //}
            //else
            {
                //选择打印模板
                BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
                oFrm.sBillName = ModName;
                oFrm.sBillModel = ModCaption;
                oFrm.ShowDialog();
                if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
                {
                    Sub_SetReport(oFrm.sOpenTmp);
                    Report.Print(false);
                    Thread.Sleep(1000);
                }
            }
        }

        //条码生成前判断
@@ -1443,8 +1443,8 @@
                " from Gy_BarCodeBill with(nolock) where HInterID=" + HInterID.ToString() + " and HBarCode_Pack='" + HBarCode_Pack + "' and HStopflag=0 and HBarCodeType='唯一条码' "
                );

                //回填条码档案组托标记
                oCn.RunProc("update Gy_BarCodeBill set HPackflag=1 where HInterID=" + HInterID.ToString() + " and HBarCode_Pack='" + HBarCode_Pack + "' and HStopflag=0", ref DBUtility.ClsPub.sExeReturnInfo);
                //回填条码表中对应托条码相关组托标记、组托总数量、组托件数等
                oCn.RunProc("exec h_p_Kf_WeighToBarCode_UpdateBarCode " + HInterID.ToString() + ",'" + HBarCode_Pack + "'");

                MessageBox.Show("生成生产组托单：" + HPUBillNo + " æˆåŠŸï¼", "提示");

@@ -1453,7 +1453,32 @@
                cmdHBPack.Enabled = true;
                HSNo = 0;
                this.lblSNo.Text = "";
                BarCode_Display();
                BarCode_Display_EndPack();

                grdMain.Rows[0].Selected = true;
                sBarCodeItemID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.SelectedRows[0].Index].Cells[Fun_GetCol("HItemID")].Value).ToString();
                //自动打印
                //if (chkHDYFlag.Checked == true)
                //{
                //    //打印条码
                //    Sub_SetReport("托盘条码");
                //    Report.Print(false);
                //    Thread.Sleep(1000);
                //}
                //else
                {
                    //选择打印模板
                    BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
                    oFrm.sBillName = ModName;
                    oFrm.sBillModel = ModCaption;
                    oFrm.ShowDialog();
                    if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
                    {
                        Sub_SetReport(oFrm.sOpenTmp);
                        Report.Print(false);
                        Thread.Sleep(1000);
                    }
                }
                oCn.Commit();
                return;
            }
@@ -1465,6 +1490,19 @@
            }
        }

        //返回称重记录列表信息
        private void BarCode_Display_EndPack()
        {
            DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " order by HEntryID desc,HItemID desc", "h_v_IF_BarCodeBillList", ref DBUtility.ClsPub.sExeReturnInfo);
            grdMain.DataSource = DSet.Tables[0].DefaultView;
            //冻结
            int FrCol = DBUtility.ClsPub.isInt(frmCondition.txtFrozenCol.Text);
            string s = frmCondition.cmbHComplete.Text;
            DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, s, FrCol);
            //画线
            GraphLine();
        }

        #endregion



 WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillController.cs

@@ -794,7 +794,51 @@
        }
        #endregion

        #region æ‰˜æ•°å˜æ›´åŠŸèƒ½
        [Route("Sc_MouldProdMoveBillController/UpdatePallet")]
        [HttpPost]

        public object UpdatePallet([FromBody] JObject data)
        {
            try
            {
                long hmainid = data["hmainid"]?.ToObject<long>() ?? 0;
                int newPallet = data["newPallet"]?.ToObject<int>() ?? 0;
                string operatorName = data["operator"]?.ToString() ?? "";

                if (hmainid <= 0)
                    return new { code = "0", count = 0, Message = "单据ID不能为空！" };

                if (newPallet < 0)
                    return new { code = "0", count = 0, Message = "托数不能为负数！" };



                string updateSql = $@"
                    UPDATE Sc_MouldStockBillMain  
                    SET HPackQtys = {newPallet} 
                    WHERE HInterID = {hmainid}";

                oCn.RunProc(updateSql);

                return new
                {
                    code = "1",
                    count = 1,
                    Message = "托数修改成功！"
                };
            }
            catch (Exception e)
            {
                return new
                {
                    code = "0",
                    count = 0,
                    Message = "修改失败：" + e.Message
                };
            }
        }
        #endregion


    }