Merge remote-tracking branch 'origin/master'

src/main/java/com/spring/modules/Tooling/service/impl/ProjectToolingApplyServiceImpl.java

@@ -121,11 +121,10 @@ public class ProjectToolingApplyServiceImpl implements ProjectToolingApplyServic
     @Override
     @Transactional
     public String saveProjectToolApply(ProjectToolApplyDaTa inData){
-
         List<RoutingToolApplyData> detailList=inData.getDetailList();
         //生成新单据
-        String newApplyNo=  transNoControlService.transNo(inData.getSite(),"tool_apply_no");
-        PlmProjectToolApplyHeader applyHeader=new PlmProjectToolApplyHeader();
+        String newApplyNo = transNoControlService.transNo(inData.getSite(),"tool_apply_no");
+        PlmProjectToolApplyHeader applyHeader = new PlmProjectToolApplyHeader();
         applyHeader.setSite(inData.getSite());
         applyHeader.setApplyNo(newApplyNo);
         applyHeader.setApplyBy(inData.getApplyBy());
@@ -172,8 +171,8 @@ public class ProjectToolingApplyServiceImpl implements ProjectToolingApplyServic
         PartSubPropertiesValueData propertiesData = new PartSubPropertiesValueData();
         propertiesData.setSite(inData.getSite());
         propertiesData.setPartNo(newApplyNo);
-        propertiesData.setCodeNo("ToolApply");
-        propertiesData.setRecordType("order");
+        propertiesData.setCodeNo("toolApply");
+        propertiesData.setRecordType("TL_Receipt"); // 2025-05-28 刀具的基本信息保存后不自动带出，需要刷新模版 改成'TL_Receipt' 之前是'order'
         propertiesMapper.saveSubPropertiesValueHeader(propertiesData);
         propertiesMapper.saveSubPropertiesValue(propertiesData);
         return newApplyNo;

src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java

@@ -176,7 +176,8 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         partIfsCatalog.setPartNo(data.getPartNo()); // 物料编码
         partIfsCatalog.setPartDesc(data.getPartDesc()); // 物料名称
         // 2025-04-24 PLM pcs. 对应 IFS PCS
-        partIfsCatalog.setUnitCode(data.getUmId() == null ? "" : "pcs.".equals(data.getUmId()) ? "PCS" : "pcs"); // 计量单位
+        // 2025-05-28 PLM PCS. 对应 IFS PCS
+        partIfsCatalog.setUnitCode(data.getUmId() == null ? "" : "PCS.".equals(data.getUmId()) ? "PCS" : "pcs"); // 计量单位
         partIfsCatalog.setPartMainGroup(data.getPartMainGroup() == null ? "" : data.getPartMainGroup()); // 物料分组
         partIfsCatalog.setWeightNet(data.getWeightNet() == null ? "" : data.getWeightNet().toString()); // 净重
         partIfsCatalog.setUomForWeightNet(data.getUomForWeightNet() == null ? "" : data.getUomForWeightNet()); // 净重单位
@@ -211,7 +212,8 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         partIfsInventory.setUomForVolumeNet(data.getUomForVolumeNet() == null ? "" : data.getUomForVolumeNet()); // 体积单位
         partIfsInventory.setPlannerBuyer(data.getProductGroupId4() == null ? "" : data.getProductGroupId4()); // 计划员
         // 2025-04-24 PLM pcs. 对应 IFS PCS
-        partIfsInventory.setUnitMeas(data.getUmId() == null ? "" : "pcs.".equals(data.getUmId()) ? "PCS" : "pcs"); // 计量单位
+        // 2025-05-28 PLM PCS. 对应 IFS PCS
+        partIfsInventory.setUnitMeas(data.getUmId() == null ? "" : "PCS.".equals(data.getUmId()) ? "PCS" : "pcs"); // 计量单位
         partIfsInventory.setPrimeCommodity(data.getProductGroupId1() == null ? "" : data.getProductGroupId1()); // 商品组1
         partIfsInventory.setSecondCommodity(data.getProductGroupId2() == null ? "" : data.getProductGroupId2()); // 商品组2
         partIfsInventory.setAssetClass(data.getAssetClass() == null ? "" : data.getAssetClass()); // 资产等级
@@ -3530,7 +3532,8 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         // 数据批量保存到缓存的数据表
         for (PartIfsInventory inventoryPart : ifsInventoryParts) {
             if ("PCS".equals(inventoryPart.getUnitMeas())) {
-                inventoryPart.setUnitMeas("pcs.");
+                // 2025-05-28 PLM PCS. 对应 IFS PCS
+                inventoryPart.setUnitMeas("PCS.");
             }
         }
         partCatalogDao.batchInsertInventoryParts(ifsInventoryParts);

src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml

@@ -130,8 +130,7 @@
         d.remark,
         e.tool_description,
         e.standard_cost,
-        g.customer_part_no
-        ,
+        g.customer_part_no,
         h.ifs_part_no as final_part_no,
         h.plm_part_no as test_part_no,
         dbo.plm_get_alternativeDesc(c.site, c.part_no, c.routing_revision, c.routing_type,c.alternative_no) alternativeDescription,