Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

# Conflicts:
#	klp-ui/src/views/micro/pages/acid/components/ActualPerformance.vue

klp-wms/src/main/java/com/klp/controller/WmsTransferOrderItemController.java

@@ -147,6 +147,16 @@ public class WmsTransferOrderItemController extends BaseController {
         return toAjax(iWmsTransferOrderItemService.confirmTransfer(bo));
     }
 
+    /**
+     * 批量确认调拨
+     */
+    @Log(title = "调拨单明细", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PostMapping("/batchConfirm")
+    public R<Void> batchConfirm(@Validated(AddGroup.class) @RequestBody List<WmsTransferOrderItemBo> boList) {
+        return toAjax(iWmsTransferOrderItemService.batchConfirmTransfer(boList));
+    }
+
     /**
      * 取消调拨
      */

klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilReportVo.java

@@ -24,4 +24,6 @@ public class WmsMaterialCoilReportVo {
     // 班组
     private String team;
 
+    // 创建时间
+    private String createTime;
 }

klp-wms/src/main/java/com/klp/service/IWmsTransferOrderItemService.java

@@ -64,6 +64,11 @@ public interface IWmsTransferOrderItemService {
      */
     Boolean confirmTransfer(WmsTransferOrderItemBo bo);
 
+    /**
+     * 批量确认调拨
+     */
+    Boolean batchConfirmTransfer(List<WmsTransferOrderItemBo> boList);
+
     /**
      * 取消调拨
      */

klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java

@@ -600,6 +600,23 @@ public class WmsTransferOrderItemServiceImpl implements IWmsTransferOrderItemSer
         return true;
     }
 
+    /**
+     * 批量确认调拨
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean batchConfirmTransfer(List<WmsTransferOrderItemBo> boList) {
+        if (boList == null || boList.isEmpty()) {
+            throw new IllegalArgumentException("调拨明细列表不能为空");
+        }
+
+        for (WmsTransferOrderItemBo bo : boList) {
+            confirmTransfer(bo);
+        }
+
+        return true;
+    }
+
     /**
      * 取消调拨
      */

klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml

@@ -481,7 +481,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             mc.net_weight AS netWeight,
             mc.warehouse_id AS warehouseId,
             mc.quality_status AS qualityStatus,
-            mc.team AS team
+            mc.team AS team,
+            mc.create_time AS createTime
         FROM wms_material_coil mc
         LEFT JOIN wms_raw_material rm ON mc.item_type = 'raw_material' AND mc.item_id = rm.raw_material_id
         LEFT JOIN wms_product p ON mc.item_type = 'product' AND mc.item_id = p.product_id