From 43b290f4f2a9de56280650f28abcdb73de60300e Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 1 Mar 2024 17:03:34 +0800
Subject: [PATCH] =?UTF-8?q?2024-03-01=20=E7=89=A9=E6=96=99=EF=BC=8Cbom?=
 =?UTF-8?q?=EF=BC=8Crouting=E4=BF=AE=E6=94=B92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/MasterPartInformationServiceImpl.java       |  7 ++++---
 .../service/impl/PartInformationServiceImpl.java     | 12 ++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/spring/modules/part/service/impl/MasterPartInformationServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/MasterPartInformationServiceImpl.java
index 07ee0914..d3e993c4 100644
--- a/src/main/java/com/spring/modules/part/service/impl/MasterPartInformationServiceImpl.java
+++ b/src/main/java/com/spring/modules/part/service/impl/MasterPartInformationServiceImpl.java
@@ -74,9 +74,9 @@ public class MasterPartInformationServiceImpl extends ServiceImpl<MasterPartInfo
         partIfsCatalog.setUomForWeightNet(data.getUomForWeightNet() == null ? "" : data.getUomForWeightNet()); // 净重单位
         partIfsCatalog.setVolumeNet(data.getVolumeNet() == null ? "" : data.getVolumeNet().toString()); // 体积
         partIfsCatalog.setUomForVolumeNet(data.getUomForVolumeNet() == null ? "" : data.getUomForVolumeNet()); // 体积单位
-        partIfsCatalog.setConditionCodeUsageDb(data.getConditionCodeUsageDb() == null ? "" : data.getConditionCodeUsageDb()); // 允许条件代码
-        partIfsCatalog.setMultilevelTrackingDb(data.getMultilevelTrackingDb() == null ? "" : data.getMultilevelTrackingDb()); // 多级跟踪
-        partIfsCatalog.setAllowAsNotConsumedDb(data.getAllowAsNotConsumedDb() == null ? "" : data.getAllowAsNotConsumedDb()); // 允许为未使用
+        partIfsCatalog.setConditionCodeUsageDb("Y".equals(data.getConditionCodeUsageDb()) ? "ALLOW_COND_CODE" : "NOT_ALLOW_COND_CODE"); // 允许条件代码
+        partIfsCatalog.setMultilevelTrackingDb("Y".equals(data.getMultilevelTrackingDb()) ? "TRACKING_ON" : "TRACKING_OFF"); // 多级跟踪
+        partIfsCatalog.setAllowAsNotConsumedDb("Y".equals(data.getAllowAsNotConsumedDb()) ? "TRUE" : "FALSE"); // 允许为未使用
         partIfsCatalog.setLotTrackingCode(data.getLotTrackingCode() == null ? "" : data.getLotTrackingCode()); // 批号跟踪
         partIfsCatalog.setLotQuantityRule(data.getLotQuantityRule() == null ? "" : data.getLotQuantityRule()); // 批量规则
         partIfsCatalog.setSubLotRule(data.getSubLotRule() == null ? "" : data.getSubLotRule()); // 子批次规则
@@ -147,6 +147,7 @@ public class MasterPartInformationServiceImpl extends ServiceImpl<MasterPartInfo
      * @param data
      */
     @Override
+    @Transactional
     public void masterPartInformationSave (MasterPartInformationVo data) {
         // 调用存储过程校验参数
         Map<String, Object> resultMap = this.checkSavePart(data);
diff --git a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
index c8a8a907..42f7408a 100644
--- a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
+++ b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
@@ -88,9 +88,9 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         partIfsCatalog.setUomForWeightNet(data.getUomForWeightNet() == null ? "" : data.getUomForWeightNet()); // 净重单位
         partIfsCatalog.setVolumeNet(data.getVolumeNet() == null ? "" : data.getVolumeNet().toString()); // 体积
         partIfsCatalog.setUomForVolumeNet(data.getUomForVolumeNet() == null ? "" : data.getUomForVolumeNet()); // 体积单位
-        partIfsCatalog.setConditionCodeUsageDb(data.getConditionCodeUsageDb() == null ? "" : data.getConditionCodeUsageDb()); // 允许条件代码
-        partIfsCatalog.setMultilevelTrackingDb(data.getMultilevelTrackingDb() == null ? "" : data.getMultilevelTrackingDb()); // 多级跟踪
-        partIfsCatalog.setAllowAsNotConsumedDb(data.getAllowAsNotConsumedDb() == null ? "" : data.getAllowAsNotConsumedDb()); // 允许为未使用
+        partIfsCatalog.setConditionCodeUsageDb("Y".equals(data.getConditionCodeUsageDb()) ? "ALLOW_COND_CODE" : "NOT_ALLOW_COND_CODE"); // 允许条件代码
+        partIfsCatalog.setMultilevelTrackingDb("Y".equals(data.getMultilevelTrackingDb()) ? "TRACKING_ON" : "TRACKING_OFF"); // 多级跟踪
+        partIfsCatalog.setAllowAsNotConsumedDb("Y".equals(data.getAllowAsNotConsumedDb()) ? "TRUE" : "FALSE"); // 允许为未使用
         partIfsCatalog.setLotTrackingCode(data.getLotTrackingCode() == null ? "" : data.getLotTrackingCode()); // 批号跟踪
         partIfsCatalog.setLotQuantityRule(data.getLotQuantityRule() == null ? "" : data.getLotQuantityRule()); // 批量规则
         partIfsCatalog.setSubLotRule(data.getSubLotRule() == null ? "" : data.getSubLotRule()); // 子批次规则
@@ -173,9 +173,9 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         partIfsInventoryManufacture.setIssueType(data.getIssueType() == null ? "" : data.getIssueType()); // 预留/下发方法
         partIfsInventoryManufacture.setOverReporting(data.getOverReporting() == null ? "" : data.getOverReporting()); // 过度报告
         partIfsInventoryManufacture.setOverReportTolerance(data.getOverReportTolerance() == null ? "" : data.getOverReportTolerance().toString()); // 报告公差过大
-        partIfsInventoryManufacture.setByProdAsSupplyInMrpDb(data.getByProdAsSupplyInMrpDb() == null ? "" : data.getByProdAsSupplyInMrpDb()); // 将副产品用作MRP中的供应
-        partIfsInventoryManufacture.setMrpControlFlagDb(data.getMrpControlFlagDb() == null ? "" : data.getMrpControlFlagDb()); // MRP控制
-        partIfsInventoryManufacture.setUseTheoriticalDensityDb(data.getUseTheoreticalDensityDb() == null ? "" : data.getUseTheoreticalDensityDb()); // 使用理论
+        partIfsInventoryManufacture.setByProdAsSupplyInMrpDb("Y".equals(data.getByProdAsSupplyInMrpDb()) ? "TRUE" : "FALSE"); // 将副产品用作MRP中的供应
+        partIfsInventoryManufacture.setMrpControlFlagDb("Y".equals(data.getMrpControlFlagDb()) ? "TRUE" : "FALSE"); // MRP控制
+        partIfsInventoryManufacture.setUseTheoriticalDensityDb("Y".equals(data.getUseTheoreticalDensityDb()) ? "TRUE" : "FALSE"); // 使用理论
         partIfsInventoryManufacture.setDensity(data.getDensity() == null ? "" : data.getDensity().toString()); // 密度
         return partIfsInventoryManufacture;
     }