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 /// [SugarColumn(ColumnName="equip_type" )] public string equip_type { get; set; } + + /// + /// 料秤类型编号 + /// + [SugarColumn(ColumnName="scaleNum" )] + public string scaleNum { get; set; } + /// /// 物料条码 /// 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);