报表：库存入库订单明细报表2

@@ -4,13 +4,19 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import java.math.BigDecimal;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.web.core.bo.BaseBo;
+import com.lframework.starter.web.core.utils.ApplicationUtil;
+import com.lframework.starter.web.inner.entity.SysDataDicItem;
+import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import com.lframework.xingyun.sc.entity.OrderDetailReport;
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * <p>
@@ -20,6 +26,10 @@ import lombok.Data;
  */
 @Data
 public class QueryOrderDetailReportBo extends BaseBo<OrderDetailReport> {
+    private static final String DIC_EXECUTION_STANDARD = "APPLICABLE_STANDARD";
+    private static final String DIC_CONTRACT_PRODUCT = "CONTRACT_PRODUCT";
+    private static final String DIC_SPECIAL_REQUIREMENTS = "CONDITIONS_REQUIRED";
+    private static final Map<String, String> DIC_NAME_CACHE = new ConcurrentHashMap<>();
 
     /**
      * ID
@@ -64,6 +74,9 @@ public class QueryOrderDetailReportBo extends BaseBo<OrderDetailReport> {
     @ApiModelProperty("科办")
     private String deptName;
 
+    @ApiModelProperty("办事处编码")
+    private String deptCode;
+
     /**
      * 区域
      */
@@ -290,12 +303,6 @@ public class QueryOrderDetailReportBo extends BaseBo<OrderDetailReport> {
     @ApiModelProperty("工艺要求")
     private String productionProcess;
 
-    @ApiModelProperty("办事处代码")
-    private String officeCode;
-
-    @ApiModelProperty("办事处")
-    private String officeName;
-
     @ApiModelProperty("客户简称")
     private String customerShortName;
 
@@ -305,12 +312,18 @@ public class QueryOrderDetailReportBo extends BaseBo<OrderDetailReport> {
     @ApiModelProperty("执行标准")
     private String executionStandard;
 
+    @ApiModelProperty("执行标准备注")
+    private String executionStandardRemarks;
+
     @ApiModelProperty("结构报表用（产品名称）")
     private String structureReportUsed;
 
     @ApiModelProperty("合同类型编码")
     private String contractTypeCode;
 
+    @ApiModelProperty("合同类型（经销标准、经销库存、经销未锁规、外贸标准、外贸库存、外贸未锁规、加工标准）")
+    private String contractTypeName;
+
     @ApiModelProperty("特别注重要求")
     private String specialRequirements;
 
@@ -333,6 +346,92 @@ public class QueryOrderDetailReportBo extends BaseBo<OrderDetailReport> {
 
     @Override
     protected void afterInit(OrderDetailReport dto) {
+        this.executionStandard = getDicItemNameOrOriginal(DIC_EXECUTION_STANDARD, this.executionStandard);
+        if ("其它".equals(this.executionStandard) && StringUtils.isNotBlank(this.executionStandardRemarks)) {
+            this.executionStandard = this.executionStandardRemarks;
+        }
+        this.structureReportUsed = getDicItemNameOrOriginal(DIC_CONTRACT_PRODUCT, this.structureReportUsed);
+        this.specialRequirements = getDicItemNameOrOriginal(DIC_SPECIAL_REQUIREMENTS, this.specialRequirements);
+        this.deptCode = convertDeptNameToDeptCode(this.deptName);
+        this.contractTypeName = handleContractType(this.contractTypeCode);
+    }
+
+    private static String getDicItemNameOrOriginal(String dicCode, String itemCode) {
+        if (StringUtils.isBlank(dicCode) || StringUtils.isBlank(itemCode)) {
+            return itemCode;
+        }
+        String cacheKey = dicCode + "|" + itemCode;
+        String cached = DIC_NAME_CACHE.get(cacheKey);
+        if (cached != null) {
+            return cached;
+        }
+        SysDataDicItemService sysDataDicItemService = ApplicationUtil.getBean(SysDataDicItemService.class);
+        SysDataDicItem dicItem = sysDataDicItemService.findByCode(dicCode, itemCode);
+        String name = dicItem == null ? itemCode : dicItem.getName();
+        if (StringUtils.isBlank(name)) {
+            name = itemCode;
+        }
+        DIC_NAME_CACHE.put(cacheKey, name);
+        return name;
+    }
+
+    private static String convertDeptNameToDeptCode(String deptName) {
+        if (StringUtils.isBlank(deptName)) {
+            return null;
+        }
+        String name = deptName.trim();
+        if (name.contains("北方")) {
+            return "BF";
+        }
+        if (name.contains("常州")) {
+            return "CZ";
+        }
+        if (name.contains("东莞")) {
+            return "DG";
+        }
+        if (name.contains("佛山")) {
+            return "FS";
+        }
+        if (name.contains("宁波")) {
+            return "NB";
+        }
+        if (name.contains("苏州")) {
+            return "SZ";
+        }
+        if (name.contains("温州")) {
+            return "WZ";
+        }
+        if (name.contains("紫铜")) {
+            return "ZT";
+        }
+        if (name.contains("外贸")) {
+            return "WM";
+        }
+        return null;
+    }
 
+    private static String handleContractType(String contractType) {
+        if ("DISTRIB_STD".equals(contractType)) {
+            return "经销标准";
+        }
+        if ("DIST_STOCK_CONTRACT".equals(contractType)) {
+            return "经销库存";
+        }
+        if ("DRAFT_DIST_AGMT".equals(contractType)) {
+            return "经销未锁规";
+        }
+        if ("INTL_STD_CONTRACT".equals(contractType)) {
+            return "外贸标准";
+        }
+        if ("INTL_INVENTORY_AGMT".equals(contractType)) {
+            return "外贸库存";
+        }
+        if ("INTL_OPEN_SPEC_AGMT".equals(contractType)) {
+            return "外贸未锁规";
+        }
+        if ("PROCESS_STD_AGMT".equals(contractType)) {
+            return "加工标准";
+        }
+        return null;
     }
 }

@@ -65,22 +65,30 @@ public class OrderDetailReportController extends DefaultBaseController {
     }
 
     /**
-     * 库存合同未锁价订单明细查询
+     * 库存入库订单明查询
      */
-    @ApiOperation("库存合同未锁价订单明细查询")
-    @HasPermission({"statistical-report:order-detail:query","statistical-report:quality-order-detail:query"})
+    @ApiOperation("库存入库订单明查询")
+    @HasPermission({"statistical-report:stock-order-detail:query"})
     @GetMapping("/inventoryUnlocked/query")
     public InvokeResult<PageResult<QueryOrderDetailReportBo>> inventoryUnlockedQuery(@Valid QueryOrderDetailReportVo vo) {
         vo.setInventoryUnlockedOnly(Boolean.TRUE);
         vo.setExcludeInventoryUnlocked(null);
-        return query(vo);
+        PageResult<OrderDetailReport> pageResult = orderDetailReportService.query(getPageIndex(vo), getPageSize(vo), vo);
+        List<OrderDetailReport> datas = pageResult.getDatas();
+        List<QueryOrderDetailReportBo> results = null;
+
+        if (!CollectionUtil.isEmpty(datas)) {
+            results = datas.stream().map(QueryOrderDetailReportBo::new).collect(Collectors.toList());
+        }
+
+        return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
     }
 
     /**
-     * 库存入库订单明细查询
+     * 入库订单明细查询
      */
-    @ApiOperation("库存入库订单明细查询")
-    @HasPermission({"statistical-report:order-detail:query","statistical-report:quality-order-detail:query"})
+    @ApiOperation("入库订单明细查询")
+    @HasPermission({"statistical-report:warehousing-order-detail:query"})
     @GetMapping("/stockIn/query")
     public InvokeResult<PageResult<QueryOrderDetailReportBo>> stockInQuery(@Valid QueryOrderDetailReportVo vo) {
         vo.setExcludeInventoryUnlocked(Boolean.TRUE);
@@ -136,7 +144,7 @@ public class OrderDetailReportController extends DefaultBaseController {
      * 库存入库订单明细导出
      */
     @ApiOperation("库存入库订单明细导出")
-    @HasPermission({"statistical-report:order-detail:export"})
+    @HasPermission({"statistical-report:stock-order-detail:export"})
     @PostMapping("/inventoryUnlocked/export")
     public InvokeResult<Void> inventoryUnlockedExport(@Valid @RequestBody QueryOrderDetailReportVo vo) {
         vo.setInventoryUnlockedOnly(Boolean.TRUE);
@@ -150,7 +158,7 @@ public class OrderDetailReportController extends DefaultBaseController {
      * 入库订单明细导出
      */
     @ApiOperation("入库订单明细导出")
-    @HasPermission({"statistical-report:order-detail:export"})
+    @HasPermission({"statistical-report:warehousing-order-detail:export"})
     @PostMapping("/stockIn/export")
     public InvokeResult<Void> stockInExport(@Valid @RequestBody QueryOrderDetailReportVo vo) {
         vo.setExcludeInventoryUnlocked(Boolean.TRUE);

@@ -311,7 +311,13 @@ public class OrderDetailReport extends BaseEntity implements BaseDto {
     private String executionStandard;
 
     /**
-     * 结构报表用（合同物料行产品ID）
+     * 执行标准备注（当执行标准为“其它”时使用）
+     */
+    @TableField(exist = false)
+    private String executionStandardRemarks;
+
+    /**
+     * 结构报表用（合同物料行产品）
      */
     @TableField(exist = false)
     private String structureReportUsed;

@@ -53,7 +53,7 @@ public class StockInOrderDetailReportExportTaskWorker implements
 
         StockInOrderDetailReportModel model = new StockInOrderDetailReportModel();
         model.setOrderNo(data.getOrderNo());
-        model.setDeptCode(convertDeptNameToDeptCode(data.getDeptName()));
+        model.setDeptCode(data.getDeptCode());
         model.setCustomerShortName(data.getCustomerShortName());
         model.setOrderDate(toDate(data.getOrderDate()));
         model.setWorkshopName(data.getWorkshopName());
@@ -77,7 +77,7 @@ public class StockInOrderDetailReportExportTaskWorker implements
         model.setExecutionStandard(data.getExecutionStandard());
         model.setSalesPrice(toBigDecimalOrZero(data.getSalesPrice()));
         model.setPriceListNo(data.getPriceListNo());
-        model.setPackagingFee(toBigDecimalOrZero(data.getPackagingFee()));
+        model.setPackagingFee(stringToBigDecimal(data.getPackagingFee()));
         model.setSettlementTerms(data.getSettlementTerms());
         model.setPieceWeightHeader(data.getPieceWeightHeader());
         model.setSurface(data.getSurface());
@@ -87,13 +87,13 @@ public class StockInOrderDetailReportExportTaskWorker implements
         model.setSpecialRequirements(data.getSpecialRequirements());
         model.setRemarks(data.getRemarks());
         model.setSalesman(data.getContractCreateBy());
-        model.setShippingCost(toBigDecimalOrZero(data.getShippingCost()));
-        model.setReturnShippingCost(toBigDecimalOrZero(data.getReturnShippingCost()));
+        model.setShippingCost(stringToBigDecimal(data.getShippingCost()));
+        model.setReturnShippingCost(stringToBigDecimal(data.getReturnShippingCost()));
         model.setCustomerType(data.getCustomerType());
         model.setQuality(data.getQuality());
         model.setProcessingAndDistributor(data.getContractType());
         model.setActualCustomer(data.getOrderingUnitName());
-        model.setOrderType(handleContractType(data.getContractTypeCode()));
+        model.setOrderType(data.getContractTypeName());
         model.setLeadCadmiumPpm("Pb≤ppm\n" + "Cd≤ppm");
         model.setIronConductivity("Fe≤ppm\n" + "Co+Ni≤ppm\n" + "%IACS");
         model.setReserve1(data.getIndustry());
@@ -124,64 +124,21 @@ public class StockInOrderDetailReportExportTaskWorker implements
         }
     }
 
-    private static String handleContractType(String contractType) {
-        if ("DISTRIB_STD".equals(contractType)) {
-            return "经销标准";
-        }
-        if ("DIST_STOCK_CONTRACT".equals(contractType)) {
-            return "经销库存";
-        }
-        if ("DRAFT_DIST_AGMT".equals(contractType)) {
-            return "经销未锁规";
-        }
-        if ("INTL_STD_CONTRACT".equals(contractType)) {
-            return "外贸标准";
-        }
-        if ("INTL_INVENTORY_AGMT".equals(contractType)) {
-            return "外贸库存";
-        }
-        if ("INTL_OPEN_SPEC_AGMT".equals(contractType)) {
-            return "外贸未锁规";
-        }
-        if ("PROCESS_STD_AGMT".equals(contractType)) {
-            return "加工标准";
+    public static BigDecimal stringToBigDecimal(String str) {
+        // 1. 判空处理：如果为 null 或去除空格后为空字符串，直接返回 null
+        if (str == null || str.trim().isEmpty()) {
+            return null;
         }
-        return null;
-    }
 
-    private static String convertDeptNameToDeptCode(String deptName) {
-        if (StringUtils.isBlank(deptName)) {
+        // 2. 尝试转换
+        try {
+            // 建议先 trim() 去除首尾空格，避免 " 100 " 这种格式报错
+            return new BigDecimal(str.trim());
+        } catch (NumberFormatException e) {
+            // 3. 如果字符串格式不合法（如 "abc"），根据业务需求处理，这里同样返回 null
             return null;
         }
-        String name = deptName.trim();
-        if (name.contains("北方")) {
-            return "BF";
-        }
-        if (name.contains("常州")) {
-            return "CZ";
-        }
-        if (name.contains("东莞")) {
-            return "DG";
-        }
-        if (name.contains("佛山")) {
-            return "FS";
-        }
-        if (name.contains("宁波")) {
-            return "NB";
-        }
-        if (name.contains("苏州")) {
-            return "SZ";
-        }
-        if (name.contains("温州")) {
-            return "WZ";
-        }
-        if (name.contains("紫铜")) {
-            return "ZT";
-        }
-        if (name.contains("外贸")) {
-            return "WM";
-        }
-        return null;
     }
+
 }
 

@@ -57,6 +57,7 @@
         <result column="customer_short_name" property="customerShortName"/>
         <result column="settlement_terms" property="settlementTerms"/>
         <result column="execution_standard" property="executionStandard"/>
+        <result column="execution_standard_remarks" property="executionStandardRemarks"/>
         <result column="structure_report_used" property="structureReportUsed"/>
         <result column="contract_type_code" property="contractTypeCode"/>
         <result column="special_requirements" property="specialRequirements"/>
@@ -207,6 +208,7 @@
         cs.short_name AS customer_short_name,
         poi.settlement_terms AS settlement_terms,
         poi.execution_standard AS execution_standard,
+        poi.execution_standard_remarks AS execution_standard_remarks,
         CASE
             WHEN c.type = 'PROCESS_STD_AGMT' THEN pl.product_id
             ELSE cl.product_id