Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X

klp-ui/src/views/wms/report/receive.vue

@@ -391,12 +391,28 @@ export default {
     openCustomExport() {
       getExportColumns().then(res => {
         this.exportColumns = res.data
+        // 读缓存：上次保存的列顺序
+        const cached = localStorage.getItem('custom-export-columns-coil-report-receive')
+        if (cached) {
+          try {
+            const arr = JSON.parse(cached)
+            if (Array.isArray(arr) && arr.length) {
+              this.selectedColumns = [...arr]
+              this.orderedColumns = [...arr]
+              this.customExportVisible = true
+              return
+            }
+          } catch (e) { /* ignore */ }
+        }
         this.selectedColumns = []
+        this.orderedColumns = []
         this.customExportVisible = true
       })
     },
     // 执行自定义导出（按 orderedColumns 顺序）
     doCustomExport() {
+      // 缓存当前配置
+      localStorage.setItem('custom-export-columns-coil-report-receive', JSON.stringify(this.orderedColumns))
       this.customExportVisible = false
       this.download('wms/materialCoil/exportCustomOrdered', {
         coilIds: this.coilIds,

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

@@ -5000,7 +5000,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
         if (childCoilBo.getActualWarehouseId() != null) {
             validateActualWarehouseForAssign(childCoilBo.getActualWarehouseId(), null);
         }
-        if (pendingAction.getActionType() != 501 && childCoilBo.getActionType() != null) {
+        if (pendingAction.getActionType() != 501 && pendingAction.getActionType() != 505 && childCoilBo.getActionType() != null) {
             // 校验子卷净重不超过母卷
             if (childCoilBo.getNetWeight() != null && parentCoil.getNetWeight() != null) {
                 if (childCoilBo.getNetWeight().compareTo(parentCoil.getNetWeight()) > 0) {
@@ -5136,7 +5136,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
                 .map(WmsMaterialCoil::getCurrentCoilNo)
                 .collect(Collectors.toList());
 
-            if (pendingAction.getActionType() != 501) {
+            if (pendingAction.getActionType() != 501 && pendingAction.getActionType() != 505) {
                 // 校验所有子卷总重不超过母卷净重
                 if (parentCoil.getNetWeight() != null) {
                     BigDecimal totalChildWeight = childCoils.stream()