root/wms1.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add:添加一个单位code

Browse Source
This commit is contained in:
zhangzq
2024-12-01 18:06:31 +08:00
parent e0a8d1ec44
commit 027340b2ac
30 changed files with 118 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/mybatis/handler/FastjsonSortTypeHandler.java Normal file
View File

@@ -0,0 +1,38 @@
package org.nl.common.domain.mybatis.handler;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.parser.Feature;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.core.toolkit.Assert;
import com.baomidou.mybatisplus.extension.handlers.AbstractJsonTypeHandler;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.type.JdbcType;
import org.apache.ibatis.type.MappedJdbcTypes;
import org.apache.ibatis.type.MappedTypes;
@Slf4j
@MappedTypes({Object.class})
@MappedJdbcTypes(JdbcType.VARCHAR)
public class FastjsonSortTypeHandler extends AbstractJsonTypeHandler<Object> {
private Class<?> type;
public FastjsonSortTypeHandler(Class<?> type) {
if (log.isTraceEnabled()) {
log.trace("FastjsonSortTypeHandler(" + type + ")");
}
Assert.notNull(type, "Type argument cannot be null");
this.type = type;
}
@Override
protected Object parse(String json) {
return JSON.parseObject(json, type, Feature.OrderedField);
}
@Override
protected String toJson(Object obj) {
return JSON.toJSONString(obj,SerializerFeature.WriteMapNullValue,
SerializerFeature.WriteNullListAsEmpty, SerializerFeature.WriteNullStringAsEmpty,SerializerFeature.SortField);
}
}

8
wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/MapOf.java
View File

@@ -3,6 +3,7 @@ package org.nl.common.utils;
import java.io.Serializable;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
/*
@@ -18,6 +19,13 @@ public class MapOf implements Serializable {
}
return map;
}
public static <K> LinkedHashMap linkOf(K... key){
LinkedHashMap map = new LinkedHashMap();
for (int i = 0; i < (key.length & ~1); i=i+2) {
map.put(key[i],key[i+1]);
}
return map;
}
public static <K> HashMap push(Map...item){
HashMap map = new HashMap<>();
for (int i = 0; i < (item.length & ~1); i=i+1) {

3
wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/SpelUtil.java
View File

@@ -12,6 +12,7 @@ import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.expression.spel.support.StandardEvaluationContext;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
/*
@@ -86,7 +87,7 @@ public class SpelUtil {
public static Map<String,String> parse(JSONObject sourceData,Map<String,String> fieldSkip){
StandardEvaluationContext context = new StandardEvaluationContext();
context.setVariable("M",sourceData);
Map<String, String> result = new HashMap<>();
Map<String, String> result = new LinkedHashMap<>();
for (String field : fieldSkip.keySet()) {
String skip = fieldSkip.get(field);
if (skip.charAt(0) == '#'){

9
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java
View File

@@ -4,6 +4,8 @@ package org.nl.wms.config_manage.form_struc.controller;
import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.apache.commons.lang3.StringUtils;
import org.nl.common.TableDataInfo;
@@ -69,14 +71,15 @@ public class BmFormStrucController {
@Log("修改单据结构")
public ResponseEntity<Object> update(@RequestBody JSONObject param){
//逻辑判断：如果有数据了则不允许修改
BmFormStruc formStruc = param.toJavaObject(BmFormStruc.class);
String s = param.toString(SerializerFeature.SortField);
BmFormStruc bmFormStruc = JSONObject.parseObject(s, BmFormStruc.class, Feature.OrderedField);
// List<PmFormData> formDatas = iPmFormDataService.getByType(param.getString("form_type"));
// if (!CollectionUtils.isEmpty(formDatas)){
// throw new BadRequestException("当前表单存在数据,不允许直接修改");
// }
// formStruc.setUpdate_time(DateUtil.now());
formStruc.setUpdate_name(SecurityUtils.getCurrentUserId());
iBmFormStrucService.updateById(formStruc);
bmFormStruc.setUpdate_name(SecurityUtils.getCurrentUserId());
iBmFormStrucService.updateById(bmFormStruc);
return new ResponseEntity<>(HttpStatus.OK);
}

4
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java
View File

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import org.nl.common.domain.mybatis.handler.FastjsonSortTypeHandler;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -123,7 +123,7 @@ public class BmFormStruc implements Serializable {
/**
* 自定义表单字段存json:{"dept":"部门","empp":"员工"}
*/
@TableField(typeHandler = FastjsonTypeHandler.class)
@TableField(typeHandler = FastjsonSortTypeHandler.class)
private JSONObject form_param = new JSONObject();
/**

4
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dto/BmFormStrucDto.java
View File

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import org.nl.common.domain.mybatis.handler.FastjsonSortTypeHandler;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -120,7 +120,7 @@ public class BmFormStrucDto implements Serializable {
/**
* 自定义表单字段存json:{"dept":"部门","empp":"员工"}
*/
@TableField(typeHandler = FastjsonTypeHandler.class)
@TableField(typeHandler = FastjsonSortTypeHandler.class)
private JSONObject form_param = new JSONObject();
/**

4
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/service/dao/StStrategyConfig.java
View File

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import org.nl.common.domain.mybatis.handler.FastjsonSortTypeHandler;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -58,7 +58,7 @@ public class StStrategyConfig implements Serializable {
/**
*限定参数
*/
@TableField(typeHandler = FastjsonTypeHandler.class)
@TableField(typeHandler = FastjsonSortTypeHandler.class)
private JSONObject form_data = new JSONObject();;
/**
* 描述

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_inv/dao/AlmEarlyInv.java
View File

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.List;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import org.nl.common.domain.mybatis.handler.FastjsonSortTypeHandler;
import lombok.*;
/**

4
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/MappingHandler.java
View File

@@ -55,7 +55,7 @@ public class MappingHandler extends TypeHandler<JSONObject, JSONObject> {
JSONObject t = new JSONObject();
//查询目标表字段
//基础字段映射:如果只有一个就不迭代
Map<String, String> spelMap = new HashMap<>();
Map<String, String> spelMap = new LinkedHashMap<>();
for (String field : mapping.keySet()) {
String skip = mapping.getString(field);
//判断是否走表达式映射:表达式映射都是按#M开头
@@ -69,7 +69,7 @@ public class MappingHandler extends TypeHandler<JSONObject, JSONObject> {
//查询表单配置表，获取自定义json:自定义字段参数获取
JSONObject form_param = form_struc.getForm_param();
if (form_param!=null){
Map<String, String> formDataSpelMap = new HashMap<>();
Map<String, String> formDataSpelMap = new LinkedHashMap<>();
JSONObject form_data = new JSONObject();
for (String item : form_param.keySet()) {
Object struc = form_param.get(item);

6
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/ActRuExecution.java
View File

@@ -9,7 +9,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import org.nl.common.domain.mybatis.handler.FastjsonSortTypeHandler;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -104,12 +104,12 @@ public class ActRuExecution implements Serializable {
/**
* 业务类型
*/
@TableField(typeHandler = FastjsonTypeHandler.class)
@TableField(typeHandler = FastjsonSortTypeHandler.class)
private JSONObject aux_param = new JSONObject();
/**
* 业务数据
*/
@TableField(typeHandler = FastjsonTypeHandler.class)
@TableField(typeHandler = FastjsonSortTypeHandler.class)
private JSONObject form_data = new JSONObject();
@TableField(exist = false)

6
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/history/dao/ActHiExecution.java
View File

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import org.nl.common.domain.mybatis.handler.FastjsonSortTypeHandler;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -69,11 +69,11 @@ public class ActHiExecution implements Serializable {
/**
* 业务数据
*/
@TableField(typeHandler = FastjsonTypeHandler.class)
@TableField(typeHandler = FastjsonSortTypeHandler.class)
private JSONObject form_data = new JSONObject();; /**
* 业务数据
*/
@TableField(typeHandler = FastjsonTypeHandler.class)
@TableField(typeHandler = FastjsonSortTypeHandler.class)
private JSONObject aux_param = new JSONObject();;

4
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/MdGruopDick.java
View File

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import org.nl.common.domain.mybatis.handler.FastjsonSortTypeHandler;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -82,7 +82,7 @@ public class MdGruopDick implements Serializable {
/**
* 自定义字段
*/
@TableField(typeHandler = FastjsonTypeHandler.class)
@TableField(typeHandler = FastjsonSortTypeHandler.class)
private JSONObject form_data = new JSONObject();

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/xml/MdGruopDickMapper.xml
View File

@@ -13,7 +13,7 @@
<result property="update_name" column="update_name"/>
<result property="update_time" column="update_time"/>
<result property="create_time" column="create_time"/>
<result property="form_data" column="form_data" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
<result property="form_data" column="form_data" typeHandler="org.nl.common.domain.mybatis.handler.FastjsonSortTypeHandler"/>
</resultMap>

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/GroupDickQuery.java
View File

@@ -2,7 +2,7 @@ package org.nl.wms.md_manage.group_dick.service.dto;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import org.nl.common.domain.mybatis.handler.FastjsonSortTypeHandler;
import lombok.Data;
import org.nl.common.domain.entity.BaseQuery;
import org.nl.common.domain.entity.QParam;

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopVo.java
View File

@@ -3,7 +3,7 @@ package org.nl.wms.md_manage.group_dick.service.dto;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import org.nl.common.domain.mybatis.handler.FastjsonSortTypeHandler;
import lombok.Data;
import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;

4
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dao/MdPbVehicleMater.java
View File

@@ -4,9 +4,9 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.nl.common.domain.mybatis.handler.FastjsonSortTypeHandler;
import java.io.Serializable;
import java.math.BigDecimal;
@@ -101,7 +101,7 @@ public class MdPbVehicleMater implements Serializable {
/**
* 扩展信息
*/
@TableField(typeHandler = FastjsonTypeHandler.class)
@TableField(typeHandler = FastjsonSortTypeHandler.class)
private JSONObject form_data = new JSONObject();
/**

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dao/mapper/xml/MdPbVehicleivtMapper.xml
View File

@@ -15,7 +15,7 @@
<result property="material_code" column="material_code"/>
<result property="material_name" column="material_name"/>
<result property="material_spec" column="material_spec"/>
<result property="form_data" column="form_data" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
<result property="form_data" column="form_data" typeHandler="org.nl.common.domain.mybatis.handler.FastjsonSortTypeHandler"/>
</resultMap>
<select id="getVehicleMaters"
resultMap="VoResultMap">

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dto/MdPbVehicleMaterVo.java
View File

@@ -2,7 +2,7 @@ package org.nl.wms.md_manage.vehicleMater.service.dto;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import org.nl.common.domain.mybatis.handler.FastjsonSortTypeHandler;
import lombok.Data;
import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/group/dto/MaterGroupDto.java
View File

@@ -1,8 +1,6 @@
package org.nl.wms.pda_manage.group.dto;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import lombok.Data;
import java.util.List;

21
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/sevice/PdaIOService.java
View File

@@ -40,6 +40,7 @@ import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
public class PdaIOService {
@@ -103,16 +104,20 @@ public class PdaIOService {
mst.setBill_type(billType);
mst.setIn_storage(false);
mst.setProduct_area(pdaFormOutMst.getProduct_area());
mst.setForm_data(new JSONObject(MapOf.of("shipper",null,"product_area",null)));
mst.setForm_data(new JSONObject(MapOf.of("shipper",null,"product_area",pdaFormOutMst.getProduct_area())));
List<StIvtIostorinvdtl> list = new ArrayList<>();
JSONObject mstJ = (JSONObject) JSONObject.toJSON(pdaFormOutMst);
mstJ.remove("children");
mstJ.putAll((Map)mstJ.remove("form_data"));
String mstString = mstJ.toJSONString();
for (PdaFormOutDtl dtl : dtls) {
BigDecimal now_assign_qty = dtl.getNow_assign_qty();
if (now_assign_qty==null || now_assign_qty.intValue()==0){
throw new BadRequestException("出库申请失败：当前"+dtl.getMaterial_name()+"明细申请数量为0");
}
StIvtIostorinvdtl ivtDtl = new StIvtIostorinvdtl();
ivtDtl.setSource_form_id(dtl.getId());
ivtDtl.setSource_form_type(dtl.getForm_type());
ivtDtl.setMaterial_id(dtl.getMaterial_id());
String productArea = pdaFormOutMst.getProduct_area();
if (StringUtils.isEmpty(productArea) || !"A1A2A3".contains(productArea)){
@@ -122,6 +127,7 @@ public class PdaIOService {
if (StringUtils.isEmpty(storCode)){
throw new BadRequestException("出库申请失败：明细数据仓库字段未指定");
}
HashMap map = MapOf.of("end_struct_code", "", "start_struct_code", "", "order", "", "product_area", productArea);
ivtDtl.setForm_data(new JSONObject(map));
ivtDtl.setQty(now_assign_qty);
@@ -130,6 +136,15 @@ public class PdaIOService {
ivtDtl.setId(IdUtil.getStringId());
ivtDtl.setInv_id(mst.getId());
ivtDtl.setStatus(StatusEnum.FORM_STATUS.code("生成"));
ivtDtl.setSource_form_id(dtl.getId());
ivtDtl.setSource_form_type(dtl.getForm_type());
合并主表明细数据:{
JSONObject sourceFormData = (JSONObject) JSONObject.toJSON(mstString);
JSONObject dtlJ = (JSONObject) JSONObject.toJSON(dtl);
dtlJ.putAll((Map) dtlJ.remove("form_data"));
sourceFormData.putAll(dtlJ);
ivtDtl.setSource_form_data(sourceFormData);
}
list.add(ivtDtl);
}
if (CollectionUtils.isEmpty(list)){

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pick/dto/PickFormVo.java
View File

@@ -2,7 +2,7 @@ package org.nl.wms.pda_manage.pick.dto;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import org.nl.common.domain.mybatis.handler.FastjsonSortTypeHandler;
import lombok.Data;
import org.nl.common.enums.StatusEnum;

4
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java
View File

@@ -3,7 +3,7 @@ package org.nl.wms.pm_manage.form_data.service.dao;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import org.nl.common.domain.mybatis.handler.FastjsonSortTypeHandler;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.nl.common.enums.StatusEnum;
@@ -104,7 +104,7 @@ public class PmFormData implements Serializable {
/**
* 自定义表单字段
*/
@TableField(typeHandler = FastjsonTypeHandler.class)
@TableField(typeHandler = FastjsonSortTypeHandler.class)
private JSONObject form_data = new JSONObject();;
/**

4
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml
View File

@@ -18,7 +18,7 @@
<result property="pcsn" column="pcsn"/>
<result property="vehicle_code" column="vehicle_code"/>
<result property="parent_id" column="parent_id"/>
<result property="form_data" column="form_data" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
<result property="form_data" column="form_data" typeHandler="org.nl.common.domain.mybatis.handler.FastjsonSortTypeHandler"/>
<result property="unit_id" column="unit_id"/>
</resultMap>
@@ -46,7 +46,7 @@
<result property="vehicle_code" column="vehicle_code"/>
<result property="vehicle_id" column="vehicle_id"/>
<result property="parent_id" column="parent_id"/>
<result property="form_data" column="form_data" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
<result property="form_data" column="form_data" typeHandler="org.nl.common.domain.mybatis.handler.FastjsonSortTypeHandler"/>
<result property="unit_id" column="unit_id"/>
<!-- <result property="HasChildren" column="HasChildren"/>-->
</resultMap>

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/PmFormDataDto.java
View File

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.List;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import org.nl.common.domain.mybatis.handler.FastjsonSortTypeHandler;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.nl.common.enums.StatusEnum;

4
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/StIvtIostorinv.java
View File

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import org.nl.common.domain.mybatis.handler.FastjsonSortTypeHandler;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -95,7 +95,7 @@ public class StIvtIostorinv implements Serializable {
/**
* 自定义映射数据
*/
@TableField(typeHandler = FastjsonTypeHandler.class)
@TableField(typeHandler = FastjsonSortTypeHandler.class)
private JSONObject form_data = new JSONObject();;
/**

9
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/dao/StIvtIostorinvdtl.java
View File

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import org.nl.common.domain.mybatis.handler.FastjsonSortTypeHandler;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -44,6 +44,11 @@ public class StIvtIostorinvdtl implements Serializable {
* 源单单据类型
*/
private String source_form_type;
/**
* 源单单据信息(平铺数据)
*/
@TableField(typeHandler = FastjsonSortTypeHandler.class)
private JSONObject source_form_data;
/**
* 单据明细状态
*/
@@ -94,7 +99,7 @@ public class StIvtIostorinvdtl implements Serializable {
private String update_time;
@TableField(typeHandler = FastjsonTypeHandler.class)
@TableField(typeHandler = FastjsonSortTypeHandler.class)
private JSONObject form_data = new JSONObject();

4
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/dao/mapper/StIvtIostorinvdtlMapper.java
View File

@@ -1,6 +1,6 @@
package org.nl.wms.stor_manage.io.service.iostor_dtl.dao.mapper;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import org.nl.common.domain.mybatis.handler.FastjsonSortTypeHandler;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.Results;
import org.apache.ibatis.annotations.Select;
@@ -34,7 +34,7 @@ public interface StIvtIostorinvdtlMapper extends BaseMapper<StIvtIostorinvdtl> {
" LEFT JOIN md_pb_vehicleMater ON (st_ivt_iostorinvdtl.vehicle_code = md_pb_vehicleMater.vehicle_code\n" +
" and st_ivt_iostorinvdtl.material_id = md_pb_vehicleMater.material_id)\n" +
" where inv_id = #{inv_id} GROUP BY st_ivt_iostorinvdtl.id")
@Results({@Result(property = "form_data",column = "form_data",typeHandler = FastjsonTypeHandler.class)})
@Results({@Result(property = "form_data",column = "form_data",typeHandler = FastjsonSortTypeHandler.class)})
List<Map> findByInv(String inv_id);

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/dto/StIvtIostorinvdtlVo.java
View File

@@ -3,7 +3,7 @@ package org.nl.wms.stor_manage.io.service.iostor_dtl.dto;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import org.nl.common.domain.mybatis.handler.FastjsonSortTypeHandler;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;

4
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/record/service/dao/StIvtStructivtflow.java
View File

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import org.nl.common.domain.mybatis.handler.FastjsonSortTypeHandler;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -73,7 +73,7 @@ public class StIvtStructivtflow implements Serializable {
/**
* 载具物料参数
*/
@TableField(typeHandler = FastjsonTypeHandler.class)
@TableField(typeHandler = FastjsonSortTypeHandler.class)
private JSONObject vehicle_form_data;
/**

4
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/form_mapping/dao/SyncFormMapping.java
View File

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import org.nl.common.domain.mybatis.handler.FastjsonSortTypeHandler;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -60,7 +60,7 @@ public class SyncFormMapping implements Serializable {
* 映射关系
* 关系中维护springEL表达式
*/
@TableField(typeHandler = FastjsonTypeHandler.class)
@TableField(typeHandler = FastjsonSortTypeHandler.class)
private JSONArray mapping_json;
/**