From 6e383fa45866a8cfea0f13a68906ada06d9ff66c Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Sun, 7 Apr 2024 15:14:37 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E6=8A=95=E6=96=99=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SlnMesnac.Model/domain/RecordMaterialInput.cs         |  7 +++++++
 .../service/Impl/InputRecordServiceImpl.cs            | 11 +++++++----
 SlnMesnac/Controllers/CwssIngCheckController.cs       |  2 ++
 SlnMesnac/Controllers/McsIngCheckController.cs        |  2 ++
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/SlnMesnac.Model/domain/RecordMaterialInput.cs b/SlnMesnac.Model/domain/RecordMaterialInput.cs
index e5c16f0..9ad5a1a 100644
--- a/SlnMesnac.Model/domain/RecordMaterialInput.cs
+++ b/SlnMesnac.Model/domain/RecordMaterialInput.cs
@@ -27,6 +27,13 @@ namespace SlnMesnac.Model.domain
         ///</summary>
          [SugarColumn(ColumnName="equip_type"    )]
          public string equip_type { get; set; }
+        
+        /// <summary>
+        /// 料秤类型编号
+        /// </summary>
+         [SugarColumn(ColumnName="scaleNum"    )]
+         public string scaleNum { get; set; }
+        
         /// <summary>
         /// 物料条码 
         ///</summary>
diff --git a/SlnMesnac.Repository/service/Impl/InputRecordServiceImpl.cs b/SlnMesnac.Repository/service/Impl/InputRecordServiceImpl.cs
index f29538f..c52175b 100644
--- a/SlnMesnac.Repository/service/Impl/InputRecordServiceImpl.cs
+++ b/SlnMesnac.Repository/service/Impl/InputRecordServiceImpl.cs
@@ -127,11 +127,13 @@ namespace SlnMesnac.Repository.service.Impl
                     };*/
                     recordMaterialInput = new RecordMaterialInput()
                     {
-                        equip_id = mcsInputRecord.EquipId.ToString(),
+                        equip_id = mcsInputRecord.EquipId.ToString() == "0" ? "1" :mcsInputRecord.EquipId.ToString(),
                         can_number = mcsInputRecord.CanNumber,
                         equip_type = "mcs",
+                        scaleNum = "101",
+                        material_barcode = mcsInputRecord.MaterialBarcode,
                         input_quantity = mcsInputRecord.InputQuantity,
-                        input_weight = mcsInputRecord.InputQuantity,
+                        input_weight = Convert.ToDecimal(mcsInputRecord.InputWeight),
                         is_remainder = mcsInputRecord.IsRemainder,
                         remainder_quantity = mcsInputRecord.RemainderQuantity,
                         remainder_weight = Convert.ToDecimal(mcsInputRecord.RemainderWeight),
@@ -156,11 +158,12 @@ namespace SlnMesnac.Repository.service.Impl
                     };*/
                     recordMaterialInput = new RecordMaterialInput()
                     {
-                        equip_id = cwssInputRecord.EquipId.ToString(),
+                        equip_id = cwssInputRecord.EquipId.ToString() == "0" ? "1" :cwssInputRecord.EquipId.ToString(),
                         can_number = cwssInputRecord.CanNumber,
                         equip_type = "cwss",
+                        material_barcode = cwssInputRecord.MaterialBarcode,
                         input_quantity = cwssInputRecord.InputQuantity,
-                        input_weight = cwssInputRecord.InputQuantity,
+                        input_weight = Convert.ToDecimal(cwssInputRecord.InputWeight),
                         is_remainder = cwssInputRecord.IsRemainder,
                         remainder_quantity = cwssInputRecord.RemainderQuantity,
                         remainder_weight = Convert.ToDecimal(cwssInputRecord.RemainderWeight),
diff --git a/SlnMesnac/Controllers/CwssIngCheckController.cs b/SlnMesnac/Controllers/CwssIngCheckController.cs
index b1ccfdc..b78bfc4 100644
--- a/SlnMesnac/Controllers/CwssIngCheckController.cs
+++ b/SlnMesnac/Controllers/CwssIngCheckController.cs
@@ -142,6 +142,8 @@ public class CwssIngCheckController
                     }
                 }
                 //保存数据
+                ingredientInfo.EquipId = Convert.ToInt32(cwssInfo.EquipCode);
+                ingredientInfo.CanNumber = cwssInfo.BinSerial.ToString();
                 SaveInputRecord(ingredientInfo, 1, "");
             } while (false);
             
diff --git a/SlnMesnac/Controllers/McsIngCheckController.cs b/SlnMesnac/Controllers/McsIngCheckController.cs
index a836e33..428d0a1 100644
--- a/SlnMesnac/Controllers/McsIngCheckController.cs
+++ b/SlnMesnac/Controllers/McsIngCheckController.cs
@@ -154,6 +154,8 @@ public class McsIngCheckController
                 }
                         
                 //保存数据
+                ingredientInfo.EquipId = mcsInfo.EquipId;
+                ingredientInfo.CanNumber = mcsInfo.BinNo.ToString();
                 SaveInputRecord(ingredientInfo, 1, "");
             } while (false);