skyouc
5 天以前 6b91dfe7a4ade6b22422ccda01fa8f83772b68a5
动态字段优化
4个文件已修改
28 ■■■■ 已修改文件
rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
@@ -199,4 +199,14 @@
}
AsnOrderItemList.Context = React.createContext()
const DynamicFields = async () => {
  const {
    data: { code, data, msg },
  } = await request.get("/fields/enable/list");
}
export default AsnOrderItemList;
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java
@@ -14,6 +14,7 @@
import java.io.Serializable;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
@@ -97,9 +98,8 @@
    @ApiModelProperty("行号")
    private String platItemId;
    @ApiModelProperty("扩展字段")
    private Map<String, Object> extendFields;
    private List<Map<String, Object>> extendFields;
}
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -271,9 +271,17 @@
            if (!Objects.isNull(rcpt)) {
                try {
                    if (Objects.isNull(rcpt.get("fieldsindex")) || StringUtils.isBlank(rcpt.get("fieldsindex").toString())) {
                        StringBuffer sb = new StringBuffer();
                        if (!dto.getExtendFields().isEmpty()) {
                            dto.getExtendFields().forEach(field -> {
                                field.keySet().forEach(key -> {
                                    sb.append(field.get(key));
                                });
                            });
                        }
                        sb.append(dto.getAsnCode() + dto.getMatnr());
                        //获取16位uuid
//                        String uuid16 = Cools.md5(dto.getBarcode());
                        String uuid16 = Cools.md5(dto.getMatnr() + dto.getSplrBatch());
                        String uuid16 = Cools.md5Chinese(sb.toString());
                        rcpt.put("index", uuid16);
                        orderItem.setFieldsIndex(uuid16);
                    }
rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java
@@ -140,7 +140,7 @@
     * @time 2025/4/7 15:28
     */
    @Transactional(rollbackFor = Exception.class)
    public synchronized static void updateFieldsValue(Map<String, Object> params) throws Exception {
    public static synchronized  void updateFieldsValue(Map<String, Object> params) throws Exception {
        List<Fields> fields = getFieldsSta();
        if (fields.isEmpty()) { return; }
        Object fieldsIndex = params.get("fieldsIndex");