From f03b5c7ea42074b0aa6f6836301f20deefb64813 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期一, 03 六月 2024 11:42:47 +0800
Subject: [PATCH] 1
---
HTML_09/views/SystemSettings/PrintModule.html | 3 ++-
HTML_09/views/SystemSettings/PrintSetting.html | 1 +
Wms_09/WMS.BLL/SysServer/PrintTemplateServer.cs | 8 ++++++++
3 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/HTML_09/views/SystemSettings/PrintModule.html b/HTML_09/views/SystemSettings/PrintModule.html
index c14ca7a..7b9f477 100644
--- a/HTML_09/views/SystemSettings/PrintModule.html
+++ b/HTML_09/views/SystemSettings/PrintModule.html
@@ -95,6 +95,7 @@
// Standard:'xxxxxx',
// LotNo:'20230801'
// }];
+ debugger;
var printData = deepClone(parent.printData);
var configPrintJson;
@@ -105,7 +106,7 @@
providers: [new configElementTypeProvider()]
});
//璁剧疆宸︿晶鎷栨嫿浜嬩欢
- hiprint.PrintElementTypeManager.build('.hiprintEpContainer','testModule');
+ hiprint.PrintElementTypeManager.build('.hiprintEpContainer', 'testModule');
var hiprintTemplate;
// var JsonData = JSON.parse('{"panels":[{"index":0,"height":50,"width":50,"paperHeader":0,"paperFooter":141.73228346456693,"printElements":[{"tid":"configModule.SkuName","options":{"left":9,"top":12,"height":9.75,"width":120}},{"tid":"configModule.SkuNo","options":{"left":9,"top":37.5,"height":78,"width":120,"textType":"qrcode"}}],"paperNumberLeft":178.5,"paperNumberTop":123}]}')
diff --git a/HTML_09/views/SystemSettings/PrintSetting.html b/HTML_09/views/SystemSettings/PrintSetting.html
index 79dc0fa..c6ad4b9 100644
--- a/HTML_09/views/SystemSettings/PrintSetting.html
+++ b/HTML_09/views/SystemSettings/PrintSetting.html
@@ -360,6 +360,7 @@
content: '/views/SystemSettings/PrintModule.html',
maxmin: true,
area: ['100%', '100%'],
+ data: printData,
end: function () {
}
diff --git a/Wms_09/WMS.BLL/SysServer/PrintTemplateServer.cs b/Wms_09/WMS.BLL/SysServer/PrintTemplateServer.cs
index a69b49b..7cf7f17 100644
--- a/Wms_09/WMS.BLL/SysServer/PrintTemplateServer.cs
+++ b/Wms_09/WMS.BLL/SysServer/PrintTemplateServer.cs
@@ -29,6 +29,10 @@
/// <exception cref="NotImplementedException"></exception>
public async Task AddPrintTemplate(SysPrintTemplate model, int userid)
{
+ if (model.Status == "1")
+ {
+ await Db.Updateable<SysPrintTemplate>().SetColumns(s => s.Status == "0").Where(s => s.Type == model.Type && model.Status == "1").ExecuteCommandAsync();
+ }
model.CreateTime = DateTime.Now;
model.CreateUser = userid;
await Db.Insertable(model).ExecuteCommandAsync();
@@ -51,6 +55,10 @@
/// <exception cref="NotImplementedException"></exception>
public async Task EditPrintTemplate(SysPrintTemplate model, int userid)
{
+ if (model.Status == "1")
+ {
+ await Db.Updateable<SysPrintTemplate>().SetColumns(s => s.Status == "0").Where(s => s.Type == model.Type && model.Status == "1").ExecuteCommandAsync();
+ }
model.UpdateTime = DateTime.Now;
model.UpdateUser = userid;
await Db.Updateable(model).UpdateColumns(it => new { it.Name, it.Type, it.Status, it.PositionJson, it.UpdateTime, it.UpdateUser }).ExecuteCommandAsync();
--
Gitblit v1.8.0