add:增加回传管理页面,先生成回传单再回传(允许手动修改回传数据)

This commit is contained in:
zhangzq
2026-06-09 19:58:05 +08:00
parent 99844f5e0f
commit 03a3959513
11 changed files with 453 additions and 519 deletions

View File

@@ -1,55 +0,0 @@
package org.nl.wms.warehouse_manage.controller;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.base.TableDataInfo;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.logging.annotation.Log;
import org.nl.wms.warehouse_manage.service.ReturnService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
/**
* <p>
* 出入库回传 控制层
* </p>
*
* @author Liuxy
* @since 2025-06-03
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/api/iosReturn")
@Slf4j
public class ReturnController {
@Autowired
private ReturnService returnService;
@GetMapping
@Log("查询出入库单")
public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page) {
return new ResponseEntity<>(TableDataInfo.build(returnService.queryAll(whereJson, page)), HttpStatus.OK);
}
@PostMapping("/upload")
@Log("回传")
public ResponseEntity<Object> upload(@RequestBody JSONObject whereJson) {
returnService.upload(whereJson);
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/disupload")
@Log("不回传")
public ResponseEntity<Object> disupload(@RequestBody JSONObject whereJson) {
returnService.disupload(whereJson);
return new ResponseEntity<>(HttpStatus.OK);
}
}

View File

@@ -1,45 +0,0 @@
package org.nl.wms.warehouse_manage.service;
import com.alibaba.fastjson.JSONObject;
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.warehouse_manage.inAndOut.service.dao.IOStorInv;
import java.util.Map;
/**
* <p>
* 出入库回传 服务类
* </p>
*
* @author Liuxy
* @since 2025-06-03
*/
public interface ReturnService extends IService<IOStorInv> {
/**
* 分页查询
* @param whereJson : {查询参数}
* @param page : 分页对象
* @return 返回结果
*/
IPage<IOStorInv> queryAll(Map whereJson, PageQuery page);
/**
* 回传
* @param whereJson {
* rows: []
* }
*/
void upload(JSONObject whereJson);
/**
* 不回传
* @param whereJson {
* rows: []
* }
*/
void disupload(JSONObject whereJson);
}

View File

@@ -1,197 +0,0 @@
package org.nl.wms.warehouse_manage.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.utils.SecurityUtils;
import org.nl.wms.basedata_manage.enums.BaseDataEnum;
import org.nl.wms.basedata_manage.service.IMdMeMaterialbaseService;
import org.nl.wms.basedata_manage.service.IMdPbMeasureunitService;
import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase;
import org.nl.wms.basedata_manage.service.dao.MdPbMeasureunit;
import org.nl.wms.ext_manage.service.WmsToErpService;
import org.nl.wms.warehouse_manage.enums.IOSConstant;
import org.nl.wms.warehouse_manage.enums.IOSEnum;
import org.nl.wms.warehouse_manage.service.ReturnService;
import org.nl.wms.warehouse_manage.inAndOut.service.dao.IOStorInv;
import org.nl.wms.warehouse_manage.inAndOut.service.dao.IOStorInvDis;
import org.nl.wms.warehouse_manage.inAndOut.service.dao.mapper.IOStorInvDisMapper;
import org.nl.wms.warehouse_manage.inAndOut.service.dao.mapper.IOStorInvMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* <p>
* 出入库回传 实现类
* </p>
*
* @author Liuxy
* @since 2025-06-03
*/
@Service
public class RetrunServiceImpl extends ServiceImpl<IOStorInvMapper, IOStorInv> implements ReturnService {
/**
* 出入库mapper服务
*/
@Autowired
private IOStorInvDisMapper ioStorInvDisMapper;
/**
* 物料基础服务
*/
@Autowired
private IMdMeMaterialbaseService iMdMeMaterialbaseService;
/**
* 计量单位服务
*/
@Autowired
private IMdPbMeasureunitService iMdPbMeasureunitService;
/**
* WMS调用ERP服务类
*/
@Autowired
private WmsToErpService wmsToErpService;
@Override
public IPage<IOStorInv> queryAll(Map whereJson, PageQuery page) {
String stor_id = MapUtil.getStr(whereJson, "stor_id");
String io_type = MapUtil.getStr(whereJson, "io_type");
String bill_type = MapUtil.getStr(whereJson, "bill_type");
String bill_code = MapUtil.getStr(whereJson, "bill_code");
String is_upload = MapUtil.getStr(whereJson, "is_upload");
String begin_time = MapUtil.getStr(whereJson, "begin_time");
String end_time = MapUtil.getStr(whereJson, "end_time");
LambdaQueryWrapper<IOStorInv> lambda = new QueryWrapper<IOStorInv>().lambda();
lambda.eq(ObjectUtil.isNotEmpty(stor_id), IOStorInv::getStor_id, stor_id);
lambda.eq(ObjectUtil.isNotEmpty(io_type), IOStorInv::getIo_type, io_type);
lambda.eq(ObjectUtil.isNotEmpty(bill_type), IOStorInv::getBill_type, bill_type);
lambda.like(ObjectUtil.isNotEmpty(bill_code), IOStorInv::getBill_code, bill_code);
lambda.eq(ObjectUtil.isNotEmpty(is_upload), IOStorInv::getIs_upload, is_upload);
lambda.ge(ObjectUtil.isNotEmpty(begin_time), IOStorInv::getInput_time, begin_time);
lambda.lt(ObjectUtil.isNotEmpty(end_time), IOStorInv::getInput_time, end_time);
lambda.eq(IOStorInv::getIs_delete, BaseDataEnum.IS_YES_NOT.code(""));
lambda.eq(IOStorInv::getBill_status, IOSEnum.CHECK_MST_STATUS.code("完成"));
lambda.orderByDesc(IOStorInv::getInput_time);
return this.baseMapper.selectPage(new Page<>(page.getPage() + 1, page.getSize()),
lambda
);
}
@Override
public void upload(JSONObject whereJson) {
List<JSONObject> rows = whereJson.getJSONArray("rows").toJavaList(JSONObject.class);
// 根据主表id查询所有分配明细
List<IOStorInvDis> iosDisList = ioStorInvDisMapper.selectList(
new QueryWrapper<IOStorInvDis>().lambda()
.in(IOStorInvDis::getIostorinv_id, rows.stream()
.map(row -> row.getString("iostorinv_id"))
.collect(Collectors.toList())
)
);
// 查询所有物料
List<MdMeMaterialbase> materList = iMdMeMaterialbaseService.list(
new QueryWrapper<MdMeMaterialbase>().lambda()
.in(MdMeMaterialbase::getMaterial_id, iosDisList.stream()
.map(IOStorInvDis::getMaterial_id)
.distinct()
.collect(Collectors.toList())
)
);
// 查询所有计量单位
List<MdPbMeasureunit> unitList = iMdPbMeasureunitService.list(
new QueryWrapper<MdPbMeasureunit>().lambda()
.in(MdPbMeasureunit::getMeasure_unit_id, iosDisList.stream()
.map(IOStorInvDis::getQty_unit_id)
.distinct()
.collect(Collectors.toList()))
);
// 需回传数据集合
List<JSONObject> paramList = new ArrayList<>();
for(IOStorInvDis disDao : iosDisList) {
JSONObject param = new JSONObject();
// 物料编码
MdMeMaterialbase materDao = materList.stream()
.filter(row -> row.getMaterial_id().equals(disDao.getMaterial_id()))
.findFirst().orElse(null);
param.put("mater_code", materDao.getMaterial_code());
// 批次
param.put("batch_no", disDao.getPcsn());
// 数量
param.put("quantity", disDao.getReal_qty());
// 计量单位
MdPbMeasureunit unitDao = unitList.stream()
.filter(row -> row.getMeasure_unit_id().equals(disDao.getQty_unit_id()))
.findFirst().orElse(null);
param.put("unit_code", unitDao.getUnit_code());
// 仓库编码
JSONObject jsonMst = rows.stream()
.filter(row -> row.getString("iostorinv_id").equals(disDao.getIostorinv_id()))
.findFirst().orElse(null);
param.put("stor_code", jsonMst.getString("stor_code"));
// 货位编码
param.put("point_code", disDao.getStruct_code());
// 载具编码
param.put("pallet_code", disDao.getStoragevehicle_code());
// 单据号
param.put("inv_code", jsonMst.getString("source_id"));
// 业务类型
param.put("task_type", jsonMst.getString("source_type"));
paramList.add(param);
}
JSONObject jsonParam = new JSONObject();
jsonParam.put("data", paramList);
wmsToErpService.uploadErp(jsonParam);
// 更新主表
this.update(
new UpdateWrapper<IOStorInv>().lambda()
.in(IOStorInv::getIostorinv_id, rows.stream()
.map(row -> row.getString("iostorinv_id"))
.collect(Collectors.toList())
)
.set(IOStorInv::getIs_upload, IOSConstant.IS_DELETE_YES)
.set(IOStorInv::getUpdate_optid, SecurityUtils.getCurrentUserId())
.set(IOStorInv::getUpdate_optname, SecurityUtils.getCurrentNickName())
.set(IOStorInv::getUpdate_time, DateUtil.now())
);
}
@Override
@Transactional
public void disupload(JSONObject whereJson) {
List<JSONObject> rows = whereJson.getJSONArray("rows").toJavaList(JSONObject.class);
List<String> idList = rows.stream()
.map(row -> row.getString("iostorinv_id"))
.collect(Collectors.toList());
// 更新
this.update(
new UpdateWrapper<IOStorInv>().lambda()
.in(IOStorInv::getIostorinv_id, idList)
.set(IOStorInv::getIs_upload, IOSConstant.IS_DELETE_YES)
.set(IOStorInv::getUpdate_optid, SecurityUtils.getCurrentUserId())
.set(IOStorInv::getUpdate_optname, SecurityUtils.getCurrentNickName())
.set(IOStorInv::getUpdate_time, DateUtil.now())
);
}
}

View File

@@ -0,0 +1,66 @@
package org.nl.wms.warehouse_manage.stockReturn.controller;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.base.TableDataInfo;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.logging.annotation.Log;
import org.nl.wms.warehouse_manage.stockReturn.service.dao.PmStockReturn;
import org.nl.wms.warehouse_manage.stockReturn.service.IPmStockReturnService;
import org.springframework.beans.factory.annotation.Autowired;
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;
import java.util.Set;
/**
* ERP回传管理 控制层
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/api/stockReturn")
@Slf4j
public class
PmStockReturnController {
@Autowired
private IPmStockReturnService pmStockReturnService;
@GetMapping
@Log("查询ERP回传管理")
public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page) {
return new ResponseEntity<>(TableDataInfo.build(pmStockReturnService.queryAll(whereJson, page)), HttpStatus.OK);
}
@PostMapping
@Log("新增ERP回传管理")
public ResponseEntity<Object> create(@Validated @RequestBody PmStockReturn stockReturn) {
pmStockReturnService.save(stockReturn);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@PutMapping
@Log("修改ERP回传管理")
public ResponseEntity<Object> update(@Validated @RequestBody PmStockReturn stockReturn) {
pmStockReturnService.update(stockReturn);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@DeleteMapping
@Log("删除ERP回传管理")
public ResponseEntity<Object> delete(@RequestBody Set<Integer> ids) {
pmStockReturnService.delete(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/upload")
@Log("ERP回传")
public ResponseEntity<Object> upload(@RequestBody JSONObject whereJson) {
pmStockReturnService.upload(whereJson);
return new ResponseEntity<>(HttpStatus.OK);
}
}

View File

@@ -0,0 +1,27 @@
package org.nl.wms.warehouse_manage.stockReturn.service;
import com.alibaba.fastjson.JSONObject;
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.warehouse_manage.stockReturn.service.dao.PmStockReturn;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* ERP回传管理 服务类
*/
public interface IPmStockReturnService extends IService<PmStockReturn> {
IPage<PmStockReturn> queryAll(Map whereJson, PageQuery page);
void update(PmStockReturn stockReturn);
void delete(Set<Integer> ids);
void upload(JSONObject whereJson);
void uploadRows(List<PmStockReturn> rows);
}

View File

@@ -0,0 +1,37 @@
package org.nl.wms.warehouse_manage.stockReturn.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 java.io.Serializable;
/**
* ERP回传管理
*/
@Data
@TableName("pm_stock_return")
public class PmStockReturn implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@TableField("request_Id")
private String request_Id;
private String request_type;
private String error_msg;
private String status;
private String create_time;
private String process_time;
private String request_data;
}

View File

@@ -0,0 +1,22 @@
package org.nl.wms.warehouse_manage.stockReturn.service.enums;
import lombok.Getter;
/**
* 回传状态枚举
*/
@Getter
public enum StockReturnStatusEnum {
TODO("0","待回传"),
SUCESS("1","回传成功"),
FAIL("2","回传失败"),
;
StockReturnStatusEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}
private String code;
private String desc;
}

View File

@@ -0,0 +1,140 @@
package org.nl.wms.warehouse_manage.stockReturn.service.impl;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.exception.BadRequestException;
import org.nl.wms.ext_manage.service.WmsToErpService;
import org.nl.wms.warehouse_manage.stockReturn.service.IPmStockReturnService;
import org.nl.wms.warehouse_manage.stockReturn.service.dao.PmStockReturn;
import org.nl.wms.warehouse_manage.stockReturn.service.enums.StockReturnStatusEnum;
import org.nl.wms.warehouse_manage.stockReturn.service.mapper.PmStockReturnMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* ERP回传管理 服务实现类
*/
@Service
public class PmStockReturnServiceImpl extends ServiceImpl<PmStockReturnMapper, PmStockReturn> implements IPmStockReturnService {
@Resource
private WmsToErpService wmsToErpService;
@Override
public IPage<PmStockReturn> queryAll(Map whereJson, PageQuery page) {
QueryWrapper<PmStockReturn> wrapper = new QueryWrapper<>();
Object requestId = whereJson.get("request_Id");
if (requestId == null) {
requestId = whereJson.get("request_id");
}
if (StringUtils.hasText(requestId == null ? null : String.valueOf(requestId))) {
wrapper.lambda().like(PmStockReturn::getRequest_Id, requestId);
}
Object requestType = whereJson.get("request_type");
if (StringUtils.hasText(requestType == null ? null : String.valueOf(requestType))) {
wrapper.lambda().eq(PmStockReturn::getRequest_type, requestType);
}
Object status = whereJson.get("status");
if (StringUtils.hasText(status == null ? null : String.valueOf(status))) {
wrapper.lambda().eq(PmStockReturn::getStatus, status);
}
Object beginTime = whereJson.get("begin_time");
if (StringUtils.hasText(beginTime == null ? null : String.valueOf(beginTime))) {
wrapper.lambda().ge(PmStockReturn::getCreate_time, formatQueryTime(beginTime, "00:00:00"));
}
Object endTime = whereJson.get("end_time");
if (StringUtils.hasText(endTime == null ? null : String.valueOf(endTime))) {
wrapper.lambda().le(PmStockReturn::getCreate_time, formatQueryTime(endTime, "23:59:59"));
}
wrapper.lambda().orderByDesc(PmStockReturn::getId);
return this.page(new Page<>(page.getPage() + 1, page.getSize()), wrapper);
}
@Override
public void update(PmStockReturn stockReturn) {
validateRequestData(stockReturn.getRequest_data());
this.updateById(stockReturn);
}
@Override
public void delete(Set<Integer> ids) {
this.removeByIds(ids);
}
@Override
@Transactional
public void upload(JSONObject whereJson) {
List<PmStockReturn> rows = whereJson.getJSONArray("rows").toJavaList(PmStockReturn.class);
uploadRows(rows);
}
@Override
@Transactional
public void uploadRows(List<PmStockReturn> rows) {
if (rows == null || rows.isEmpty()) {
throw new BadRequestException("请选择需要回传的记录");
}
for (PmStockReturn row : rows) {
PmStockReturn stockReturn = this.getById(row.getId());
if (stockReturn == null) {
throw new BadRequestException("回传记录不存在:" + row.getId());
}
try {
JSONObject requestData = parseRequestData(stockReturn.getRequest_data());
wmsToErpService.uploadErp(requestData);
stockReturn.setStatus(StockReturnStatusEnum.SUCESS.getCode());
stockReturn.setError_msg(null);
stockReturn.setProcess_time(DateUtil.now());
this.updateById(stockReturn);
} catch (Exception e) {
String errorMsg = e.getMessage();
if (errorMsg != null && errorMsg.length() > 255) {
errorMsg = errorMsg.substring(0, 255);
}
stockReturn.setStatus(StockReturnStatusEnum.FAIL.getCode());
stockReturn.setError_msg(errorMsg);
stockReturn.setProcess_time(null);
this.updateById(stockReturn);
throw new BadRequestException(errorMsg);
}
}
}
private void validateRequestData(String requestData) {
parseRequestData(requestData);
}
private String formatQueryTime(Object time, String defaultTime) {
String value = String.valueOf(time);
if (value.contains("T")) {
return DateUtil.format(DateUtil.parse(value), "yyyy-MM-dd HH:mm:ss");
}
if (value.length() == 10) {
return value + " " + defaultTime;
}
return value;
}
private JSONObject parseRequestData(String requestData) {
if (!StringUtils.hasText(requestData)) {
throw new BadRequestException("回传JSON数据不能为空");
}
try {
return JSON.parseObject(requestData);
} catch (Exception e) {
throw new BadRequestException("回传JSON数据格式错误" + e.getMessage());
}
}
}

View File

@@ -0,0 +1,11 @@
package org.nl.wms.warehouse_manage.stockReturn.service.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.nl.wms.warehouse_manage.stockReturn.service.dao.PmStockReturn;
/**
* ERP回传管理 Mapper
*/
public interface PmStockReturnMapper extends BaseMapper<PmStockReturn> {
}