From 7aa3c17413fa2435a56af3c0a4396a09b5a0f4b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=AF=E9=BE=99=20=E6=9B=B9?= <1805857645@QQ.com> Date: Thu, 25 Dec 2025 13:14:41 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=E4=BF=AE=E6=94=B9=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=92=8C=E5=BC=80=E5=A7=8B=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E8=AE=A1=E6=95=B0=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shangjian/XGL.Data/DBService/FormingMachineService.cs | 6 +++--- shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/shangjian/XGL.Data/DBService/FormingMachineService.cs b/shangjian/XGL.Data/DBService/FormingMachineService.cs index 7a41dab..428229e 100644 --- a/shangjian/XGL.Data/DBService/FormingMachineService.cs +++ b/shangjian/XGL.Data/DBService/FormingMachineService.cs @@ -1743,7 +1743,7 @@ where machine_code = 'X1' and bind_status = '0' order by update_time DESC"; public bool UpdateProWorkBatchInWork(string lineCode, string batchCode, string workorderCode, string productCode, string productName, string productdescen, string boxType, string packType, string umrez, string status, string productDate,int inum) { - string sql = $@"update pro_workbatch_inwork set workorder_code='{workorderCode}',batch='{batchCode}',product_code='{productCode}',status='{status}',product_name='{productName}',product_name_en='{productdescen}',box_type='{boxType}',pack_type='{packType}',umrez='{umrez}',product_date='{productDate}',inum='{inum}' where line_code='{lineCode}' "; + string sql = $@"update pro_workbatch_inwork set workorder_code='{workorderCode}',batch='{batchCode}',product_code='{productCode}',status='{status}',product_name='{productName}',product_name_en='{productdescen}',box_type='{boxType}',pack_type='{packType}',umrez='{umrez}',product_date='{productDate}',inum={inum} where line_code='{lineCode}' "; LogHelper.instance.log.Info($"sql:" + sql); return Utils.netClientDBHelper.executeUpdate(sql) > 0; } @@ -1795,9 +1795,9 @@ where machine_code = 'X1' and bind_status = '0' order by update_time DESC"; return Utils.netClientDBHelper.executeUpdate(sql) > 0; } - public bool UpdateProWorkBatchInWorkBatchCode(string lineCode, string batchCode, string status, string productCode, string productName) + public bool UpdateProWorkBatchInWorkBatchCode(string lineCode, string batchCode, string status, string productCode, string productName,int inum) { - string sql = $@"update pro_workbatch_inwork set batch='{batchCode}',product_code='{productCode}',product_name='{productName}',status='{status}' where line_code='{lineCode}' "; + string sql = $@"update pro_workbatch_inwork set batch='{batchCode}',product_code='{productCode}',product_name='{productName}',status='{status}',inum={inum} where line_code='{lineCode}' "; return Utils.netClientDBHelper.executeUpdate(sql) > 0; } diff --git a/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs b/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs index 02db287..aab58be 100644 --- a/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs +++ b/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs @@ -803,12 +803,11 @@ namespace XGLFinishPro.Views _dic.TryGetValue(deviceCode, out var boxType); string umrez = dtBaseProduct.Rows[0]["umrez"].ToString(); string packType = dtBaseProductAtt.Rows[0]["pack_type"].ToString(); - int inum = 1; if (type == 0) { batchCode = ""; LogHelper.instance.log.Info($"开始工单:" + lineCode + "," + batchCode + "," + workorderCode + "," + productCode + "," + productName + "," + productdescen + "," + boxType + "," + packType + "," + umrez + "," + status + "," + LoginUser.WorkDate); - if (!formingMachineService.UpdateProWorkBatchInWork(lineCode, batchCode, workorderCode, productCode, productName, productdescen, boxType, packType, umrez, status, LoginUser.WorkDate, inum)) + if (!formingMachineService.UpdateProWorkBatchInWork(lineCode, batchCode, workorderCode, productCode, productName, productdescen, boxType, packType, umrez, status, LoginUser.WorkDate, 1)) { CustomMessageBox.Show("更新打印机表状态失败！", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning); LogHelper.instance.log.Info($"更新打印机表状态失败:" + CustomMessageBoxButton.OK +";"+ CustomMessageBoxIcon.Warning); @@ -817,7 +816,7 @@ namespace XGLFinishPro.Views } else if (type == 1) { - if (!formingMachineService.UpdateProWorkBatchInWorkBatchCode(lineCode, batchCode, status, productCode, productName)) + if (!formingMachineService.UpdateProWorkBatchInWorkBatchCode(lineCode, batchCode, status, productCode, productName,1)) { CustomMessageBox.Show("更新打印机表状态失败！", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning); LogHelper.instance.log.Info($"更新打印机表状态失败:" + CustomMessageBoxButton.OK + ";" + CustomMessageBoxIcon.Warning);