2026-06-01

接口优化

src/main/java/com/gaotao/modules/oa/dto/ProductionBomItemDto.java

@@ -115,4 +115,14 @@ public class ProductionBomItemDto {
      * 调机量
      */
     private Double qtySetup;
+
+    /**
+     * 基本用量（分子）
+     */
+    private Double baseQtyN;
+
+    /**
+     * 基础数量（分母）
+     */
+    private Double baseQtyD;
 }

src/main/java/com/gaotao/modules/oa/service/impl/ProductionBomServiceImpl.java

@@ -97,6 +97,8 @@ public class ProductionBomServiceImpl implements ProductionBomService {
         params.add(item.getRmTypeDb() == null ? "" : item.getRmTypeDb());       // @rmTypeDb
         params.add(item.getMethod());                  // @method
         params.add(item.getQtySetup() == null ? BigDecimal.ZERO : item.getQtySetup());        // @qtySetup
+        params.add(item.getBaseQtyN() == null ? BigDecimal.ZERO : item.getBaseQtyN());        // @baseQtyN
+        params.add(item.getBaseQtyD() == null ? BigDecimal.ZERO : item.getBaseQtyD());        // @baseQtyD
         
         // 执行存储过程
         List<Map<String, Object>> resultList = procedureDao.getProcedureData("UspInsertSOBom", params);

src/main/resources/mapper/shopOrder/WorkOrderAllocMapper.xml

@@ -165,10 +165,10 @@
         SELECT
         site,
         orderNo,
-        ROW_NUMBER() OVER (ORDER BY MAX(allocDate) ASC) AS batchNo,
+        ROW_NUMBER() OVER (ORDER BY MAX(ReportDate) ASC) AS batchNo,
         erp_orderNo as erpOrderNo,
         erp_orderLineNo as erpOrderLineNo,
-        ROW_NUMBER() OVER (ORDER BY MAX(allocDate) ASC) AS rowNo,
+        ROW_NUMBER() OVER (ORDER BY MAX(ReportDate) ASC) AS rowNo,
         operation_id as itemNo,
         operator,
         SUM(ISNULL(allocReportQty,0)),
@@ -177,7 +177,7 @@
         SUM(ISNULL(allocSetupTime,0)) allocSetupTime,
         SUM(ISNULL(allocManfTime,0)) allocManfTime,
         MAX(allocBy )AS allocBy,
-        MAX(allocDate) AS allocDate,
+        ReportDate AS allocDate,
         '' allocType
         FROM UspWorkOrderAlloc
         <where>
@@ -192,7 +192,7 @@
                 AND orderNo = #{orderNo}
             </if>
         </where>
-        GROUP BY site , orderNo  , erp_orderNo , erp_orderLineNo  , operation_id , operator
+        GROUP BY site , orderNo  , erp_orderNo , erp_orderLineNo  , operation_id , operator , ReportDate
     </select>
     
     <!-- 更新SFDC表的同步信息 -->