From 35fac8d74d298c51f9c22596ebcc51e2943b3f28 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 31 十二月 2024 15:07:16 +0800
Subject: [PATCH] 增加条码类型实体
---
Tiger.Business.MES/BIZ/BIZ_MES_WO.cs | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
index 11911d5..75a63f5 100644
--- a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
+++ b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
@@ -291,9 +291,14 @@
_woBatch.ACT_LINE = input.ActLine;
_woBatch.CHANGE_USER = input.UserId;
_woBatch.CHANGE_TIME = DateTime.Now;
+ _wo.STATUS = BIZ_MES_WO.STATUSs.Release.GetValue();
}
- if (!Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(x => x.ORDER_NO == input.WorkOrder && x.STATUS> BIZ_MES_WO_BATCH.STATUSs.Init.GetValue()).Any()) {
- _wo.STATUS = BIZ_MES_WO.STATUSs.Init.GetValue();
+ else
+ {
+ if (input.Status == BIZ_MES_WO_BATCH.STATUSs.Init.GetValue() && !Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(x => x.ORDER_NO == input.WorkOrder && x.BATCH_NO != input.WoBatch && x.STATUS > BIZ_MES_WO_BATCH.STATUSs.Init.GetValue()).Any())
+ {
+ _wo.STATUS = BIZ_MES_WO.STATUSs.Init.GetValue();
+ }
}
}
else
@@ -315,7 +320,7 @@
{
db.Updateable(_woBatch, input.UserId).UpdateColumns(x => new { x.STATUS, x.UPDATE_USER, x.UPDATE_TIME, x.CHANGE_USER, x.CHANGE_TIME }).ExecuteCommand();
}
- if (!_wo.IsNullOrEmpty() && _wo.STATUS == BIZ_MES_WO.STATUSs.Init.GetValue())
+ if (!_wo.IsNullOrEmpty())
{
db.Updateable(_wo, input.UserId).UpdateColumns(x => new { x.STATUS, x.UPDATE_USER, x.UPDATE_TIME }).ExecuteCommand();
}
@@ -637,12 +642,12 @@
result.Data = ship.BusinessDate.Date == DateTime.Now.Date ? new()
{
ShipDoc = ship.ShipDoc,
- ShippingQty = ship.ShipQty,
+ ShippingQty = ship.ShipQty.ToDouble(),
Tag = "Customer"
} : new()
{
ShipDoc = ship.ShipDoc,
- ShippingQty = ship.ShipQty,
+ ShippingQty = ship.ShipQty.ToDouble(),
Tag = "InStoreLabel"
};
result.LocaleMsg = new($"鍑鸿揣淇℃伅瀛樺湪锛�");
--
Gitblit v1.9.3