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-23 17:01:50 +08:00
parent 4d92078988
commit c85eaa6187
28 changed files with 1540 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
wms_pro/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java Normal file
View File

@@ -0,0 +1,39 @@
package org.nl.common.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
import org.apache.commons.lang3.StringUtils;
import org.nl.common.domain.exception.BadRequestException;
import org.nl.common.utils.MapOf;
import java.util.Map;
/*
* @author ZZQ
* @Date 2024/4/23 10:49
*/
@Getter
@AllArgsConstructor
public enum StatusEnum {
//单据状态库类型
FORM_STATUS(MapOf.of("生成", "10", "执行中", "20","完成", "99"));
private Map<String, String> code;
public String code(String desc) {
String code = this.getCode().get(desc);
if (StringUtils.isNotEmpty(code)) {
return code;
}
throw new BadRequestException(this.name() + "对应类型" + desc + "未定义");
}
public String check(String code) {
for (Map.Entry<String, String> entry : this.getCode().entrySet()) {
if (entry.getValue().equals("code")) {
return entry.getValue();
}
}
throw new BadRequestException(this.name() + "对应类型" + code + "未定义");
}
}

10
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/impl/BmClassStandardServiceImpl.java
View File

@@ -23,8 +23,8 @@ import org.nl.wms.base_manage.class_standard.service.IBmClassStandardService;
import org.nl.wms.base_manage.class_standard.service.dao.BmClassStandard;
import org.nl.wms.base_manage.class_standard.service.dao.mapper.BmClassStandardMapper;
import org.nl.wms.base_manage.class_standard.service.dto.BmClassStandardTree;
import org.nl.wms.base_manage.material.service.IBmMaterialService;
import org.nl.wms.base_manage.material.service.dao.BmMaterial;
import org.nl.wms.base_manage.material.service.IMdMeMaterialbaseService;
import org.nl.wms.base_manage.material.service.dao.MdMeMaterialbase;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
@@ -51,7 +51,7 @@ import java.util.stream.Collectors;
public class BmClassStandardServiceImpl extends ServiceImpl<BmClassStandardMapper, BmClassStandard> implements IBmClassStandardService {
@Autowired
private IBmMaterialService materialService;
private IMdMeMaterialbaseService materialService;
@Override
public List<Map> dropdownList(Map whereJson) {
@@ -124,12 +124,12 @@ public class BmClassStandardServiceImpl extends ServiceImpl<BmClassStandardMappe
QueryWrapper<BmClassStandard> query = new QueryWrapper<>();
query.eq("1", "1");
if (ObjectUtil.isNotEmpty(whereJson.get("material_id"))) {
BmMaterial one = materialService.getOne(new QueryWrapper<BmMaterial>().eq("material_id", whereJson.get("material_id")));
MdMeMaterialbase one = materialService.getOne(new QueryWrapper<MdMeMaterialbase>().eq("material_id", whereJson.get("material_id")));
whereJson.put("class_idStr", one.getMaterial_type_id());
}
query.eq("1", "1");
if (ObjectUtil.isNotEmpty(whereJson.get("material_id"))) {
BmMaterial one = materialService.getOne(new QueryWrapper<BmMaterial>().eq("material_id", whereJson.get("material_id")));
MdMeMaterialbase one = materialService.getOne(new QueryWrapper<MdMeMaterialbase>().eq("material_id", whereJson.get("material_id")));
if (null != one) {
whereJson.put("class_idStr", one.getMaterial_type_id());
}

14
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/controller/BmMaterialController.java
View File

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.nl.common.TableDataInfo;
import org.nl.common.domain.entity.PageQuery;
import org.nl.common.utils.RedissonUtils;
import org.nl.wms.base_manage.material.service.IBmMaterialService;
import org.nl.wms.base_manage.material.service.dao.BmMaterial;
import org.nl.wms.base_manage.material.service.IMdMeMaterialbaseService;
import org.nl.wms.base_manage.material.service.dao.MdMeMaterialbase;
import org.nl.wms.base_manage.material.service.dto.MaterialQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
@@ -31,23 +31,23 @@ import java.util.Arrays;
public class BmMaterialController {
@Autowired
private IBmMaterialService materialService;
private IMdMeMaterialbaseService materialService;
@GetMapping
public ResponseEntity<Object> getAll(MaterialQuery query, PageQuery page) {
return new ResponseEntity<>(TableDataInfo.build(materialService.page(page.build(), query.build())), HttpStatus.OK);
return new ResponseEntity<>(TableDataInfo.build(materialService.page(page.build(MdMeMaterialbase.class), query.build())), HttpStatus.OK);
}
@PostMapping
public ResponseEntity<Object> create(@Validated @RequestBody BmMaterial dto) {
public ResponseEntity<Object> create(@Validated @RequestBody MdMeMaterialbase dto) {
materialService.save(dto);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@PutMapping
public ResponseEntity<Object> update(@Validated @RequestBody BmMaterial dto) {
materialService.update(dto, new LambdaUpdateWrapper<BmMaterial>().eq(BmMaterial::getMaterial_id, dto.getMaterial_id()));
public ResponseEntity<Object> update(@Validated @RequestBody MdMeMaterialbase dto) {
materialService.update(dto, new LambdaUpdateWrapper<MdMeMaterialbase>().eq(MdMeMaterialbase::getMaterial_id, dto.getMaterial_id()));
return new ResponseEntity<>(HttpStatus.OK);
}

17
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/IBmMaterialService.java → wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/IMdMeMaterialbaseService.java
View File

@@ -1,7 +1,7 @@
package org.nl.wms.base_manage.material.service;
import org.nl.wms.base_manage.material.service.dao.MdMeMaterialbase;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.wms.base_manage.material.service.dao.BmMaterial;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
@@ -16,16 +16,13 @@ import java.util.Map;
* </p>
*
* @author generator
* @since 2023-04-26
* @since 2024-04-22
*/
public interface IBmMaterialService extends IService<BmMaterial>{
/**
* 物料基础信息导入
*/
void excelImport(MultipartFile file, HttpServletRequest request, HttpServletResponse response)
throws IOException;
public interface IMdMeMaterialbaseService extends IService<MdMeMaterialbase> {
void excelImport(MultipartFile file, HttpServletRequest request, HttpServletResponse response)
throws IOException;
List<Map> pageQuery(Map whereJson);
List<Map> pageQuery(Map whereJson);
void create(BmMaterial entity);
void create(MdMeMaterialbase entity);
}

70
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/BmMaterial.java → wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/MdMeMaterialbase.java
View File

@@ -1,150 +1,160 @@
package org.nl.wms.base_manage.material.service.dao;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* <p>
* 物料基本信息表
* </p>
*
* @author generator
* @since 2023-04-26
* @since 2024-04-22
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("bm_material")
public class BmMaterial implements Serializable {
@TableName("md_me_materialbase")
public class MdMeMaterialbase implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 车间
*/
private String product_area;
/**
* 物料标识
*/
@TableId
@TableId(value = "material_id")
private String material_id;
/**
* 物料编码
*/
private String material_code;
/**
* 物料名称
*/
private String material_name;
/**
* 车间
*/
private String product_area;
/**
* 规格
*/
private String material_spec;
/**
* 型号
*/
private String material_model;
/**
* 外文名称
*/
private String english_name;
/**
* 基本计量单位
*/
private String base_unit_id;
/**
* 辅助计量单位
*/
private String assist_unit_id;
/**
* 批准文号
*/
private String approve_fileno;
/**
* 工程图号
*/
private String print_no;
/**
* 物料分类标识
*/
private String material_type_id;
/**
* 长度单位
*/
private String len_unit_id;
/**
* 物料长度
*/
private BigDecimal length;
/**
* 物料宽度
*/
private BigDecimal width;
/**
* 物料高度
*/
private BigDecimal height;
/**
* 重量单位
*/
private String weight_unit_id;
/**
* 物料毛重
*/
private BigDecimal gross_weight;
/**
* 物料净重
*/
private BigDecimal net_weight;
/**
* 体积单位
*/
private String cubage_unit_id;
/**
* 物料体积
*/
private BigDecimal cubage;
/**
* 创建人
*/
private String create_id;
/**
* 创建人姓名
*/
private String create_name;
/**
* 创建时间
*/
private String create_time;
/**
* 修改人
*/
private String update_id;
/**
* 修改人姓名
*/
private String update_name;
/**
* 修改时间
*/
private String update_time;
/**
* 启用时间
*/
private String is_used_time;
/**
* 是否启用
*/
private Boolean is_used;
/**
* 是否删除
*/
private Boolean is_delete;
/**
* 外部标识
*/
private String ext_id;
}

9
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/mapper/BmMaterialMapper.java → wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/mapper/MdMeMaterialbaseMapper.java
View File

@@ -1,9 +1,7 @@
package org.nl.wms.base_manage.material.service.dao.mapper;
import org.nl.wms.base_manage.material.service.dao.MdMeMaterialbase;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.nl.common.domain.entity.PageQuery;
import org.nl.wms.base_manage.material.service.dao.BmMaterial;
import java.util.List;
import java.util.Map;
@@ -14,10 +12,9 @@ import java.util.Map;
* </p>
*
* @author generator
* @since 2023-04-26
* @since 2024-04-22
*/
public interface BmMaterialMapper extends BaseMapper<BmMaterial> {
public interface MdMeMaterialbaseMapper extends BaseMapper<MdMeMaterialbase> {
List<Map> queryAll(Map whereJson);
}

4
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/mapper/xml/BmMaterialMapper.xml → wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/mapper/xml/MdMeMaterialbaseMapper.xml
View File

@@ -1,7 +1,9 @@
<?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.base_manage.material.service.dao.mapper.BmMaterialMapper">
<mapper namespace="org.nl.wms.base_manage.material.service.dao.mapper.MdMeMaterialbaseMapper">
<select id="queryAll" resultType="java.util.Map">
SELECT
mb.*,
class.class_code,

5
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dto/MaterialQuery.java
View File

@@ -4,15 +4,14 @@ import lombok.Data;
import org.nl.common.domain.entity.BaseQuery;
import org.nl.common.domain.entity.QParam;
import org.nl.common.enums.QueryTEnum;
import org.nl.wms.sync_manage.service.field_mapping.dao.BmExternalFieldMapping;
import org.nl.wms.base_manage.material.service.dao.BmMaterial;
import org.nl.wms.base_manage.material.service.dao.MdMeMaterialbase;
/*
* @author ZZQ
* @Date 2023/5/4 19:49
*/
@Data
public class MaterialQuery extends BaseQuery<BmMaterial> {
public class MaterialQuery extends BaseQuery<MdMeMaterialbase> {
private String local_table_name;

55
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/impl/BmMaterialServiceImpl.java
View File

@@ -1,55 +0,0 @@
package org.nl.wms.base_manage.material.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.poi.excel.ExcelReader;
import cn.hutool.poi.excel.ExcelUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.nl.common.domain.exception.BadRequestException;
import org.nl.common.utils.IdUtil;
import org.nl.common.utils.SecurityUtils;
import org.nl.wms.base_manage.material.service.IBmMaterialService;
import org.nl.wms.base_manage.material.service.dao.BmMaterial;
import org.nl.wms.base_manage.material.service.dao.mapper.BmMaterialMapper;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* <p>
* 物料基本信息表 服务实现类
* </p>
*
* @author generator
* @since 2023-04-26
*/
@Service
public class BmMaterialServiceImpl extends ServiceImpl<BmMaterialMapper, BmMaterial> implements IBmMaterialService {
@Override
public List<Map> pageQuery(Map whereJson) {
return this.baseMapper.queryAll(whereJson);
}
@Override
public void create(BmMaterial entity) {
this.baseMapper.insert(entity);
}
@Override
public void excelImport(MultipartFile file, HttpServletRequest request, HttpServletResponse response) {
}
}

42
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/impl/MdMeMaterialbaseServiceImpl.java Normal file
View File

@@ -0,0 +1,42 @@
package org.nl.wms.base_manage.material.service.impl;
import org.nl.wms.base_manage.material.service.dao.MdMeMaterialbase;
import org.nl.wms.base_manage.material.service.dao.mapper.MdMeMaterialbaseMapper;
import org.nl.wms.base_manage.material.service.IMdMeMaterialbaseService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
* <p>
* 物料基本信息表 服务实现类
* </p>
*
* @author generator
* @since 2024-04-22
*/
@Service
public class MdMeMaterialbaseServiceImpl extends ServiceImpl<MdMeMaterialbaseMapper, MdMeMaterialbase> implements IMdMeMaterialbaseService {
@Override
public List<Map> pageQuery(Map whereJson) {
return this.baseMapper.queryAll(whereJson);
}
@Override
public void create(MdMeMaterialbase entity) {
this.baseMapper.insert(entity);
}
@Override
public void excelImport(MultipartFile file, HttpServletRequest request, HttpServletResponse response) {
}
}

10
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_inv/impl/AlmEarlyInvServiceImpl.java
View File

@@ -8,8 +8,8 @@ import org.apache.commons.lang3.StringUtils;
import org.nl.common.domain.exception.BadRequestException;
import org.nl.common.utils.IdUtil;
import org.nl.common.utils.SecurityUtils;
import org.nl.wms.base_manage.material.service.IBmMaterialService;
import org.nl.wms.base_manage.material.service.dao.BmMaterial;
import org.nl.wms.base_manage.material.service.IMdMeMaterialbaseService;
import org.nl.wms.base_manage.material.service.dao.MdMeMaterialbase;
import org.nl.wms.early_manage.service.AlmTypeEnum;
import org.nl.wms.early_manage.service.early_dtl.IAlmEarlyDtlService;
import org.nl.wms.early_manage.service.early_inv.dao.AlmEarlyInv;
@@ -36,7 +36,7 @@ import java.util.stream.Collectors;
public class AlmEarlyInvServiceImpl extends ServiceImpl<AlmEarlyInvMapper, AlmEarlyInv> implements IAlmEarlyInvService {
@Autowired
IBmMaterialService materialService;
IMdMeMaterialbaseService materialService;
@Autowired
IAlmEarlyDtlService iAlmEarlyDtlService;
@@ -66,8 +66,8 @@ public class AlmEarlyInvServiceImpl extends ServiceImpl<AlmEarlyInvMapper, AlmEa
if (StringUtils.isEmpty(material_type)){
throw new BadRequestException("根据类型筛选必须选择类型");
}
List<BmMaterial> list = materialService.list(new QueryWrapper<BmMaterial>().select("material_id").eq("material_type_id", material_type));
items = list.stream().map(BmMaterial::getMaterial_id).collect(Collectors.toList());
List<MdMeMaterialbase> list = materialService.list(new QueryWrapper<MdMeMaterialbase>().select("material_id").eq("material_type_id", material_type));
items = list.stream().map(MdMeMaterialbase::getMaterial_id).collect(Collectors.toList());
}else {
JSONArray item = param.getJSONArray("item");
items = item.toJavaList(String.class);

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

@@ -2,21 +2,22 @@ package org.nl.wms.stor_manage.controller.in;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.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.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 org.springframework.web.bind.annotation.*;
import java.lang.reflect.Type;
import java.util.List;
import java.util.Map;
/**
@@ -33,12 +34,33 @@ public class StIvtIostorinvInController {
@Autowired
IStIvtIostorinvInService iStIvtIostorinvInService;
@Autowired
IStIvtIostorinvdtlInService iStIvtIostorinvDtlInService;
@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);
Page<StIvtIostorinvIn> result = iStIvtIostorinvInService.page(page.build(), query.build());
return new ResponseEntity<>(TableDataInfo.build(result), HttpStatus.OK);
}
@PostMapping
public ResponseEntity<Object> save(@RequestBody JSONObject form) {
iStIvtIostorinvInService.save(form);
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("getIosInvDtl")
public ResponseEntity<Object> getDtl(@RequestBody String inv_id) {
List<Map> mapList = iStIvtIostorinvDtlInService.getByInv(inv_id);
//行转列：
mapList.forEach(a->{
Object form_data = a.get("form_data");
if (form_data!=null || form_data instanceof Map){
a.putAll((Map) form_data);
}
});
return new ResponseEntity<>(mapList,HttpStatus.OK);
}
}

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

@@ -1,5 +1,6 @@
package org.nl.wms.stor_manage.service.in.iostor;
import com.alibaba.fastjson.JSONObject;
import org.nl.wms.stor_manage.service.in.iostor.dao.StIvtIostorinvIn;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -13,4 +14,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IStIvtIostorinvInService extends IService<StIvtIostorinvIn> {
void save(JSONObject form);
}

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

@@ -1,7 +1,11 @@
package org.nl.wms.stor_manage.service.in.iostor.dao;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -15,7 +19,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("st_ivt_iostorinv_in")
@TableName(value = "st_ivt_iostorinv_in",autoResultMap = true)
public class StIvtIostorinvIn implements Serializable {
private static final long serialVersionUID = 1L;
@@ -82,7 +86,8 @@ public class StIvtIostorinvIn implements Serializable {
/**
* 自定义映射数据
*/
private String form_data;
@TableField(typeHandler = FastjsonTypeHandler.class)
private JSONObject form_data;
}

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

@@ -1,10 +1,24 @@
package org.nl.wms.stor_manage.service.in.iostor.impl;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.nl.common.enums.StatusEnum;
import org.nl.common.utils.CodeUtil;
import org.nl.common.utils.IdUtil;
import org.nl.common.utils.SecurityUtils;
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.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;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
/**
* <p>
@@ -17,4 +31,31 @@ import org.springframework.stereotype.Service;
@Service
public class StIvtIostorinvInServiceImpl extends ServiceImpl<StIvtIostorinvMapper, StIvtIostorinvIn> implements IStIvtIostorinvInService {
@Autowired
private IStIvtIostorinvdtlInService iStIvtIostorinvdtlInService;
@Override
@Transactional
public void save(JSONObject form) {
if (form==null){
return;
}
List<Map> dtls = (List<Map>) form.remove("tableData");
StIvtIostorinvIn mst = form.toJavaObject(StIvtIostorinvIn.class);
mst.setId(IdUtil.getStringId());
mst.setCreate_id(SecurityUtils.getCurrentUserId());
mst.setCreate_time(DateUtil.now());
mst.setCode(CodeUtil.getNewCode("IO_CODE"));
mst.setStatus(StatusEnum.FORM_STATUS.code("生成"));
if (dtls!=null && dtls.size()>0){
for (int i = 0; i < dtls.size(); i++) {
StIvtIostorinvdtlIn dtl = new JSONObject(dtls.get(i)).toJavaObject(StIvtIostorinvdtlIn.class);
dtl.setId(IdUtil.getStringId());
dtl.setInv_id(mst.getId());
dtl.setStatus(StatusEnum.FORM_STATUS.code("生成"));
iStIvtIostorinvdtlInService.save(dtl);
}
}
this.save(mst);
}
}

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

@@ -4,6 +4,7 @@ import org.nl.wms.stor_manage.service.in.iostor_dtl.dao.StIvtIostorinvdtlIn;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
import java.util.Map;
/**
* <p>
@@ -16,4 +17,6 @@ import java.util.List;
public interface IStIvtIostorinvdtlInService extends IService<StIvtIostorinvdtlIn> {
void batchInsert(List<StIvtIostorinvdtlIn> dtls);
List<Map> getByInv(String inv_id);
}

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

@@ -1,8 +1,13 @@
package org.nl.wms.stor_manage.service.in.iostor_dtl.dao;
import java.math.BigDecimal;
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -16,7 +21,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("st_ivt_iostorinvdtl_in")
@TableName(value = "st_ivt_iostorinvdtl_in",autoResultMap = true)
public class StIvtIostorinvdtlIn implements Serializable {
private static final long serialVersionUID = 1L;
@@ -24,22 +29,17 @@ public class StIvtIostorinvdtlIn implements Serializable {
/**
* 出入单明细标识
*/
private Long iostorinvdtl_id;
private String id;
/**
* 出入单标识
*/
private Long iostorinv_id;
/**
* 明细序号
*/
private BigDecimal seq_no;
private String inv_id;
/**
* 物料标识
*/
private Long material_id;
private String material_id;
/**
* 批次
@@ -54,47 +54,17 @@ public class StIvtIostorinvdtlIn implements Serializable {
/**
* 单据明细状态
*/
private String bill_status;
private String status;
/**
* 数量计量单位标识
*/
private Long qty_unit_id;
/**
* 数量计量单位名称
*/
private String qty_unit_name;
private String qty_unit_id;
/**
* 数量
*/
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 qty;
/**
* 已分配数量
@@ -106,5 +76,29 @@ public class StIvtIostorinvdtlIn implements Serializable {
*/
private BigDecimal unassign_qty;
/**
* 备注
*/
private String remark;
/**
* 备注
*/
private String shipper;
/**
* 备注
*/
private String stor_code;
/**
* 备注
*/
private BigDecimal single_wt;
@TableField(typeHandler = FastjsonTypeHandler.class)
private JSONObject form_data;
}

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

@@ -4,6 +4,7 @@ import org.nl.wms.stor_manage.service.in.iostor_dtl.dao.StIvtIostorinvdtlIn;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
import java.util.Map;
/**
* <p>
@@ -17,4 +18,6 @@ public interface StIvtIostorinvdtlInMapper extends BaseMapper<StIvtIostorinvdtlI
Integer batchInsert(List<StIvtIostorinvdtlIn> dtls);
List<Map> findByInv(String inv_id);
}

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

@@ -4,7 +4,17 @@
<insert id="batchInsert">
insert into st_ivt_iostorinvdtl() values <foreach collection="dtls" open="(" close=")" item="item">
</foreach>
</insert>
<select id="findByInv" resultType="java.util.Map">
SELECT
st_ivt_iostorinvdtl_in.*,
md_me_materialbase.material_code,
md_me_materialbase.material_name,
md_me_materialbase.material_spec
FROM
st_ivt_iostorinvdtl_in
LEFT JOIN md_me_materialbase ON st_ivt_iostorinvdtl_in.material_id = md_me_materialbase.material_id
where inv_id = #{inv_id}
</select>
</mapper>

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

@@ -1,12 +1,17 @@
package org.nl.wms.stor_manage.service.in.iostor_dtl.impl;
import org.apache.commons.lang3.StringUtils;
import org.nl.common.utils.ListOf;
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.nl.wms.stor_manage.service.out.iostor_dtl.IStIvtIostorinvdtlOutService;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* <p>
@@ -17,11 +22,20 @@ import java.util.List;
* @since 2024-03-29
*/
@Service
public class StIvtIostorinvdtlInServiceImpl extends ServiceImpl<StIvtIostorinvdtlInMapper, StIvtIostorinvdtlIn> implements IStIvtIostorinvdtlOutService {
public class StIvtIostorinvdtlInServiceImpl extends ServiceImpl<StIvtIostorinvdtlInMapper, StIvtIostorinvdtlIn> implements IStIvtIostorinvdtlInService {
@Override
public void batchInsert(List<StIvtIostorinvdtlIn> dtls) {
this.baseMapper.batchInsert(dtls);
}
@Override
public List<Map> getByInv(String inv_id) {
if (StringUtils.isEmpty(inv_id)){
return new ArrayList<>();
}
return this.baseMapper.findByInv(inv_id);
}
}

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

@@ -1,10 +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_dtl.dao.mapper.StIvtIostorinvdtlInMapper">
<mapper namespace="org.nl.wms.stor_manage.service.in.iostor_dtl.dao.mapper.StIvtIostorinvdtlOutMapper">
<insert id="batchInsert">
insert into st_ivt_iostorinvdtl() values <foreach collection="dtls" open="(" close=")" item="item">
</foreach>
</insert>
</mapper>

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

@@ -4,9 +4,11 @@ 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.nl.wms.stor_manage.service.out.iostor_dtl.IStIvtIostorinvdtlOutService;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
* <p>
@@ -17,11 +19,12 @@ import java.util.List;
* @since 2024-03-29
*/
@Service
public class StIvtIostorinvdtlOutServiceImpl extends ServiceImpl<StIvtIostorinvdtlInMapper, StIvtIostorinvdtlIn> implements IStIvtIostorinvdtlInService {
public class StIvtIostorinvdtlOutServiceImpl extends ServiceImpl<StIvtIostorinvdtlInMapper, StIvtIostorinvdtlIn> implements IStIvtIostorinvdtlOutService {
@Override
public void batchInsert(List<StIvtIostorinvdtlIn> dtls) {
this.baseMapper.batchInsert(dtls);
}
}