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

add:入库单主表处理：自定义入库单字段处理

Browse Source
This commit is contained in:
zhangzq
2024-04-17 17:36:23 +08:00
parent 323ea9521d
commit 4d92078988
54 changed files with 1262 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
wms_pro/hd/nladmin-system/src/main/java/org/nl/common/TableDataInfo.java
View File

@@ -1,6 +1,7 @@
package org.nl.common;
import cn.hutool.http.HttpStatus;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.Data;
import java.util.Date;
@@ -9,6 +10,7 @@ import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* 表格分页数据对象
@@ -61,6 +63,27 @@ public class TableDataInfo<T> implements Serializable {
return rspData;
}
public static TableDataInfo<Map> buildByDivForm(IPage<Map> page,String json_field) {
TableDataInfo<Map> rspData = new TableDataInfo<>();
rspData.setCode(HttpStatus.HTTP_OK);
rspData.setMsg("查询成功");
List<Map> records = page.getRecords();
records.forEach(a->{
Object o = a.get(json_field);
if (o!=null){
if (o instanceof String){
a.putAll(JSONObject.parseObject((String) o));
}else if (o instanceof Map){
a.putAll((Map)o);
}
}
});
rspData.setContent(page.getRecords());
rspData.setTotalElements(page.getTotal());
return rspData;
}
public static <T> TableDataInfo<T> build(List<T> list) {
TableDataInfo<T> rspData = new TableDataInfo<>();
rspData.setCode(HttpStatus.HTTP_OK);

19
wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/entity/BaseQuery.java
View File

@@ -1,6 +1,7 @@
package org.nl.common.domain.entity;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.LambdaUtils;
import com.baomidou.mybatisplus.core.toolkit.support.ColumnCache;
@@ -8,8 +9,9 @@ import lombok.Data;
import org.nl.common.enums.QueryTEnum;
import org.nl.common.utils.MapOf;
import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl;
import org.nl.wms.stor_manage.service.in.iostor.dao.StIvtIostorinvIn;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.Map;
@@ -20,6 +22,8 @@ import java.util.Map;
*/
@Data
public class BaseQuery<T> {
private Type ttype;
/**
* 模糊查询
*/
@@ -40,6 +44,13 @@ public class BaseQuery<T> {
private String plan_start_time;
private String plan_end_time;
public BaseQuery() {
Type superclass = getClass().getGenericSuperclass();
if (superclass instanceof Class) {
throw new RuntimeException("Missing type parameter.");
}
this.ttype = ((ParameterizedType) superclass).getActualTypeArguments()[0];
}
/**
* 字段映射Map:指定字段对应QueryWrapper的查询类型
@@ -55,12 +66,12 @@ public class BaseQuery<T> {
,"sort", QParam.builder().k(new String[]{"sort"}).type(QueryTEnum.BY).build()
);
public QueryWrapper<T> build(){
public Wrapper<T> build(){
this.paramMapping();
QueryWrapper<T> wrapper = new QueryWrapper<>();
JSONObject json = (JSONObject)JSONObject.toJSON(this);
Type[] types = ((ParameterizedTypeImpl) this.getClass().getGenericSuperclass()).getActualTypeArguments();
Map<String, ColumnCache> columnMap = LambdaUtils.getColumnMap((Class<?>) types[0]);
json.remove("ttype");
Map<String, ColumnCache> columnMap = LambdaUtils.getColumnMap((Class<?>) ttype);
json.forEach((key, vel) -> {
if (vel != null && !key.equals("doP")){
QParam qParam = doP.get(key);

8
wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/entity/Query.java Normal file
View File

@@ -0,0 +1,8 @@
package org.nl.common.domain.entity;
/*
* @author ZZQ
* @Date 2024/4/17 09:54
*/
public interface Query <T>{
}

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/config/satoken/SaTokenConfigure.java
View File

@@ -7,6 +7,7 @@ import cn.dev33.satoken.stp.StpUtil;
import lombok.Data;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -25,6 +26,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
public class SaTokenConfigure implements WebMvcConfigurer {
// 白名单
private String[] excludes;
// Sa-Token 整合 jwt (Simple 简单模式)
@Bean

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

@@ -1,6 +1,7 @@
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.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -21,6 +22,7 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -36,12 +38,13 @@ import java.util.Map;
*/
@RestController
@RequestMapping("/api/bmFormStruc")
@SaIgnore
public class BmFormStrucController {
private static Map<String,String> BASE_FORM = MapOf.of("bus_id","业务单据单据id"
,"bus_code","业务单据编号"
,"bus_date","业务单据日期"
,"bus_status","业务单据状态"
private static Map<String,String> BASE_FORM = MapOf.of("biz_id","业务单据单据id"
,"biz_code","业务单据编号"
,"biz_date","业务单据日期"
,"biz_status","业务单据状态"
,"material_id","物料id"
,"qty","数量");
@@ -88,9 +91,28 @@ public class BmFormStrucController {
}
/**
* @ONLY:只用于获取表单同步配置接口
* @ONLY:动态表单表头信息
* 数据结构:{"type":xxx,"name":xxx,"desc":xxx,"item":{"desc":"描述"}}
*/
@GetMapping("/formColumns/{form_type}")
public ResponseEntity<Object> formColumns(@PathVariable String form_type){
//参数判读，参数解析，调用参数入库
List<Map> items = new ArrayList<>();
BmFormStruc form_struc = iBmFormStrucService.getOne(new QueryWrapper<BmFormStruc>().eq("form_type", form_type));
if (form_struc!=null){
JSONObject form_param = form_struc.getForm_param();
for (String key : form_param.keySet()) {
items.add(MapOf.of("lable",form_param.get(key),"value",key));
}
}
return new ResponseEntity<>(items,HttpStatus.OK);
}
/**
* @ONLY:只用于获取表单同步配置接口
* @param form_type
* @return
*/
@GetMapping("/tableColumns/{form_type}")
public ResponseEntity<Object> tableColumns(@PathVariable String form_type){
//参数判读，参数解析，调用参数入库
@@ -104,7 +126,7 @@ public class BmFormStrucController {
}
if (form_struc.getHas_child()){
List<Map> dtl_items = new ArrayList<>();
BmFormStruc child_struc = iBmFormStrucService.getOne(new QueryWrapper<BmFormStruc>().eq("form_type", form_struc.getForm_type()));
BmFormStruc child_struc = iBmFormStrucService.getOne(new QueryWrapper<BmFormStruc>().eq("parent_id", form_struc.getForm_type()));
JSONObject child_param = child_struc.getForm_param();
child_param.putAll(BASE_FORM);
for (String key : child_param.keySet()) {
@@ -116,5 +138,6 @@ public class BmFormStrucController {
return new ResponseEntity<>(result,HttpStatus.OK);
}
}

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

@@ -63,22 +63,22 @@ public class BmFormStruc implements Serializable {
/**
* 业务单据单据id
*/
private String bus_id;
private String biz_id;
/**
* 业务单据编号
*/
private String bus_code;
private String biz_code;
/**
* 业务单据日期
*/
private String bus_date;
private String biz_date;
/**
* 业务单据状态
*/
private String bus_status;
private String biz_status;
/**
* 物料id

1
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_msg/AlmEarlyMsgController.java
View File

@@ -16,6 +16,5 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/almEarlyMsg")
public class AlmEarlyMsgController {
}

16
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/IostorInActivityBehavior.java
View File

@@ -12,10 +12,10 @@ import org.nl.wms.flow_manage.flow.framework.entity.node.base.impl.FlowElement;
import org.nl.wms.flow_manage.flow.framework.entity.node.impl.task.impl.FormTask;
import org.nl.wms.flow_manage.flow.framework.process.nodeType.TypeHandler;
import org.nl.wms.pm_manage.form_data.service.dto.PmFormDataDto;
import org.nl.wms.stor_manage.service.iostor.IStIvtIostorinvService;
import org.nl.wms.stor_manage.service.iostor.dao.StIvtIostorinv;
import org.nl.wms.stor_manage.service.iostor_dtl.IStIvtIostorinvdtlService;
import org.nl.wms.stor_manage.service.iostor_dtl.dao.StIvtIostorinvdtl;
import org.nl.wms.stor_manage.service.in.iostor.IStIvtIostorinvInService;
import org.nl.wms.stor_manage.service.in.iostor.dao.StIvtIostorinvIn;
import org.nl.wms.stor_manage.service.in.iostor_dtl.IStIvtIostorinvdtlInService;
import org.nl.wms.stor_manage.service.in.iostor_dtl.dao.StIvtIostorinvdtlIn;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -35,9 +35,9 @@ public class IostorInActivityBehavior extends FlowNodeActivityBehavior<PmFormDat
@Autowired
IBmFormStrucService iBmFormStrucService;
@Autowired
IStIvtIostorinvdtlService iostorinvdtlService;
IStIvtIostorinvdtlInService iostorinvdtlService;
@Autowired
IStIvtIostorinvService iostorinvService;
IStIvtIostorinvInService iostorinvService;
@Override
public void execute(ExecutionEntity<PmFormDataDto> execution) {
@@ -60,11 +60,11 @@ public class IostorInActivityBehavior extends FlowNodeActivityBehavior<PmFormDat
JSONObject handler = typeHandler.handler(formTask.getSkipExpression(), sourceData, formStruc);
//该参数里包含三部分：主数据基础字段，组数据自定义及明细，
//明细：基础字段，组数据自定义及参数
StIvtIostorinv mst = handler.toJavaObject(StIvtIostorinv.class);
StIvtIostorinvIn mst = handler.toJavaObject(StIvtIostorinvIn.class);
Object itemArr = handler.remove("item");
if(itemArr !=null && itemArr instanceof JSONArray){
JSONArray arr = (JSONArray) itemArr;
List<StIvtIostorinvdtl> iostorinvs = arr.toJavaList(StIvtIostorinvdtl.class);
List<StIvtIostorinvdtlIn> iostorinvs = arr.toJavaList(StIvtIostorinvdtlIn.class);
iostorinvdtlService.batchInsert(iostorinvs);
}
iostorinvService.save(mst);

3
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/node/impl/task/impl/FormTask.java
View File

@@ -15,6 +15,7 @@ import java.util.*;
public class FormTask extends ExecuteTask {
private String assignee;
private String task_type;
private List<String> skipExpression;
private String owner;
private String priority;
private String form_type;
@@ -30,7 +31,7 @@ public class FormTask extends ExecuteTask {
/**
* 规则：支持多级别
*/
private List<String> skipExpression;
private String validateFormFields;
private String taskIdVariableName;

32
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/source/impl/MappingSourceDataTypeHandler.java
View File

@@ -11,6 +11,9 @@ import org.nl.wms.flow_manage.flow.framework.process.nodeType.source.SourceDataT
import org.nl.wms.pm_manage.form_data.service.dao.PmFormData;
import org.nl.wms.sync_manage.service.form_mapping.dao.SyncFormMapping;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.expression.Expression;
import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.expression.spel.support.StandardEvaluationContext;
import org.springframework.stereotype.Service;
import java.lang.reflect.Field;
@@ -23,10 +26,9 @@ import java.util.List;
@Service
public class MappingSourceDataTypeHandler extends SourceDataTypeHandler<PmFormData> {
private static final SpelExpressionParser SPEL_PARSER = new SpelExpressionParser();
@Value("${server.port}")
private String post;
//material_id,qty,pcsn,code这些属于基础字段
private List base_parm = ListOf.of("data","code","material_id","qty","pcsn","code");
@Override
@@ -38,7 +40,8 @@ public class MappingSourceDataTypeHandler extends SourceDataTypeHandler<PmFormDa
PmFormData formData = new PmFormData();
formData.setId(IdUtil.getStringId());
formData.setForm_type(formMapping.getForm_type());
formData.setStatus("1");
formData.setBiz_status(
"1");
formData.setCreate_time(DateUtil.now());
JSONObject form_json = new JSONObject();
formData.setForm_data(form_json);
@@ -52,7 +55,20 @@ public class MappingSourceDataTypeHandler extends SourceDataTypeHandler<PmFormDa
String skipExpression = item_filed.getString("skipExpression");
Object value = null;
if (StringUtils.isNotEmpty(skipExpression)){
//el表达式
//TODO:el表达式
/*
el表达式{
JSONObject jsonObject = new JSONObject();
jsonObject.put("ddd","kkk");
StandardEvaluationContext context = new StandardEvaluationContext();
context.setVariable("query1",jsonObject);
Expression expression = SPEL_PARSER.parseExpression("#query1['ddd']");
String el_value = expression.getValue(context, String.class);
System.out.println(el_value);
}
* */
}else {
value = data.get(mapping_field);
}
@@ -68,12 +84,4 @@ public class MappingSourceDataTypeHandler extends SourceDataTypeHandler<PmFormDa
return formData;
}
public String getPost() {
return post;
}
public void setPost(String post) {
this.post = post;
}
}

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

@@ -35,12 +35,12 @@ public class PmFormData implements Serializable {
/**
* 业务单据编号
*/
private String code;
private String biz_code;
/**
* 业务单据日期
*/
private String date;
private String biz_date;
/**
* 单据类型
@@ -50,7 +50,7 @@ public class PmFormData implements Serializable {
/**
* 业务单据状态
*/
private String status;
private String biz_status;
/**
* 创建id

21
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/controller/StIvtIostorinvController.java
View File

@@ -1,21 +0,0 @@
package org.nl.wms.stor_manage.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 出入库单主表 前端控制器
* </p>
*
* @author generator
* @since 2024-03-28
*/
@RestController
@RequestMapping("/stIvtIostorinv")
public class StIvtIostorinvController {
}

44
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/controller/in/StIvtIostorinvInController.java Normal file
View File

@@ -0,0 +1,44 @@
package org.nl.wms.stor_manage.controller.in;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.nl.common.TableDataInfo;
import org.nl.common.domain.entity.PageQuery;
import org.nl.wms.stor_manage.service.dto.StorInvQuery;
import org.nl.wms.stor_manage.service.in.iostor.IStIvtIostorinvInService;
import org.nl.wms.stor_manage.service.in.iostor.dao.StIvtIostorinvIn;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.lang.reflect.Type;
import java.util.Map;
/**
* <p>
* 出入库单主表 前端控制器
* </p>
*
* @author generator
* @since 2024-03-28
*/
@RestController
@RequestMapping("api/stIvtIostorinvIn")
public class StIvtIostorinvInController {
@Autowired
IStIvtIostorinvInService iStIvtIostorinvInService;
@GetMapping
public ResponseEntity<Object> getAll(StorInvQuery query, PageQuery page) {
Page mapPage = iStIvtIostorinvInService.pageMaps(page.build(), query.build());
return new ResponseEntity<>(TableDataInfo.buildByDivForm(mapPage,"form_data"), HttpStatus.OK);
}
}

21
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/dto/StorInvQuery.java Normal file
View File

@@ -0,0 +1,21 @@
package org.nl.wms.stor_manage.service.dto;
import lombok.Data;
import org.nl.common.domain.entity.BaseQuery;
import org.nl.wms.stor_manage.service.in.iostor.dao.StIvtIostorinvIn;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
/*
* @author ZZQ
* @Date 2023/5/4 19:49
*/
@Data
public class StorInvQuery extends BaseQuery<StIvtIostorinvIn>{
private String form_type;
private String code;
private String status;
private String product_code;
}

16
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor/IStIvtIostorinvInService.java Normal file
View File

@@ -0,0 +1,16 @@
package org.nl.wms.stor_manage.service.in.iostor;
import org.nl.wms.stor_manage.service.in.iostor.dao.StIvtIostorinvIn;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 出入库单主表 服务类
* </p>
*
* @author generator
* @since 2024-03-28
*/
public interface IStIvtIostorinvInService extends IService<StIvtIostorinvIn> {
}

88
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor/dao/StIvtIostorinvIn.java Normal file
View File

@@ -0,0 +1,88 @@
package org.nl.wms.stor_manage.service.in.iostor.dao;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 出入库单主表
* </p>
*
* @author generator
* @since 2024-03-28
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("st_ivt_iostorinv_in")
public class StIvtIostorinvIn implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 出入单标识
*/
private String id;
/**
* 单据编号
*/
private String code;
/**
* 生产区域编码
*/
private String product_area;
/**
* 单据状态
*/
private String status;
/**
* 源单业务日期
*/
private String biz_date;
/**
* 源单号
*/
private String biz_code;
/**
* 源单单据类型
*/
private String form_type;
/**
* 备注
*/
private String remark;
/**
* 制单人
*/
private String create_id;
/**
* 制单时间
*/
private String create_time;
/**
* 修改人
*/
private String update_id;
/**
* 修改时间
*/
private String update_time;
/**
* 自定义映射数据
*/
private String form_data;
}

6
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor/dao/mapper/StIvtIostorinvMapper.java → wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor/dao/mapper/StIvtIostorinvMapper.java
View File

@@ -1,6 +1,6 @@
package org.nl.wms.stor_manage.service.iostor.dao.mapper;
package org.nl.wms.stor_manage.service.in.iostor.dao.mapper;
import org.nl.wms.stor_manage.service.iostor.dao.StIvtIostorinv;
import org.nl.wms.stor_manage.service.in.iostor.dao.StIvtIostorinvIn;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author generator
* @since 2024-03-28
*/
public interface StIvtIostorinvMapper extends BaseMapper<StIvtIostorinv> {
public interface StIvtIostorinvMapper extends BaseMapper<StIvtIostorinvIn> {
}

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor/dao/mapper/xml/StIvtIostorinvMapper.xml → wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor/dao/mapper/xml/StIvtIostorinvMapper.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.nl.wms.stor_manage.service.iostor.dao.mapper.StIvtIostorinvMapper">
<mapper namespace="org.nl.wms.stor_manage.service.in.iostor.dao.mapper.StIvtIostorinvMapper">
</mapper>

20
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor/impl/StIvtIostorinvInServiceImpl.java Normal file
View File

@@ -0,0 +1,20 @@
package org.nl.wms.stor_manage.service.in.iostor.impl;
import org.nl.wms.stor_manage.service.in.iostor.IStIvtIostorinvInService;
import org.nl.wms.stor_manage.service.in.iostor.dao.StIvtIostorinvIn;
import org.nl.wms.stor_manage.service.in.iostor.dao.mapper.StIvtIostorinvMapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 出入库单主表 服务实现类
* </p>
*
* @author generator
* @since 2024-03-28
*/
@Service
public class StIvtIostorinvInServiceImpl extends ServiceImpl<StIvtIostorinvMapper, StIvtIostorinvIn> implements IStIvtIostorinvInService {
}

19
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor_dtl/IStIvtIostorinvdtlInService.java Normal file
View File

@@ -0,0 +1,19 @@
package org.nl.wms.stor_manage.service.in.iostor_dtl;
import org.nl.wms.stor_manage.service.in.iostor_dtl.dao.StIvtIostorinvdtlIn;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* <p>
* 出入库单明细表 服务类
* </p>
*
* @author generator
* @since 2024-03-29
*/
public interface IStIvtIostorinvdtlInService extends IService<StIvtIostorinvdtlIn> {
void batchInsert(List<StIvtIostorinvdtlIn> dtls);
}

6
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor_dtl/dao/StIvtIostorinvdtl.java → wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor_dtl/dao/StIvtIostorinvdtlIn.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.stor_manage.service.iostor_dtl.dao;
package org.nl.wms.stor_manage.service.in.iostor_dtl.dao;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,8 +16,8 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("st_ivt_iostorinvdtl")
public class StIvtIostorinvdtl implements Serializable {
@TableName("st_ivt_iostorinvdtl_in")
public class StIvtIostorinvdtlIn implements Serializable {
private static final long serialVersionUID = 1L;

20
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor_dtl/dao/mapper/StIvtIostorinvdtlInMapper.java Normal file
View File

@@ -0,0 +1,20 @@
package org.nl.wms.stor_manage.service.in.iostor_dtl.dao.mapper;
import org.nl.wms.stor_manage.service.in.iostor_dtl.dao.StIvtIostorinvdtlIn;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
/**
* <p>
* 出入库单明细表 Mapper 接口
* </p>
*
* @author generator
* @since 2024-03-29
*/
public interface StIvtIostorinvdtlInMapper extends BaseMapper<StIvtIostorinvdtlIn> {
Integer batchInsert(List<StIvtIostorinvdtlIn> dtls);
}

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor_dtl/dao/mapper/xml/StIvtIostorinvdtlMapper.xml → wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor_dtl/dao/mapper/xml/StIvtIostorinvdtlInMapper.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.nl.wms.stor_manage.service.iostor_dtl.dao.mapper.StIvtIostorinvdtlMapper">
<mapper namespace="org.nl.wms.stor_manage.service.in.iostor_dtl.dao.mapper.StIvtIostorinvdtlInMapper">
<insert id="batchInsert">
insert into st_ivt_iostorinvdtl() values <foreach collection="dtls" open="(" close=")" item="item">

27
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/in/iostor_dtl/impl/StIvtIostorinvdtlInServiceImpl.java Normal file
View File

@@ -0,0 +1,27 @@
package org.nl.wms.stor_manage.service.in.iostor_dtl.impl;
import org.nl.wms.stor_manage.service.in.iostor_dtl.dao.StIvtIostorinvdtlIn;
import org.nl.wms.stor_manage.service.in.iostor_dtl.dao.mapper.StIvtIostorinvdtlInMapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.nl.wms.stor_manage.service.out.iostor_dtl.IStIvtIostorinvdtlOutService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* <p>
* 出入库单明细表 服务实现类
* </p>
*
* @author generator
* @since 2024-03-29
*/
@Service
public class StIvtIostorinvdtlInServiceImpl extends ServiceImpl<StIvtIostorinvdtlInMapper, StIvtIostorinvdtlIn> implements IStIvtIostorinvdtlOutService {
@Override
public void batchInsert(List<StIvtIostorinvdtlIn> dtls) {
this.baseMapper.batchInsert(dtls);
}
}

16
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor/IStIvtIostorinvService.java
View File

@@ -1,16 +0,0 @@
package org.nl.wms.stor_manage.service.iostor;
import org.nl.wms.stor_manage.service.iostor.dao.StIvtIostorinv;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 出入库单主表 服务类
* </p>
*
* @author generator
* @since 2024-03-28
*/
public interface IStIvtIostorinvService extends IService<StIvtIostorinv> {
}

20
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor/impl/StIvtIostorinvServiceImpl.java
View File

@@ -1,20 +0,0 @@
package org.nl.wms.stor_manage.service.iostor.impl;
import org.nl.wms.stor_manage.service.iostor.IStIvtIostorinvService;
import org.nl.wms.stor_manage.service.iostor.dao.StIvtIostorinv;
import org.nl.wms.stor_manage.service.iostor.dao.mapper.StIvtIostorinvMapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 出入库单主表 服务实现类
* </p>
*
* @author generator
* @since 2024-03-28
*/
@Service
public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper, StIvtIostorinv> implements IStIvtIostorinvService {
}

19
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor_dtl/IStIvtIostorinvdtlService.java
View File

@@ -1,19 +0,0 @@
package org.nl.wms.stor_manage.service.iostor_dtl;
import org.nl.wms.stor_manage.service.iostor_dtl.dao.StIvtIostorinvdtl;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* <p>
* 出入库单明细表 服务类
* </p>
*
* @author generator
* @since 2024-03-29
*/
public interface IStIvtIostorinvdtlService extends IService<StIvtIostorinvdtl> {
void batchInsert(List<StIvtIostorinvdtl> dtls);
}

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

@@ -1,20 +0,0 @@
package org.nl.wms.stor_manage.service.iostor_dtl.dao.mapper;
import org.nl.wms.stor_manage.service.iostor_dtl.dao.StIvtIostorinvdtl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
/**
* <p>
* 出入库单明细表 Mapper 接口
* </p>
*
* @author generator
* @since 2024-03-29
*/
public interface StIvtIostorinvdtlMapper extends BaseMapper<StIvtIostorinvdtl> {
Integer batchInsert(List<StIvtIostorinvdtl> dtls);
}

27
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor_dtl/impl/StIvtIostorinvdtlServiceImpl.java
View File

@@ -1,27 +0,0 @@
package org.nl.wms.stor_manage.service.iostor_dtl.impl;
import org.nl.wms.stor_manage.service.iostor_dtl.dao.StIvtIostorinvdtl;
import org.nl.wms.stor_manage.service.iostor_dtl.dao.mapper.StIvtIostorinvdtlMapper;
import org.nl.wms.stor_manage.service.iostor_dtl.IStIvtIostorinvdtlService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* <p>
* 出入库单明细表 服务实现类
* </p>
*
* @author generator
* @since 2024-03-29
*/
@Service
public class StIvtIostorinvdtlServiceImpl extends ServiceImpl<StIvtIostorinvdtlMapper, StIvtIostorinvdtl> implements IStIvtIostorinvdtlService {
@Override
public void batchInsert(List<StIvtIostorinvdtl> dtls) {
this.baseMapper.batchInsert(dtls);
}
}

16
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor/IStIvtIostorinvoutService.java Normal file
View File

@@ -0,0 +1,16 @@
package org.nl.wms.stor_manage.service.out.iostor;
import org.nl.wms.stor_manage.service.in.iostor.dao.StIvtIostorinvIn;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 出入库单主表 服务类
* </p>
*
* @author generator
* @since 2024-03-28
*/
public interface IStIvtIostorinvoutService extends IService<StIvtIostorinvIn> {
}

6
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/iostor/dao/StIvtIostorinv.java → wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor/dao/StIvtIostorinvout.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.stor_manage.service.iostor.dao;
package org.nl.wms.stor_manage.service.out.iostor.dao;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
@@ -15,8 +15,8 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("st_ivt_iostorinv")
public class StIvtIostorinv implements Serializable {
@TableName("st_ivt_iostorinv_in")
public class StIvtIostorinvout implements Serializable {
private static final long serialVersionUID = 1L;

16
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor/dao/mapper/StIvtIostorinvOutMapper.java Normal file
View File

@@ -0,0 +1,16 @@
package org.nl.wms.stor_manage.service.out.iostor.dao.mapper;
import org.nl.wms.stor_manage.service.in.iostor.dao.StIvtIostorinvIn;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 出入库单主表 Mapper 接口
* </p>
*
* @author generator
* @since 2024-03-28
*/
public interface StIvtIostorinvOutMapper extends BaseMapper<StIvtIostorinvIn> {
}

5
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor/dao/mapper/xml/StIvtIostorinvOutMapper.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.nl.wms.stor_manage.service.in.iostor.dao.mapper.StIvtIostorinvMapper">
</mapper>

20
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor/impl/StIvtIostorinvOutServiceImpl.java Normal file
View File

@@ -0,0 +1,20 @@
package org.nl.wms.stor_manage.service.out.iostor.impl;
import org.nl.wms.stor_manage.service.in.iostor.dao.StIvtIostorinvIn;
import org.nl.wms.stor_manage.service.in.iostor.dao.mapper.StIvtIostorinvMapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.nl.wms.stor_manage.service.out.iostor.IStIvtIostorinvoutService;
import org.springframework.stereotype.Service;
/**
* <p>
* 出入库单主表 服务实现类
* </p>
*
* @author generator
* @since 2024-03-28
*/
@Service
public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvMapper, StIvtIostorinvIn> implements IStIvtIostorinvoutService {
}

19
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor_dtl/IStIvtIostorinvdtlOutService.java Normal file
View File

@@ -0,0 +1,19 @@
package org.nl.wms.stor_manage.service.out.iostor_dtl;
import org.nl.wms.stor_manage.service.in.iostor_dtl.dao.StIvtIostorinvdtlIn;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* <p>
* 出入库单明细表 服务类
* </p>
*
* @author generator
* @since 2024-03-29
*/
public interface IStIvtIostorinvdtlOutService extends IService<StIvtIostorinvdtlIn> {
void batchInsert(List<StIvtIostorinvdtlIn> dtls);
}

110
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor_dtl/dao/StIvtIostorinvdtlOut.java Normal file
View File

@@ -0,0 +1,110 @@
package org.nl.wms.stor_manage.service.out.iostor_dtl.dao;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 出入库单明细表
* </p>
*
* @author generator
* @since 2024-03-29
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("st_ivt_iostorinvdtl_in")
public class StIvtIostorinvdtlOut implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 出入单明细标识
*/
private Long iostorinvdtl_id;
/**
* 出入单标识
*/
private Long iostorinv_id;
/**
* 明细序号
*/
private BigDecimal seq_no;
/**
* 物料标识
*/
private Long material_id;
/**
* 批次
*/
private String pcsn;
/**
* 品质类型
*/
private String quality_scode;
/**
* 单据明细状态
*/
private String bill_status;
/**
* 数量计量单位标识
*/
private Long qty_unit_id;
/**
* 数量计量单位名称
*/
private String qty_unit_name;
/**
* 数量
*/
private BigDecimal plan_qty;
/**
* 来源单据明细标识
*/
private Long source_billdtl_id;
/**
* 来源单据类型
*/
private String source_bill_type;
/**
* 来源单编号
*/
private String source_bill_code;
/**
* 来源单表名
*/
private String source_bill_table;
/**
* 备注
*/
private String remark;
/**
* 已分配数量
*/
private BigDecimal assign_qty;
/**
* 未分配数量
*/
private BigDecimal unassign_qty;
}

20
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor_dtl/dao/mapper/StIvtIostorinvdtlOutMapper.java Normal file
View File

@@ -0,0 +1,20 @@
package org.nl.wms.stor_manage.service.out.iostor_dtl.dao.mapper;
import org.nl.wms.stor_manage.service.in.iostor_dtl.dao.StIvtIostorinvdtlIn;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
/**
* <p>
* 出入库单明细表 Mapper 接口
* </p>
*
* @author generator
* @since 2024-03-29
*/
public interface StIvtIostorinvdtlOutMapper extends BaseMapper<StIvtIostorinvdtlIn> {
Integer batchInsert(List<StIvtIostorinvdtlIn> dtls);
}

10
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor_dtl/dao/mapper/xml/StIvtIostorinvdtlOutMapper.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.nl.wms.stor_manage.service.in.iostor_dtl.dao.mapper.StIvtIostorinvdtlInMapper">
<insert id="batchInsert">
insert into st_ivt_iostorinvdtl() values <foreach collection="dtls" open="(" close=")" item="item">
</foreach>
</insert>
</mapper>

27
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/service/out/iostor_dtl/impl/StIvtIostorinvdtlOutServiceImpl.java Normal file
View File

@@ -0,0 +1,27 @@
package org.nl.wms.stor_manage.service.out.iostor_dtl.impl;
import org.nl.wms.stor_manage.service.in.iostor_dtl.IStIvtIostorinvdtlInService;
import org.nl.wms.stor_manage.service.in.iostor_dtl.dao.StIvtIostorinvdtlIn;
import org.nl.wms.stor_manage.service.in.iostor_dtl.dao.mapper.StIvtIostorinvdtlInMapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* <p>
* 出入库单明细表 服务实现类
* </p>
*
* @author generator
* @since 2024-03-29
*/
@Service
public class StIvtIostorinvdtlOutServiceImpl extends ServiceImpl<StIvtIostorinvdtlInMapper, StIvtIostorinvdtlIn> implements IStIvtIostorinvdtlInService {
@Override
public void batchInsert(List<StIvtIostorinvdtlIn> dtls) {
this.baseMapper.batchInsert(dtls);
}
}

11
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/controller/form_mapping/SyncFormMappingController.java
View File

@@ -42,7 +42,6 @@ import java.util.Arrays;
@RequestMapping("api/syncFormMapping")
public class SyncFormMappingController {
private static final SpelExpressionParser SPEL_PARSER = new SpelExpressionParser();
@Autowired
ISyncFormMappingService iSyncFormMappingService;
@@ -52,15 +51,16 @@ public class SyncFormMappingController {
public static void main(String[] args) {
JSONObject jsonObject = new JSONObject();
jsonObject.put("ddd","kkk");
SpelExpressionParser SPEL_PARSER = new SpelExpressionParser();
StandardEvaluationContext context = new StandardEvaluationContext();
context.setVariable("query1",jsonObject);
Expression expression = SPEL_PARSER.parseExpression("#query1.ddd");
Expression expression = SPEL_PARSER.parseExpression("#query1['ddd']");
String value = expression.getValue(context, String.class);
System.out.println(value);
}
@GetMapping
public ResponseEntity<Object> getAll(FormMappingQuery query, PageQuery page) {
return new ResponseEntity<>(TableDataInfo.build(iSyncFormMappingService.page(page.build(), query.build())), HttpStatus.OK);
}
@PostMapping("/create")
@@ -68,6 +68,11 @@ public class SyncFormMappingController {
iSyncFormMappingService.saveSyncMapping(param);
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/update")
public ResponseEntity<Object> update(@RequestBody JSONObject param) {
iSyncFormMappingService.saveSyncMapping(param);
return new ResponseEntity<>(HttpStatus.OK);
}
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody String[] ids) {
if (ids.length>0){

1
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/form_mapping/ISyncFormMappingService.java
View File

@@ -15,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
public interface ISyncFormMappingService extends IService<SyncFormMapping> {
void saveSyncMapping(JSONObject param);
void updateSyncMapping(JSONObject param);
}

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

@@ -56,6 +56,7 @@ public class SyncFormMapping implements Serializable {
/**
* 映射关系
* 关系中维护springEL表达式
*/
@TableField(typeHandler = FastjsonTypeHandler.class)
private JSONArray mapping_json;

19
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/form_mapping/impl/SyncFormMappingServiceImpl.java
View File

@@ -56,4 +56,23 @@ public class SyncFormMappingServiceImpl extends ServiceImpl<SyncFormMappingMappe
mapping.setMapping_json(param.getJSONArray("item"));
this.save(mapping);
}
@Override
public void updateSyncMapping(JSONObject param) {
if (param==null){
return;
}
//TODO: 单据校验
JSONObject mst = param.getJSONObject("mst");
SyncFormMapping mapping = new SyncFormMapping();
mapping.setId(mst.getString("id"));
mapping.setSync_url(mst.getString("sync_url"));
mapping.setSync_type(mst.getString("sync_type"));
mapping.setExternal_system(mst.getString("external_system"));
mapping.setUpdate_id(SecurityUtils.getCurrentUserId());
mapping.setUpdate_name(SecurityUtils.getCurrentNickName());
mapping.setUpdate_time(DateUtil.now());
mapping.setMapping_json(param.getJSONArray("item"));
this.updateById(mapping);
}
}

2
wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml
View File

@@ -1,5 +1,5 @@
server:
port: 8011
port: 8012
max-http-header-size: 65536
#配置数据源
spring: