#合并订单出库，统一转波次出库前最新代码

Junjie

2024-09-13 a1a7c03eae40f4b0344fce652e1a240cf5283624

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LocDetl.java

@@ -6,9 +6,11 @@
import java.text.SimpleDateFormat;
import java.util.*;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.zy.asrs.common.utils.Synchro;
import com.zy.asrs.wms.asrs.service.LocService;
import com.zy.asrs.wms.asrs.service.MatFieldService;
import com.zy.asrs.wms.asrs.service.MatService;
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.User;
@@ -102,7 +104,6 @@
     * 是否删除 1: 是  0: 否  
     */
    @ApiModelProperty(value= "是否删除 1: 是  0: 否  ")
    @TableLogic
    private Integer deleted;

    /**
@@ -316,4 +317,23 @@
        dynamicFields.put(key, value);
    }

    public List<Map<String, Object>> getDynamicFieldsList() {
        MatFieldService service = SpringUtils.getBean(MatFieldService.class);
        List<MatField> matFields = service.list(new LambdaQueryWrapper<MatField>().eq(MatField::getFieldType, 1));
        HashMap<String, Object> fieldMap = new HashMap<>();
        for (MatField matField : matFields) {
            fieldMap.put(matField.getName(), matField.getDescribe());
        }

        List<Map<String, Object>> list = new ArrayList<>();
        for (Map.Entry<String, Object> entry : dynamicFields.entrySet()) {
            HashMap<String, Object> map = new HashMap<>();
            map.put("key", entry.getKey());
            map.put("value", entry.getValue());
            map.put("desc", fieldMap.get(entry.getKey()));
            list.add(map);
        }
        return list;
    }

}