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

opt:物料基础功能wql改成mybatis plus

Browse Source
This commit is contained in:
zds
2024-10-15 15:19:05 +08:00
parent 60422a9884
commit f69678e3ae
22 changed files with 466 additions and 986 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java
View File

@@ -2,19 +2,16 @@ package org.nl.b_lms.bst.ivt.stockingivt.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.b_lms.bst.ivt.papervehicle.service.IMdPbPapervehicleService;
import org.nl.b_lms.bst.ivt.papervehicle.service.dao.MdPbPapervehicle;
import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant;
import org.nl.b_lms.sch.tasks.slitter.service.SlitterService;
import org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.common.domain.query.PageQuery;
@@ -22,8 +19,8 @@ import org.nl.common.utils.SecurityUtils;
import org.nl.b_lms.bst.ivt.stockingivt.service.IBstIvtStockingivtService;
import org.nl.b_lms.bst.ivt.stockingivt.service.dao.mapper.BstIvtStockingivtMapper;
import org.nl.b_lms.bst.ivt.stockingivt.service.dao.BstIvtStockingivt;
import org.nl.wms.basedata.master.service.MaterialbaseService;
import org.nl.wms.basedata.master.service.dto.MaterialbaseDto;
import org.nl.wms.basedata.master.materialbase.service.dao.Materialbase;
import org.nl.wms.basedata.master.materialbase.service.dao.mapper.MaterialbaseMapper;
import org.nl.wms.ext.acs.service.WmsToAcsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
@@ -49,7 +46,7 @@ public class BstIvtStockingivtServiceImpl extends ServiceImpl<BstIvtStockingivtM
@Autowired
private WmsToAcsService wmsToAcsService;
@Autowired
private MaterialbaseService materialbaseService;
private MaterialbaseMapper materialbaseMapper;
@Override
public IPage<BstIvtStockingivt> queryAll(Map whereJson, PageQuery page) {
@@ -133,9 +130,12 @@ public class BstIvtStockingivtServiceImpl extends ServiceImpl<BstIvtStockingivtM
//1-绑定；2-清除
String type = jsonObject.getString("type");
if (type.equals("1")) {
//
MaterialbaseDto mater = materialbaseService.findByCode(material_code);
String material_name = mater.getMaterial_name();
//查询物料
LambdaQueryWrapper<Materialbase> lam = new LambdaQueryWrapper<Materialbase>();
lam.eq(Materialbase::getMaterial_code,material_code);
lam.eq(Materialbase::getIs_delete,"0");
Materialbase materialbase = materialbaseMapper.selectOne(lam);
String material_name = materialbase.getMaterial_name();
//查询当前载具和排是否存在库存
MdPbPapervehicle papervehicle = PapervehicleService.getOne(new LambdaQueryWrapper<MdPbPapervehicle>().eq(MdPbPapervehicle::getVehicle_code, vehicle_code)

1
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/customer/service/impl/CustomerbaseServiceImpl.java
View File

@@ -40,6 +40,7 @@ public class CustomerbaseServiceImpl extends ServiceImpl<CustomerbaseMapper, Cus
LambdaQueryWrapper<Customerbase> lam = new LambdaQueryWrapper<Customerbase>();
lam.eq(ObjectUtil.isNotEmpty(whereJson.getIs_used()), Customerbase::getIs_used, whereJson.getIs_used())
.eq(Customerbase::getIs_delete, "0")
.and(ObjectUtil.isNotEmpty(whereJson.getSearch()),blam -> blam.like(Customerbase::getCust_name, whereJson.getSearch()).or()
.like(Customerbase::getCust_code, whereJson.getSearch()))
.orderByDesc(Customerbase::getCust_code);

56
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/materialbase/controller/MaterialbaseController.java Normal file
View File

@@ -0,0 +1,56 @@
package org.nl.wms.basedata.master.materialbase.controller;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.TableDataInfo;
import org.nl.common.domain.query.PageQuery;
import org.nl.modules.logging.annotation.Log;
import org.nl.wms.basedata.master.materialbase.service.dao.Materialbase;
import org.nl.wms.basedata.master.materialbase.service.dto.MaterialbaseQuery;
import org.nl.wms.basedata.master.materialbase.service.MaterialbaseService;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
/**
* @author zhouz
* @date 2021-12-07
**/
@RestController
@RequiredArgsConstructor
@RequestMapping("/api/Materialbase")
@Slf4j
public class MaterialbaseController {
private final MaterialbaseService materialBaseService;
@GetMapping
@Log("查询物料")
public ResponseEntity<Object> query(MaterialbaseQuery whereJson, PageQuery page) {
return new ResponseEntity<>(TableDataInfo.build(materialBaseService.queryAll(whereJson, page)), HttpStatus.OK);
}
@PostMapping
@Log("新增物料")
public ResponseEntity<Object> create(@Validated @RequestBody Materialbase dto) {
materialBaseService.create(dto);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@PutMapping
@Log("修改物料")
public ResponseEntity<Object> update(@Validated @RequestBody Materialbase dto) {
materialBaseService.update(dto);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@Log("删除物料")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
materialBaseService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
}

46
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/materialbase/service/MaterialbaseService.java Normal file
View File

@@ -0,0 +1,46 @@
package org.nl.wms.basedata.master.materialbase.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.basedata.master.materialbase.service.dao.Materialbase;
import org.nl.wms.basedata.master.materialbase.service.dto.MaterialbaseQuery;
/**
* @author zhouz
* @description 服务接口
* @date 2021-12-07
**/
public interface MaterialbaseService extends IService<Materialbase> {
/**
* 查询数据分页
*
* @param whereJson 条件
* @param page 分页参数
* @return Map<String, Object>
*/
IPage<Materialbase> queryAll(MaterialbaseQuery whereJson, PageQuery page);
/**
* 创建
*
* @param dto /
*/
void create(Materialbase dto);
/**
* 编辑
*
* @param dto /
*/
void update(Materialbase dto);
/**
* 多选删除
*
* @param ids /
*/
void deleteAll(Long[] ids);
}

51
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/materialbase/service/dao/Materialbase.java Normal file
View File

@@ -0,0 +1,51 @@
package org.nl.wms.basedata.master.materialbase.service.dao;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
/**
* @author: zds
* @date: 2024-09-27
* @description:
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("md_me_materialbase")
public class Materialbase implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "material_id", type = IdType.NONE)
private String material_id;
//物料编码
private String material_code;
//物料名称
private String material_name;
//基本计量单位
private String base_unit_id;
//创建人
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;
//是否删除
private String is_delete;
@TableField(exist = false)
private String unit_name;
}

67
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/materialbase/service/dao/MaterialbaseProc.java Normal file
View File

@@ -0,0 +1,67 @@
package org.nl.wms.basedata.master.materialbase.service.dao;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
/**
* @author: zds
* @date: 2024-09-27
* @description:
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("md_me_materialbaseproc")
public class MaterialbaseProc implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.NONE)
private String id;
//物料编码
private String MATNR;
//物料名称
private String MATNR01;
//基本计量单位
private String ERSDA;
//创建人
private String MATFI;
//创建人姓名
private String MTART;
//创建时间
private String MEINS;
//修改人
private String MATKL;
//修改人姓名
private String NTGEW;
//修改时间
private String GROES;
//是否启用
private String WERKS;
//是否删除
private String DISPO;
private String BESKZ;
private String RGEKZ;
private String PRGRP;
private String ZRESERVE1;
private String ZRESERVE2;
private String ZRESERVE3;
private String ZRESERVE4;
private String ZRESERVE5;
private String create_time;
}

19
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/materialbase/service/dao/mapper/MaterialbaseMapper.java Normal file
View File

@@ -0,0 +1,19 @@
package org.nl.wms.basedata.master.materialbase.service.dao.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.nl.wms.basedata.master.materialbase.service.dao.Materialbase;
import org.nl.wms.basedata.master.materialbase.service.dto.MaterialbaseQuery;
/**
* @author: zds
* @date: 2024-09-27
* @description:
*/
public interface MaterialbaseMapper extends BaseMapper<Materialbase> {
/**
* 分页查找
* @return
*/
IPage<Materialbase> queryMaterialbase(IPage<Materialbase> pages, MaterialbaseQuery query);
}

22
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/materialbase/service/dao/mapper/MaterialbaseMapper.xml Normal file
View File

@@ -0,0 +1,22 @@
<?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.basedata.master.materialbase.service.dao.mapper.MaterialbaseMapper">
<select id="queryMaterialbase" resultType="org.nl.wms.basedata.master.materialbase.service.dao.Materialbase">
SELECT
mater.*,
unit.unit_name
FROM
md_me_materialbase mater
LEFT JOIN md_pb_measureunit unit on unit.measure_unit_id = mater.base_unit_id
WHERE 1=1
and mater.is_delete = '0'
<if test="query.search != null">
and (mater.material_code like CONCAT('%', #{query.search}, '%') or mater.material_name like CONCAT('%', #{query.search}, '%'))
</if>
<if test="query.is_used != null">
and mater.is_used = #{query.is_used}
</if>
ORDER BY mater.material_code
</select>
</mapper>

18
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/materialbase/service/dto/MaterialbaseQuery.java Normal file
View File

@@ -0,0 +1,18 @@
package org.nl.wms.basedata.master.materialbase.service.dto;
import lombok.Data;
import java.io.Serializable;
/**
* @author: zds
* @date: 2024-09-27
* @description:
*/
@Data
public class MaterialbaseQuery implements Serializable {
//编码或名称
private String search;
//是否启用
private String is_used;
}

115
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/materialbase/service/impl/MaterialbaseServiceImpl.java Normal file
View File

@@ -0,0 +1,115 @@
package org.nl.wms.basedata.master.materialbase.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.utils.SecurityUtils;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.wms.basedata.master.materialbase.service.dao.Materialbase;
import org.nl.wms.basedata.master.materialbase.service.dao.mapper.MaterialbaseMapper;
import org.nl.wms.basedata.master.materialbase.service.dto.MaterialbaseQuery;
import org.nl.wms.basedata.master.materialbase.service.MaterialbaseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
* @author zhouz
* @description 服务实现
* @date 2021-12-07
**/
@Service
@Slf4j
public class MaterialbaseServiceImpl extends ServiceImpl<MaterialbaseMapper, Materialbase> implements MaterialbaseService {
@Autowired
private MaterialbaseMapper materialbaseMapper;
@Override
public IPage<Materialbase> queryAll(MaterialbaseQuery whereJson, PageQuery pageQuery) {
String search = whereJson.getSearch();
if (!StrUtil.isEmpty(search)) {
//处理转义字符
if (search.contains("\\")) {
search = search.replace("\\", "\\\\\\");
}
}
whereJson.setSearch(search);
IPage<Materialbase> pages = new Page<>(pageQuery.getPage() + 1, pageQuery.getSize());
pages = materialbaseMapper.queryMaterialbase(pages, whereJson);
return pages;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void create(Materialbase dto) {
LambdaQueryWrapper<Materialbase> lam = new LambdaQueryWrapper<Materialbase>();
lam.eq(Materialbase::getMaterial_code,dto.getMaterial_code());
lam.eq(Materialbase::getIs_delete,"0");
Materialbase materialbase = materialbaseMapper.selectOne(lam);
if (ObjectUtil.isNotEmpty(materialbase)) {
throw new BadRequestException("已存在相同的物料编号！");
}
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
dto.setMaterial_id(IdUtil.getSnowflake(1, 1).nextId()+"");
dto.setCreate_id(currentUserId);
dto.setCreate_name(nickName);
dto.setCreate_time(now);
materialbaseMapper.insert(dto);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(Materialbase dto) {
LambdaQueryWrapper<Materialbase> lam = new LambdaQueryWrapper<Materialbase>();
lam.eq(Materialbase::getMaterial_code,dto.getMaterial_code());
lam.eq(Materialbase::getIs_delete,"0");
lam.ne(Materialbase::getMaterial_id,dto.getMaterial_id());
Materialbase materialbase = materialbaseMapper.selectOne(lam);
if (ObjectUtil.isNotEmpty(materialbase)) {
throw new BadRequestException("已存在相同的物料编号！");
}
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
dto.setUpdate_time(now);
dto.setUpdate_id(currentUserId);
dto.setUpdate_name(nickName);
materialbaseMapper.updateById(dto);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteAll(Long[] ids) {
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
//设置更新条件
LambdaUpdateWrapper<Materialbase> lam = new LambdaUpdateWrapper<Materialbase>();
lam.in(Materialbase::getMaterial_id,ids);
lam.set(Materialbase::getIs_delete, "1");
lam.set(Materialbase::getUpdate_id, currentUserId);
lam.set(Materialbase::getUpdate_name, nickName);
lam.set(Materialbase::getUpdate_time, now);
materialbaseMapper.update(null,lam);
}
}

91
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/MaterialbaseController.java
View File

@@ -1,91 +0,0 @@
package org.nl.wms.basedata.master.rest;
import cn.hutool.core.map.MapUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.logging.annotation.Log;
import org.nl.wms.basedata.master.constant.MaterOptTypeEnum;
import org.nl.wms.basedata.master.service.MaterialbaseService;
import org.nl.wms.basedata.master.service.dto.MaterialbaseDto;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
/**
* @author zhouz
* @date 2021-12-07
**/
@RestController
@RequiredArgsConstructor
@RequestMapping("/api/Materialbase")
@Slf4j
public class MaterialbaseController {
private final MaterialbaseService materialBaseService;
@GetMapping
@Log("查询物料")
//@PreAuthorize("@el.check('Materialbase:list')")
public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
return new ResponseEntity<>(materialBaseService.queryAll(whereJson, page), HttpStatus.OK);
}
@PostMapping
@Log("新增物料")
//@PreAuthorize("@el.check('Materialbase:add')")
public ResponseEntity<Object> create(@Validated @RequestBody MaterialbaseDto dto) {
materialBaseService.create(dto);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@PutMapping
@Log("修改物料")
//@PreAuthorize("@el.check('Materialbase:edit')")
public ResponseEntity<Object> update(@Validated @RequestBody MaterialbaseDto dto) {
materialBaseService.update(dto);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@Log("删除物料")
//@PreAuthorize("@el.check('Materialbase:del')")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
materialBaseService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
@Log("判断物料操作类型")
@PostMapping("/isAlongMaterType")
public ResponseEntity<Object> isAlongMaterType(@RequestBody Map map) {
String materOpt_code = MapUtil.getStr(map, "materOpt_code");
String material_id = MapUtil.getStr(map, "material_id");
String material_type_id = MapUtil.getStr(map, "material_type_id");
return new ResponseEntity<>(materialBaseService.isAlongMaterType(materOpt_code, material_id, material_type_id), HttpStatus.OK);
}
@Log("查询物料操作类型")
@PostMapping("/getMaterOptType")
public ResponseEntity<Object> getMaterOptType(@RequestBody Map map) {
String materOpt_code = MapUtil.getStr(map, "materOpt_code");
return new ResponseEntity<>(MaterOptTypeEnum.getObj(materOpt_code), HttpStatus.OK);
}
@Log("查询产品系列类型")
@GetMapping("/getProductSeries")
public ResponseEntity<Object> getProductSeries() {
return new ResponseEntity<>(materialBaseService.getProductSeries("1527572574832300032"), HttpStatus.OK);
}
}

94
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/MaterialbaseService.java
View File

@@ -1,94 +0,0 @@
package org.nl.wms.basedata.master.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.nl.wms.basedata.master.service.dto.MaterialbaseDto;
import org.springframework.data.domain.Pageable;
import java.util.List;
import java.util.Map;
/**
* @author zhouz
* @description 服务接口
* @date 2021-12-07
**/
public interface MaterialbaseService {
/**
* 查询数据分页
*
* @param whereJson 条件
* @param page 分页参数
* @return Map<String, Object>
*/
Map<String, Object> queryAll(Map whereJson, Pageable page);
/**
* 查询所有数据不分页
*
* @param whereJson 条件参数
* @return List<MaterialbaseDto>
*/
List<MaterialbaseDto> queryAll(Map whereJson);
/**
* 根据ID查询
*
* @param material_id ID
* @return Materialbase
*/
MaterialbaseDto findById(Long material_id);
/**
* 根据编码查询
*
* @param code code
* @return Materialbase
*/
MaterialbaseDto findByCode(String code);
/**
* 创建
*
* @param dto /
*/
void create(MaterialbaseDto dto);
/**
* 编辑
*
* @param dto /
*/
void update(MaterialbaseDto dto);
/**
* 多选删除
*
* @param ids /
*/
void deleteAll(Long[] ids);
/**
* 根据物料标识或类型判断物料类型：对应MaterOptTypeEnum类定义的类型
*
* @param material_id
* @param material_type_id
* @param materOpt_code
* @return
*/
boolean isAlongMaterType(String materOpt_code, String material_id, String material_type_id);
/**
* 根据编码获取物料操作类型
*
* @param materOpt_code MaterOptTypeEnum
* @return
*/
JSONObject getMaterOptType(String materOpt_code);
JSONArray getProductSeries(String parent_class_id);
}

105
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/MaterialbaseDto.java
View File

@@ -1,105 +0,0 @@
package org.nl.wms.basedata.master.service.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* @author zhouz
* @description /
* @date 2021-12-07
**/
@Data
public class MaterialbaseDto implements Serializable {
/**
* 防止精度丢失
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long material_id;
/**
* 物料编码
*/
private String material_code;
/**
* 物料名称
*/
private String material_name;
private String material_spec;
private String material_model;
private String english_name;
private long base_unit_id;
private long assist_unit_id;
private String base_unit_name;
private String approve_fileno;
private String print_no;
/**
* 物料分类
*/
private Long material_type_id;
private Long len_unit_id;
private BigDecimal length;
private BigDecimal width;
private BigDecimal height;
/**
* 计量单位
*/
private Long weight_unit_id;
private BigDecimal gross_weight;
private BigDecimal net_weight;
private Long cubage_unit_id;
private BigDecimal cubage;
private String create_id;
private String create_name;
private String create_time;
private String update_optid;
private String update_optname;
private String update_time;
private String is_used_time;
/**
* 是否启用
*/
private String is_used;
private String is_delete;
private String ext_id;
private String material_height_type;
private Long ass_unit_id;
private Long product_series;
private Integer standing_time;
}

242
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java
View File

@@ -1,242 +0,0 @@
package org.nl.wms.basedata.master.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.utils.SecurityUtils;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.basedata.master.constant.MaterOptTypeEnum;
import org.nl.wms.basedata.master.service.ClassstandardService;
import org.nl.wms.basedata.master.service.MaterialbaseService;
import org.nl.wms.basedata.master.service.dto.MaterialbaseDto;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* @author zhouz
* @description 服务实现
* @date 2021-12-07
**/
@Service
@RequiredArgsConstructor
@Slf4j
public class MaterialbaseServiceImpl implements MaterialbaseService {
private final ClassstandardService classstandardService;
@Override
public Map<String, Object> queryAll(Map whereJson, Pageable page) {
String search = MapUtil.getStr(whereJson, "search");
//只查询木箱
String box = MapUtil.getStr(whereJson, "box");
//物料限制的时候使用，初始化页面
String class_idStr = MapUtil.getStr(whereJson, "class_idStr");
String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
String class_code = MapUtil.getStr(whereJson, "class_code");
String ids = MapUtil.getStr(whereJson, "ids");
HashMap<String, String> map = new HashMap<>();
map.put("flag", "1");
if (!StrUtil.isEmpty(search)) {
//处理转义字符
if (search.contains("\\")) {
search = search.replace("\\", "\\\\\\");
}
map.put("search", "%" + search + "%");
}
if (!StrUtil.isEmpty(box)) {
//处理转义字符
if (box.contains("\\")) {
box = box.replace("\\", "\\\\\\");
}
map.put("box", "%" + box + "%");
}
//处理物料当前节点的所有子节点
if (!StrUtil.isEmpty(material_type_id)) {
map.put("material_type_id", material_type_id);
String classIds = classstandardService.getChildIdStr(material_type_id);
map.put("classIds", classIds);
} else if (ObjectUtil.isNotEmpty(class_idStr)) {
String classIds = classstandardService.getAllChildIdStr(class_idStr);
map.put("classIds", classIds);
}
if (!StrUtil.isEmpty(class_code)) {
map.put("class_code", class_code + "%");
}
StringBuffer where = new StringBuffer();
if (StrUtil.isNotEmpty(ids)) {
ids = ids.replaceAll("\'", "");
String[] strs = ids.split(",");
where.append("(");
for (int i = 0; i < strs.length; ) {
where.append("class.class_code like '" + strs[i] + "%'");
i++;
if (i < strs.length) {
where.append(" or ");
}
}
where.append(")");
map.put("idssql", where.toString());
} else {
map.put("idssql", "1=1");
}
JSONObject jo = WQL.getWO("QMD_ME_MATERIAL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "material_id");
return jo;
}
@Override
public List<MaterialbaseDto> queryAll(Map whereJson) {
WQLObject wo = WQLObject.getWQLObject("md_me_materialbase");
JSONArray arr = wo.query().getResultJSONArray(0);
List<MaterialbaseDto> list = arr.toJavaList(MaterialbaseDto.class);
return list;
}
@Override
public MaterialbaseDto findById(Long material_id) {
WQLObject wo = WQLObject.getWQLObject("md_me_materialbase");
JSONObject json = wo.query("material_id =" + material_id + "").uniqueResult(0);
String unit_name = WQLObject.getWQLObject("md_pb_measureunit").query("measure_unit_id= '" + json.getString("base_unit_id") + "'").uniqueResult(0).getString("unit_name");
json.put("base_unit_name", unit_name);
final MaterialbaseDto obj = json.toJavaObject(MaterialbaseDto.class);
return obj;
}
@Override
public MaterialbaseDto findByCode(String code) {
WQLObject wo = WQLObject.getWQLObject("md_me_materialbase");
if (StrUtil.isNotEmpty(code) && code.contains("\\")) {
code = code.replace("\\", "\\\\");
}
JSONObject json = wo.query("material_code ='" + code + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(json)) {
return null;
}
String unit_name = WQLObject.getWQLObject("md_pb_measureunit").query("measure_unit_id= '" + json.getString("base_unit_id") + "'").uniqueResult(0).getString("unit_name");
json.put("base_unit_name", unit_name);
final MaterialbaseDto obj = json.toJavaObject(MaterialbaseDto.class);
return obj;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void create(MaterialbaseDto dto) {
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
dto.setMaterial_id(IdUtil.getSnowflake(1, 1).nextId());
dto.setCreate_id(currentUserId);
dto.setCreate_name(nickName);
dto.setUpdate_optid(currentUserId);
dto.setUpdate_optname(nickName);
dto.setUpdate_time(now);
dto.setCreate_time(now);
WQLObject wo = WQLObject.getWQLObject("md_me_materialbase");
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
wo.insert(json);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(MaterialbaseDto dto) {
MaterialbaseDto entity = this.findById(dto.getMaterial_id());
if (entity == null) {
throw new BadRequestException("被删除或无权限，操作失败!");
}
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
dto.setUpdate_time(now);
dto.setUpdate_optid(currentUserId);
dto.setUpdate_optname(nickName);
WQLObject wo = WQLObject.getWQLObject("md_me_materialbase");
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
wo.update(json);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteAll(Long[] ids) {
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
WQLObject wo = WQLObject.getWQLObject("md_me_materialbase");
for (Long material_id : ids) {
JSONObject param = new JSONObject();
param.put("material_id", String.valueOf(material_id));
param.put("is_delete", "1");
param.put("update_optid", currentUserId);
param.put("update_optname", nickName);
param.put("update_time", now);
wo.update(param);
}
}
@Override
public boolean isAlongMaterType(String materOpt_code, String material_id, String material_type_id) {
if (ObjectUtil.isNotEmpty(material_id)) {
Long long_mater = Long.parseLong(material_id);
material_type_id = this.findById(long_mater).getMaterial_type_id() + "";
}
if (ObjectUtil.isEmpty(material_type_id)) {
throw new BadRequestException("物料类型不能为空!");
}
String class_idStr = MaterOptTypeEnum.getObj(materOpt_code).getString("class_idStr");
Set<String> set = classstandardService.getAllChildIdSet(class_idStr);
if (ObjectUtil.isNotEmpty(set)) {
return set.contains(material_type_id);
}
return false;
}
@Override
public JSONObject getMaterOptType(String materOpt_code) {
return MaterOptTypeEnum.getObj(materOpt_code);
}
@Override
public JSONArray getProductSeries(String parent_class_id) {
WQLObject wo = WQLObject.getWQLObject("MD_PB_ClassStandard");
JSONArray parentArray = wo.query("is_delete = '0' and parent_class_id = '" + parent_class_id + "'").getResultJSONArray(0);
JSONArray newParentArray = new JSONArray();
for (int i = 0; i < parentArray.size(); i++) {
JSONObject parentMap = parentArray.getJSONObject(i);
JSONObject newParentMap = new JSONObject();
JSONArray children = this.getProductSeries(parentMap.getString("class_id"));
newParentMap.put("children", children);
newParentMap.put("label", parentMap.getString("class_name"));
newParentMap.put("id", parentMap.getString("class_id"));
newParentArray.add(newParentMap);
}
return newParentArray;
}
}

73
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_MATERIAL.wql
View File

@@ -1,73 +0,0 @@
[交易说明]
交易名： 物料分页查询
所属模块：
功能简述：
版权所有：
表引用：
版本经历：
[数据库]
--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
[IO定义]
#################################################
## 表字段对应输入参数
#################################################
输入.flag TYPEAS s_string
输入.search TYPEAS s_string
输入.box TYPEAS s_string
输入.class_code TYPEAS s_string
输入.idssql TYPEAS f_string
输入.classIds TYPEAS f_string
[临时表]
--这边列出来的临时表就会在运行期动态创建
[临时变量]
--所有中间过程变量均可在此处定义
[业务过程]
##########################################
# 1、输入输出检查 #
##########################################
##########################################
# 2、主过程前处理 #
##########################################
##########################################
# 3、业务主过程 #
##########################################
IF 输入.flag = "1"
PAGEQUERY
SELECT
mb.*,
unit_name,
unit_name as base_unit_id_name
FROM
md_me_materialbase mb
LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = mb.base_unit_id
WHERE
mb.is_delete = '0'
OPTION 输入.search <> ""
(
mb.material_code like 输入.search
OR
mb.material_name like 输入.search
)
ENDOPTION
OPTION 输入.box <> ""
(
mb.material_name like 输入.box
)
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF

13
lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java
View File

@@ -10,10 +10,13 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.wms.basedata.master.customer.service.dao.mapper.CustomerbaseMapper;
import org.nl.wms.basedata.master.customer.service.dao.mapper.CustomerbaseProcMapper;
import org.nl.wms.ext.sap.service.SapToLmsService;
import org.nl.wms.st.inbill.service.CheckOutBillService;
import org.nl.wms.st.inbill.service.RawAssistIStorService;
import org.nl.wms.st.instor.service.RecutPlanService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -33,7 +36,6 @@ public class SapToLmsServiceImpl implements SapToLmsService {
private final RecutPlanService recutPlanService;
public JSONObject getReCutInfo2(JSONObject json) {
log.info("getReCutInfo的输入参数为：------------------------" + json.toString());
@@ -273,11 +275,14 @@ public class SapToLmsServiceImpl implements SapToLmsService {
if (StrUtil.isEmpty(MATNR)) {
throw new BadRequestException("物料编码不能为空！");
}
JSONObject mater_jo = WQLObject.getWQLObject("md_me_materialbaseext").query("MATNR ='" + MATNR + "'").uniqueResult(0);
JSONObject mater_jo = WQLObject.getWQLObject("md_me_materialbaseproc").query("MATNR ='" + MATNR + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(mater_jo)) {
WQLObject.getWQLObject("md_me_materialbaseext").insert(row);
row.put("id",IdUtil.getSnowflake(1, 1).nextId());
row.put("create_time", DateUtil.now());
WQLObject.getWQLObject("md_me_materialbaseproc").insert(row);
} else {
WQLObject.getWQLObject("md_me_materialbaseext").update(row);
row.put("create_time", DateUtil.now());
WQLObject.getWQLObject("md_me_materialbaseproc").update(row);
}
JSONObject base_jo = WQLObject.getWQLObject("md_me_materialbase").query("material_code = '" + MATNR + "'").uniqueResult(0);

301
lms/nladmin-ui/src/views/wms/basedata/master/material/index.vue
View File

@@ -1,24 +1,8 @@
<template>
<div v-loading.fullscreen.lock="fullscreenLoading" class="app-container">
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<el-row>
<el-col :span="8">
<el-row>
<el-col :span="7">
<span style="line-height:36px;text-align: center">物料类别：</span>
</el-col>
<el-col :span="12">
<treeselect
v-model="query.material_type_id"
:load-options="loadChildNodes"
:options="classes1"
style="width: 200px;"
placeholder="请选择"
/>
</el-col>
</el-row>
</el-col>
<el-col :span="8">
模糊查询：
<el-input
@@ -36,84 +20,43 @@
</el-col>
</el-row>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation/>
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="1200px"
width="500px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
<el-row>
<el-col :span="8">
<el-form-item label="物料编码" prop="material_code">
<el-input v-model="form.material_code" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料名称" prop="material_name">
<el-input v-model="form.material_name" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="规格" prop="material_spec">
<label slot="label">规&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格</label>
<el-input v-model="form.material_spec" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="型号" prop="material_model">
<label slot="label">型&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
<el-input v-model="form.material_model" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="外部标识" prop="ext_id">
<el-input v-model="form.ext_id" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料分类" prop="material_type_id">
<treeselect
v-model="form.material_type_id"
:load-options="loadChildNodes"
:options="classes2"
style="width: 200px;"
placeholder="请选择"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="产品系列">
<treeselect
v-model="form.product_series"
:options="classes3"
:auto-load-root-options="false"
:load-options="loadChildNodes"
style="width: 200px;"
placeholder="请选择"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="静置时间" prop="standing_time">
<el-input-number v-model="form.standing_time" :controls="false" :min="0" label="分钟" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否启用" prop="is_used">
<el-radio v-model="form.is_used" label="0">否</el-radio>
<el-radio v-model="form.is_used" label="1">是</el-radio>
</el-form-item>
</el-col>
</el-row>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="物料编码" prop="material_code">
<el-input v-model="form.material_code" style="width: 200px;" />
</el-form-item>
<el-form-item label="物料名称" prop="material_name">
<el-input v-model="form.material_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="物料单位" prop="base_unit_id">
<el-select
v-model="form.base_unit_id"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
style="width: 210px"
>
<el-option
v-for="item in measure_unit"
:key="item.measure_unit_id"
:label="item.unit_name"
:value="item.measure_unit_id"
/>
</el-select>
</el-form-item>
<el-form-item label="是否启用" prop="is_used">
<el-radio v-model="form.is_used" label="0">否</el-radio>
<el-radio v-model="form.is_used" label="1">是</el-radio>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
@@ -129,14 +72,9 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column prop="material_code" label="物料编码" width="160" />
<el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
<el-table-column prop="material_spec" label="物料规格" width="140" />
<el-table-column prop="material_model" label="物料型号" />
<el-table-column prop="class_name" label="物料分类" width="140" />
<el-table-column prop="unit_name" label="计量单位" />
<el-table-column prop="standing_time" label="静置时间（分钟）" width="130px" />
<el-table-column prop="product_series_name" label="系列" />
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
<el-table-column prop="unit_name" label="计量单位" :min-width="flexWidth('unit_name',crud.data,'计量单位')" />
<el-table-column label="启用" align="center" prop="is_used">
<template slot-scope="scope">
<el-switch
@@ -149,10 +87,10 @@
/>
</template>
</el-table-column>
<el-table-column prop="update_optname" label="修改人" />
<el-table-column prop="update_time" label="修改时间" width="135" />
<el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
<el-table-column
v-permission="['admin','Materialbase:edit','Materialbase:del']"
v-permission="['admin','material:edit','material:del']"
fixed="right"
label="操作"
width="120px"
@@ -179,50 +117,22 @@ import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import crudClassstandard from '@/views/wms/basedata/master/customer/customerbase'
import crudMdPbMeasureunit from '@/views/wms/basedata/master/measure/mdPbMeasureunit'
const defaultForm = {
material_id: null,
ass_unit_id: null,
material_code: null,
material_name: null,
material_spec: null,
material_model: null,
english_name: null,
base_unit_id: null,
approve_fileno: null,
print_no: null,
material_type_id: null,
len_unit_id: null,
length: null,
width: null,
height: null,
weight_unit_id: null,
gross_weight: null,
net_weight: null,
cubage_unit_id: null,
cubage: null,
create_id: null,
create_name: null,
create_time: null,
update_optid: null,
update_optname: null,
update_time: null,
is_used_time: null,
is_used: null,
is_delete: null,
ext_id: null,
material_height_type: null,
product_series: null
is_used: '1',
is_delete: '0',
ext_id: null
}
export default {
name: 'Materialbase',
name: 'Material',
// 数据字典
dicts: ['is_used'],
components: { pagination, crudOperation, rrOperation, udOperation, Treeselect },
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
@@ -230,136 +140,37 @@ export default {
optShow: { add: true, reset: true },
url: 'api/Materialbase',
idField: 'material_id',
sort: 'material_id,desc',
sort: '',
crudMethod: { ...crudMaterialbase }
})
},
data() {
return {
classes1: [],
classes2: [],
classes3: [],
fullscreenLoading: false,
measure_unit: [],
productSeries: [],
permission: {},
permission: {
add: ['admin', 'material:add'],
edit: ['admin', 'material:edit'],
del: ['admin', 'material:del']
},
rules: {
material_id: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
material_code: [
{ required: true, message: '物料编码不能为空', trigger: 'blur' }
],
material_name: [
{ required: true, message: '物料名称不能为空', trigger: 'blur' }
],
create_id: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
create_time: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
is_used: [
{ required: true, message: '是否启用不能为空', trigger: 'blur' }
],
material_height_type: [
{ required: true, message: '不能为空', trigger: 'blur' }
]
}
}
},
created() {
this.initClass1()
this.initClass2()
this.initClass3()
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
initClass1() {
const param = {
parent_class_code: '09'
}
crudClassstandard.getClassType(param).then(res => {
const data = res.content
this.buildTree(data)
this.classes1 = data
})
},
initClass2() {
const param = {
parent_class_code: '09'
}
crudClassstandard.getClassType(param).then(res => {
const data = res.content
this.buildTree(data)
this.classes2 = data
})
},
initClass3() {
const param = {
parent_class_code: '07'
}
crudClassstandard.getClassType(param).then(res => {
const data = res.content
this.buildTree(data)
this.classes3 = data
})
},
[CRUD.HOOK.beforeToCU](crud, form) {
crudMdPbMeasureunit.getUnit().then(res => {
this.measure_unit = res.content
})
// 物料标识为空，新增
if (!form.material_type_id) {
form.material_type_id = null // 必须为null，否则会出现unknown
} else { // 更新
this.getSubTypes('02', form.material_type_id)
}
// 物料系列为空，新增
if (!form.product_series) {
form.product_series = null // 必须为null，否则会出现unknown
} else { // 更新
this.getSubTypes('03', form.product_series)
}
},
getSubTypes(type, id) {
const that = this
crudClassstandard.getClassSuperior(id).then(res => {
const data = res.content
that.buildTree(data)
if (type == '02') {
that.classes2 = data
}
if (type == '03') {
that.classes3 = data
}
})
},
queryClassId() {
const param = {
'class_idStr': this.class_idStr
}
crudClassstandard.queryClassById(param).then(res => {
this.classes = res.content.map(obj => {
if (obj.hasChildren) {
obj.children = null
}
return obj
})
})
},
buildTree(classes) {
classes.forEach(data => {
if (data.children) {
this.buildTree(data.children)
}
if (data.hasChildren && !data.children) {
data.children = null // 重点代码
}
})
},
// 改变状态
changeEnabled(data, val) {
@@ -388,22 +199,6 @@ export default {
data.is_used = '0'
}
})
},
// 获取子节点数据
loadChildNodes({ action, parentNode, callback }) {
if (action === LOAD_CHILDREN_OPTIONS) {
crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
parentNode.children = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
}
return obj
})
setTimeout(() => {
callback()
}, 100)
})
}
}
}
}

25
lms/nladmin-ui/src/views/wms/basedata/master/material/materialbase.js
View File

@@ -24,27 +24,4 @@ export function edit(data) {
})
}
export function getMaterOptType(data) {
return request({
url: 'api/Materialbase/getMaterOptType',
method: 'post',
data
})
}
export function isAlongMaterType(data) {
return request({
url: 'api/Materialbase/isAlongMaterType',
method: 'post',
data
})
}
export function getProductSeries() {
return request({
url: 'api/Materialbase/getProductSeries',
method: 'get'
})
}
export default { add, edit, del, getMaterOptType, isAlongMaterType, getProductSeries }
export default { add, edit, del }

61
lms/nladmin-ui/src/views/wms/pub/MaterDialog.vue
View File

@@ -15,15 +15,6 @@
label-width="80px"
label-suffix=":"
>
<el-form-item label="物料类别">
<treeselect
v-model="query.material_type_id"
:load-options="loadClass"
:options="classes"
style="width: 200px;"
placeholder="选择物料类别"
/>
</el-form-item>
<el-form-item label="模糊搜索">
<el-input
v-model="query.search"
@@ -58,10 +49,6 @@
<el-table-column prop="material_code" label="物料编码" min-width="150" show-overflow-tooltip />
<el-table-column prop="material_name" label="物料名称" min-width="200" show-overflow-tooltip />
<el-table-column prop="material_spec" label="规格" show-overflow-tooltip />
<el-table-column prop="material_model" label="型号" show-overflow-tooltip />
<el-table-column prop="class_code" label="分类编码" show-overflow-tooltip />
<el-table-column prop="class_name" label="物料分类" show-overflow-tooltip />
<el-table-column prop="unit_name" label="计量单位" />
</el-table>
<!--分页组件-->
@@ -79,13 +66,10 @@ import crudMaterialbase from '@/views/wms/basedata/master/material/materialbase'
import CRUD, { header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import pagination from '@crud/Pagination'
import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import crudClassstandard from '@/views/wms/basedata/master/customer/customerbase'
export default {
name: 'MaterDtl',
components: { rrOperation, pagination, Treeselect },
components: { rrOperation, pagination },
cruds() {
return CRUD({ title: '物料', url: 'api/Materialbase', crudMethod: { ...crudMaterialbase }, optShow: {}})
},
@@ -108,9 +92,7 @@ export default {
data() {
return {
dialogVisible: false,
classes: [],
tableRadio: null,
class_idStr: null,
checkrow: null,
rows: []
}
@@ -126,32 +108,8 @@ export default {
clickChange(item) {
this.tableRadio = item
},
seriesFormat(row) {
return this.dict.label.product_series[row.product_series]
},
open() {
const param = {
'materOpt_code': this.materOptCode
}
crudMaterialbase.getMaterOptType(param).then(res => {
this.class_idStr = res.class_idStr
this.crud.query.class_idStr = res.class_idStr
this.crud.toQuery()
this.queryClassId()
})
},
queryClassId() {
const param = {
'class_idStr': this.class_idStr
}
crudClassstandard.queryClassById(param).then(res => {
this.classes = res.content.map(obj => {
if (obj.hasChildren) {
obj.children = null
}
return obj
})
})
this.crud.toQuery()
},
handleSelectionChange(val, row) {
if (this.isSingle) {
@@ -185,21 +143,6 @@ export default {
this.crud.resetQuery(false)
this.$emit('update:dialogShow', false)
this.$emit('setMaterValue', this.rows)
},
loadClass({ action, parentNode, callback }) {
if (action === LOAD_CHILDREN_OPTIONS) {
crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
parentNode.children = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
}
return obj
})
setTimeout(() => {
callback()
}, 100)
})
}
}
}
}

9
lms/nladmin-ui/src/views/wms/st/inStor/check/CheckDialog.vue
View File

@@ -146,7 +146,6 @@
<!-- <el-button type="primary" @click="saveCheck">保存</el-button>-->
<el-button type="primary" @click="submitCheck">确认</el-button>
</span>
<MaterDialog :dialog-show.sync="materShow" @tableChanged2="tableChanged2" />
<DtlViewDialog :dialog-show.sync="dtlViewShow" :open-param="paramDtlView"/>
</el-dialog>
</template>
@@ -154,13 +153,12 @@
<script>
import CRUD, { crud } from '@crud/crud'
import check from '@/views/wms/st/inStor/check/check'
import MaterDialog from '@/views/wms/pub/MaterDialog'
import DtlViewDialog from '@/views/wms/st/inStor/check/DtlViewDialog'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
export default {
name: 'CheckDialog',
components: { MaterDialog, DtlViewDialog },
components: { DtlViewDialog },
mixins: [crud()],
props: {
dialogShow: {
@@ -323,11 +321,6 @@ export default {
this.tableData.push({ check_id: this.form.check_id, check_code: this.form.check_code, checkdtl_id: '', sect_id: this.nowrow.sect_id, sect_name: this.nowrow.sect_name, struct_id: this.nowrow.struct_id, struct_name: this.nowrow.struct_name, storagevehicle_id: this.nowrow.storagevehicle_id, storagevehicle_code: this.nowrow.storagevehicle_code, status: '01', material_id: '', material_name: '', base_qty: '0', qty_unit_id: '42', qty_unit_name: '桶', is_down: '0', fac_qty: '', check_result: '0', edit: false })
this.form.dtl_num = this.tableData.length
},
async queryMater(index, row) {
this.materShow = true
this.nowindex = index
this.nowrow = row
},
tableChanged2(row) {
for (let i = 0; i < this.tableData.length; i++) {
if ((this.tableData[i].material_id === row.material_id) && (this.tableData[i].storagevehicle_code === this.nowrow.storagevehicle_code) && (this.tableData[i].struct_id === this.nowrow.struct_id)) {

19
lms/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue
View File

@@ -156,23 +156,14 @@
</el-table>
<AddDtl :dialog-show.sync="dtlShow" :open-param="opendtlParam" @tableChanged="tableChanged" />
<MaterDtl
:dialog-show.sync="materShow"
:is-single="true"
:mater-opt-code="materType"
@tableChanged2="tableChanged2"
/>
</el-dialog>
</template>
<script>
import crudOperation from '@crud/CRUD.operation'
import CRUD, { crud, form } from '@crud/crud'
import AddDtl from '@/views/wms/st/inbill/AddDtl'
import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
import crudRawAssist from '@/views/wms/st/inbill/rawassist'
import MaterDtl from '@/views/wms/pub/MaterDialog'
import checkoutbill from '@/views/wms/st/outbill/checkoutbill'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
@@ -191,7 +182,7 @@ const defaultForm = {
export default {
name: 'AddDialog',
components: { AddDtl, MaterDtl },
components: { AddDtl },
mixins: [crud(), form(defaultForm)],
dicts: ['io_bill_status', 'ST_QUALITY_SCODE', 'ST_INV_IN_TYPE'],
props: {
@@ -308,14 +299,6 @@ export default {
fun(val) {
return Number(val).toFixed(3)
},
async queryMater(index, row) {
checkoutbill.paramByCodeType({ 'bill_type': this.form.bill_type, 'io_flag': '00' }).then(res => {
this.materType = res.materType
this.materShow = true
this.nowindex = index
this.nowrow = row
})
},
async insertdtl() {
if (this.form.bill_type == '') {
this.crud.notify('请选择业务类型！', CRUD.NOTIFICATION_TYPE.INFO)

6
lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
View File

@@ -260,8 +260,6 @@ import CRUD, { crud, form } from '@crud/crud'
import AddDtl from '@/views/wms/st/outbill/AddDtl'
import MaterDialog from '@/views/wms/pub/MaterDialog'
import checkoutbill from '@/views/wms/st/outbill/checkoutbill'
import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
import crudRawAssist from '@/views/wms/st/inbill/rawassist'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
const defaultForm = {
@@ -348,10 +346,6 @@ export default {
this.crud.notify('移入仓库不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
/*if (this.form.out_stor_id === this.form.stor_id) {
this.crud.notify('移出仓库和移入仓库不能一致！', CRUD.NOTIFICATION_TYPE.INFO)
return false
}*/
}
},
[CRUD.HOOK.afterToEdit]() {