rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加功能

This commit is contained in:
曹鹏飞 2025-07-23 16:21:07 +08:00
parent d81f035fe4
commit 848318ef00
24 changed files with 144 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg-wms-admin/src/main/java/com/nflg/wms/admin/AdminApplication.java
View File

@ -22,7 +22,7 @@ public class AdminApplication {
// SapService sapService= SpringUtil.getBean(SapService.class);
// log.info(JSONUtil.toJsonStr(sapService.searchOrder("0000101808")));
// log.info(JSONUtil.toJsonStr(sapService.getMaterialInfoInOrder("S202507220002","0000101097","2100053760")));
// log.info(JSONUtil.toJsonStr(sapService.getMaterialInfoInOrder("7500188009","0000101808","2100053760")));
}
}

95
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageDeliverOrderController.java → nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java
View File

@ -25,12 +25,12 @@ import com.nflg.wms.common.pojo.vo.*;
import com.nflg.wms.common.util.EecExcelUtil;
import com.nflg.wms.common.util.UserUtil;
import com.nflg.wms.common.util.VUtil;
import com.nflg.wms.repository.entity.WmsDeliverStructuralPackageOrder;
import com.nflg.wms.repository.entity.WmsDeliverStructuralPackageOrderTray;
import com.nflg.wms.repository.entity.WmsDeliverStructuralPackageOrderTrayItem;
import com.nflg.wms.repository.service.IWmsDeliverStructuralPackageOrderService;
import com.nflg.wms.repository.service.IWmsDeliverStructuralPackageOrderTrayItemService;
import com.nflg.wms.repository.service.IWmsDeliverStructuralPackageOrderTrayService;
import com.nflg.wms.repository.entity.WmsStructuralPackageOrder;
import com.nflg.wms.repository.entity.WmsStructuralPackageOrderTray;
import com.nflg.wms.repository.entity.WmsStructuralPackageOrderTrayItem;
import com.nflg.wms.repository.service.IWmsStructuralPackageOrderService;
import com.nflg.wms.repository.service.IWmsStructuralPackageOrderTrayItemService;
import com.nflg.wms.repository.service.IWmsStructuralPackageOrderTrayService;
import com.nflg.wms.repository.service.IWmsStructuralPackageService;
import com.nflg.wms.starter.BaseController;
import com.nflg.wms.starter.service.FileUploadService;
@ -62,19 +62,19 @@ import java.util.stream.Collectors;
*/
@RestController
@RequestMapping("/deliver/order/package")
public class StructuralPackageDeliverOrderController extends BaseController {
public class StructuralPackageOrderController extends BaseController {
@Resource
private IWmsStructuralPackageService structuralPackageService;
@Resource
private IWmsDeliverStructuralPackageOrderService deliverStructuralPackageOrderService;
private IWmsStructuralPackageOrderService deliverStructuralPackageOrderService;
@Resource
private IWmsDeliverStructuralPackageOrderTrayService deliverStructuralPackageOrderTrayService;
private IWmsStructuralPackageOrderTrayService deliverStructuralPackageOrderTrayService;
@Resource
private IWmsDeliverStructuralPackageOrderTrayItemService deliverStructuralPackageOrderTrayItemService;
private IWmsStructuralPackageOrderTrayItemService deliverStructuralPackageOrderTrayItemService;
@Resource
private SapService sapService;
@ -161,11 +161,11 @@ public class StructuralPackageDeliverOrderController extends BaseController {
List<Long> ids = request.getItems().stream().map(PackageDeliverOrderSaveItemQO::getId).filter(Objects::nonNull).toList();
if (CollectionUtil.isNotEmpty(ids)) {
VUtil.trueThrowBusinessError(deliverStructuralPackageOrderService.lambdaQuery()
.select(WmsDeliverStructuralPackageOrder::getOrderNo)
.in(WmsDeliverStructuralPackageOrder::getId, ids)
.select(WmsStructuralPackageOrder::getOrderNo)
.in(WmsStructuralPackageOrder::getId, ids)
.list()
.stream()
.map(WmsDeliverStructuralPackageOrder::getOrderNo)
.map(WmsStructuralPackageOrder::getOrderNo)
.collect(Collectors.toSet())
.size() > 1)
.throwMessage("单据号不一致");
@ -174,21 +174,21 @@ public class StructuralPackageDeliverOrderController extends BaseController {
orderNo = getDeliverNormalOrderNo();
}
request.getItems().forEach(orderQO -> {
WmsDeliverStructuralPackageOrder order = Convert.convert(WmsDeliverStructuralPackageOrder.class, orderQO);
WmsStructuralPackageOrder order = Convert.convert(WmsStructuralPackageOrder.class, orderQO);
order.setOrderNo(orderNo);
deliverStructuralPackageOrderService.addOrUpdate(order);
GenerateTrayVO trayVO = generateTray(orderQO.getPackageId(), orderQO.getNum());
if (Objects.nonNull(orderQO.getId())) {
WmsDeliverStructuralPackageOrder o = deliverStructuralPackageOrderService.getById(orderQO.getId());
WmsStructuralPackageOrder o = deliverStructuralPackageOrderService.getById(orderQO.getId());
VUtil.trueThrowBusinessError(Objects.isNull(o)).throwMessage("订单不存在");
VUtil.trueThrowBusinessError(deliverStructuralPackageOrderTrayService.lambdaQuery()
.eq(WmsDeliverStructuralPackageOrderTray::getOrderId, order.getId())
.ne(WmsDeliverStructuralPackageOrderTray::getState, 0)
.eq(WmsStructuralPackageOrderTray::getOrderId, order.getId())
.ne(WmsStructuralPackageOrderTray::getState, 0)
.exists())
.throwMessage("修改失败，该订单有托盘已打包");
}
deliverStructuralPackageOrderTrayService.deleteByOrderId(order.getId());
List<WmsDeliverStructuralPackageOrderTray> trays = trayVO.getTrays().stream().map(it -> new WmsDeliverStructuralPackageOrderTray()
List<WmsStructuralPackageOrderTray> trays = trayVO.getTrays().stream().map(it -> new WmsStructuralPackageOrderTray()
.setId(IdUtil.getSnowflakeNextId())
.setOrderId(order.getId())
.setNo(it.getNo())
@ -196,11 +196,11 @@ public class StructuralPackageDeliverOrderController extends BaseController {
.setNum(BigDecimal.ZERO)
.setStation(it.getStation())
.setTray(it.getTray())).toList();
List<WmsDeliverStructuralPackageOrderTrayItem> items = new ArrayList<>();
List<WmsStructuralPackageOrderTrayItem> items = new ArrayList<>();
trays.forEach(tray -> {
List<TrayItemVO> itemVOS = trayVO.getItems().stream().filter(it -> StrUtil.equals(it.getNo(), tray.getNo())).toList();
items.addAll(itemVOS.stream().map(it -> {
WmsDeliverStructuralPackageOrderTrayItem item = Convert.convert(WmsDeliverStructuralPackageOrderTrayItem.class, it);
WmsStructuralPackageOrderTrayItem item = Convert.convert(WmsStructuralPackageOrderTrayItem.class, it);
item.setOrderId(order.getId());
item.setTrayId(tray.getId());
tray.setNum(tray.getNum().add(item.getPlanNum().multiply(BigDecimal.valueOf(order.getNum()))));
@ -251,8 +251,9 @@ public class StructuralPackageDeliverOrderController extends BaseController {
DeliverStructuralPackageOrderVO orderVO = deliverStructuralPackageOrderService.getInfo(id);
VUtil.trueThrowBusinessError(Objects.isNull(orderVO)).throwMessage("数据不存在");
GenerateTrayVO vo = new GenerateTrayVO();
List<WmsDeliverStructuralPackageOrderTray> trays = deliverStructuralPackageOrderTrayService.getList(id);
List<WmsStructuralPackageOrderTray> trays = deliverStructuralPackageOrderTrayService.getList(id);
vo.setTrays(trays.stream().map(tray -> new TrayVO()
.setId(tray.getId())
.setTray(tray.getTray())
.setNo(tray.getNo())
.setState(tray.getState())
@ -260,9 +261,13 @@ public class StructuralPackageDeliverOrderController extends BaseController {
.setMaterialNo(orderVO.getPackageNo())
.setMaterialDesc(orderVO.getPackageDesc())).toList()
);
List<WmsDeliverStructuralPackageOrderTrayItem> items = deliverStructuralPackageOrderTrayItemService.getList(id);
vo.setItems(items.stream().map(item -> Convert.convert(TrayItemVO.class, item)).toList());
SAPMaterialInfoInOrderDTO dto=sapService.getMaterialInfoInOrder(orderVO.getOrderNo(), orderVO.getSupplierCode(), orderVO.getPackageNo());
List<WmsStructuralPackageOrderTrayItem> items = deliverStructuralPackageOrderTrayItemService.getList(id);
vo.setItems(items.stream().map(item -> {
TrayItemVO ivo=Convert.convert(TrayItemVO.class, item);
ivo.setNo(trays.stream().filter(tray -> Objects.equals(tray.getId(), item.getTrayId())).findFirst().get().getNo());
return ivo;
}).toList());
SAPMaterialInfoInOrderDTO dto=sapService.getMaterialInfoInOrder(orderVO.getExternalOrderNo(), orderVO.getSupplierCode(), orderVO.getPackageNo());
if (Objects.nonNull(dto)){
vo.setMaxNum(dto.getTransportNum());
}
@ -450,16 +455,16 @@ public class StructuralPackageDeliverOrderController extends BaseController {
@Transactional
@PostMapping("packTray")
public ApiResult<Void> packTray(@Valid @RequestBody @NotNull PackTrayQO request) {
WmsDeliverStructuralPackageOrderTray tray = deliverStructuralPackageOrderTrayService.lambdaQuery().eq(WmsDeliverStructuralPackageOrderTray::getNo, request.getTrayNo()).one();
WmsStructuralPackageOrderTray tray = deliverStructuralPackageOrderTrayService.lambdaQuery().eq(WmsStructuralPackageOrderTray::getNo, request.getTrayNo()).one();
VUtil.trueThrowBusinessError(Objects.isNull(tray)).throwMessage("托盘不存在");
VUtil.trueThrowBusinessError(!Objects.equals(tray.getState(), OrderState.Unpackaged.getState())).throwMessage("请勿重复打包");
VUtil.trueThrowBusinessError(tray.getNum().compareTo(BigDecimal.valueOf(request.getQrCodes().size())) == 0).throwMessage("打包数量不足");
VUtil.trueThrowBusinessError(!deliverStructuralPackageOrderTrayService.lambdaUpdate()
.set(WmsDeliverStructuralPackageOrderTray::getState, OrderState.Packaged.getState())
.set(WmsDeliverStructuralPackageOrderTray::getPackBy, UserUtil.getUserName())
.set(WmsDeliverStructuralPackageOrderTray::getPackTime, LocalDateTime.now())
.eq(WmsDeliverStructuralPackageOrderTray::getState, OrderState.Unpackaged.getState())
.eq(WmsDeliverStructuralPackageOrderTray::getTray, request.getTrayNo())
.set(WmsStructuralPackageOrderTray::getState, OrderState.Packaged.getState())
.set(WmsStructuralPackageOrderTray::getPackBy, UserUtil.getUserName())
.set(WmsStructuralPackageOrderTray::getPackTime, LocalDateTime.now())
.eq(WmsStructuralPackageOrderTray::getState, OrderState.Unpackaged.getState())
.eq(WmsStructuralPackageOrderTray::getTray, request.getTrayNo())
.update()).throwMessage("打包失败，请重试");
packageMaterialScanRecordRepository.saveAll(request.getQrCodes().stream().map(qrCode -> {
List<String> qrContents = StrUtil.split(qrCode, "^");
@ -479,15 +484,27 @@ public class StructuralPackageDeliverOrderController extends BaseController {
return ApiResult.success();
}
// /**
// * 退回到
// * @param id
// * @return
// */
// @GetMapping("getTrayInfoByNo")
// public ApiResult trayBack(@Valid @RequestParam @NotNull Long id) {
//
// }
/**
* 退回到未打包
* @param id 托盘id
*/
@GetMapping("backToUnpackaged")
public ApiResult<Void> backToUnpackaged(@Valid @RequestParam @NotNull Long id) {
WmsStructuralPackageOrderTray tray=deliverStructuralPackageOrderTrayService.getById(id);
VUtil.trueThrowBusinessError(Objects.isNull(tray)).throwMessage("数据不存在");
VUtil.trueThrowBusinessError(!Objects.equals(tray.getState(), OrderState.Packaged.getState()))
.throwMessage("托盘状态不正确");
VUtil.trueThrowBusinessError(!deliverStructuralPackageOrderTrayService.lambdaUpdate()
.set(WmsStructuralPackageOrderTray::getState, OrderState.Unpackaged.getState())
.set(WmsStructuralPackageOrderTray::getPackBy, null)
.set(WmsStructuralPackageOrderTray::getPackTime, null)
.eq(WmsStructuralPackageOrderTray::getId, id)
.eq(WmsStructuralPackageOrderTray::getState, OrderState.Packaged.getState())
.update()).throwMessage("退回到未打包失败，请重试");
return ApiResult.success();
}
/**
* 根据送货单号查询订单信息

4
nflg-wms-admin/src/main/java/com/nflg/wms/admin/runner/RedisDataInitRunner.java
View File

@ -2,7 +2,7 @@ package com.nflg.wms.admin.runner;
import cn.hutool.core.util.StrUtil;
import com.nflg.wms.common.util.DateTimeUtil;
import com.nflg.wms.repository.service.IWmsDeliverStructuralPackageOrderTrayService;
import com.nflg.wms.repository.service.IWmsStructuralPackageOrderTrayService;
import com.nflg.wms.repository.service.IWmsStructuralPackageService;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
@ -24,7 +24,7 @@ public class RedisDataInitRunner implements ApplicationRunner {
private IWmsStructuralPackageService structuralPackageService;
@Resource
private IWmsDeliverStructuralPackageOrderTrayService deliverStructuralPackageOrderTrayService;
private IWmsStructuralPackageOrderTrayService deliverStructuralPackageOrderTrayService;
@Resource
private StringRedisTemplate stringRedisTemplate;

2
nflg-wms-admin/src/main/resources/template/StructuralPackage.html
View File

@ -5,7 +5,7 @@
<meta charset="utf-8" />
<meta content="IE=edge" http-equiv="X-UA-Compatible" />
<meta content="width=device-width, initial-scale=1.0" name="viewport" />
<title>NFLG</title>
<title>钢构包</title>
<link href="../css/StructuralPackage.css" rel="stylesheet" type="text/css" />
<style>
body {

2
nflg-wms-admin/src/main/resources/template/qrcode/dp.html
View File

@ -2,7 +2,7 @@
<html lang="zh-CN" xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8"/>
<title>标签信息展示</title>
<title>普通物料标签</title>
<meta content="width=device-width, initial-scale=1.0" name="viewport"/>
<style>
@media print {

2
nflg-wms-admin/src/main/resources/template/qrcode/qitao.html
View File

@ -2,7 +2,7 @@
<html lang="zh-CN" xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8"/>
<title>标签信息展示</title>
<title>齐套标签</title>
<meta content="width=device-width, initial-scale=1.0" name="viewport"/>
<style>
@media print {

2
nflg-wms-admin/src/main/resources/template/qrcode/spitem.html
View File

@ -2,7 +2,7 @@
<html lang="zh">
<head>
<meta charset="UTF-8"/>
<title>合并单元格表格</title>
<title>钢构件物料标签</title>
<style>
body {
font-size: 9pt;

2
nflg-wms-admin/src/main/resources/template/qrcode/tray.html
View File

@ -2,7 +2,7 @@
<html lang="zh-CN" xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8"/>
<title>标签信息展示</title>
<title>托盘标签</title>
<meta content="width=device-width, initial-scale=1.0" name="viewport"/>
<style>
@media print {

2
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TrayVO.java
View File

@ -9,6 +9,8 @@ import java.math.BigDecimal;
@Accessors(chain = true)
public class TrayVO {
private Long id;
/**
* 托盘编号
*/

4
nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsDeliverStructuralPackageOrder.java → nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrder.java
View File

@ -24,8 +24,8 @@ import java.time.LocalDateTime;
@Setter
@ToString
@Accessors(chain = true)
@TableName("wms_deliver_structural_package_order")
public class WmsDeliverStructuralPackageOrder implements Serializable {
@TableName("wms_structural_package_order")
public class WmsStructuralPackageOrder implements Serializable {
private static final long serialVersionUID = 1L;

10
nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsDeliverStructuralPackageOrderTray.java → nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrderTray.java
View File

@ -1,8 +1,6 @@
package com.nflg.wms.repository.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
@ -24,8 +22,8 @@ import java.time.LocalDateTime;
@Setter
@ToString
@Accessors(chain = true)
@TableName("wms_deliver_structural_package_order_tray")
public class WmsDeliverStructuralPackageOrderTray implements Serializable {
@TableName("wms_structural_package_order_tray")
public class WmsStructuralPackageOrderTray implements Serializable {
private static final long serialVersionUID = 1L;
@ -70,10 +68,12 @@ public class WmsDeliverStructuralPackageOrderTray implements Serializable {
/**
* 打包人
*/
@TableField(updateStrategy = FieldStrategy.ALWAYS)
private String packBy;
/**
* 打包时间
*/
@TableField(updateStrategy = FieldStrategy.ALWAYS)
private LocalDateTime packTime;
}

4
nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsDeliverStructuralPackageOrderTrayItem.java → nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrderTrayItem.java
View File

@ -23,8 +23,8 @@ import java.math.BigDecimal;
@Setter
@ToString
@Accessors(chain = true)
@TableName("wms_deliver_structural_package_order_tray_item")
public class WmsDeliverStructuralPackageOrderTrayItem implements Serializable {
@TableName("wms_structural_package_order_tray_item")
public class WmsStructuralPackageOrderTrayItem implements Serializable {
private static final long serialVersionUID = 1L;

4
nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsDeliverStructuralPackageOrderMapper.java → nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageOrderMapper.java
View File

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.nflg.wms.common.pojo.qo.DeliverStructuralPackageOrderSearchQO;
import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderForPackageItemVO;
import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderVO;
import com.nflg.wms.repository.entity.WmsDeliverStructuralPackageOrder;
import com.nflg.wms.repository.entity.WmsStructuralPackageOrder;
import java.util.List;
@ -18,7 +18,7 @@ import java.util.List;
* @author 代码生成器生成
* @since 2025
*/
public interface WmsDeliverStructuralPackageOrderMapper extends BaseMapper<WmsDeliverStructuralPackageOrder> {
public interface WmsStructuralPackageOrderMapper extends BaseMapper<WmsStructuralPackageOrder> {
IPage<DeliverStructuralPackageOrderVO> search(DeliverStructuralPackageOrderSearchQO request, Page<?> objectPage);

4
nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsDeliverStructuralPackageOrderTrayItemMapper.java → nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageOrderTrayItemMapper.java
View File

@ -3,7 +3,7 @@ package com.nflg.wms.repository.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderTrayItemSimpleVO;
import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderTrayItemVO;
import com.nflg.wms.repository.entity.WmsDeliverStructuralPackageOrderTrayItem;
import com.nflg.wms.repository.entity.WmsStructuralPackageOrderTrayItem;
import java.util.List;
@ -15,7 +15,7 @@ import java.util.List;
* @author 代码生成器生成
* @since 2025
*/
public interface WmsDeliverStructuralPackageOrderTrayItemMapper extends BaseMapper<WmsDeliverStructuralPackageOrderTrayItem> {
public interface WmsStructuralPackageOrderTrayItemMapper extends BaseMapper<WmsStructuralPackageOrderTrayItem> {
List<DeliverStructuralPackageOrderTrayItemVO> getListByTrayId(Long id);

4
nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsDeliverStructuralPackageOrderTrayMapper.java → nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageOrderTrayMapper.java
View File

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.nflg.wms.common.pojo.qo.DeliverStructuralPackageOrderSearchByStateQO;
import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderExtendVO;
import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderTrayVO;
import com.nflg.wms.repository.entity.WmsDeliverStructuralPackageOrderTray;
import com.nflg.wms.repository.entity.WmsStructuralPackageOrderTray;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -19,7 +19,7 @@ import java.util.List;
* @author 代码生成器生成
* @since 2025
*/
public interface WmsDeliverStructuralPackageOrderTrayMapper extends BaseMapper<WmsDeliverStructuralPackageOrderTray> {
public interface WmsStructuralPackageOrderTrayMapper extends BaseMapper<WmsStructuralPackageOrderTray> {
IPage<DeliverStructuralPackageOrderExtendVO> searchByState(@Param("request") DeliverStructuralPackageOrderSearchByStateQO request, Page<?> objectPage);

6
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsDeliverStructuralPackageOrderService.java → nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStructuralPackageOrderService.java
View File

@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.nflg.wms.common.pojo.qo.DeliverStructuralPackageOrderSearchQO;
import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderForPackageItemVO;
import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderVO;
import com.nflg.wms.repository.entity.WmsDeliverStructuralPackageOrder;
import com.nflg.wms.repository.entity.WmsStructuralPackageOrder;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
@ -20,9 +20,9 @@ import java.util.List;
* @author 代码生成器生成
* @since 2025
*/
public interface IWmsDeliverStructuralPackageOrderService extends IService<WmsDeliverStructuralPackageOrder> {
public interface IWmsStructuralPackageOrderService extends IService<WmsStructuralPackageOrder> {
void addOrUpdate(WmsDeliverStructuralPackageOrder order);
void addOrUpdate(WmsStructuralPackageOrder order);
IPage<DeliverStructuralPackageOrderVO> search(@Valid DeliverStructuralPackageOrderSearchQO request);

6
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsDeliverStructuralPackageOrderTrayItemService.java → nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStructuralPackageOrderTrayItemService.java
View File

@ -3,7 +3,7 @@ package com.nflg.wms.repository.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderTrayItemSimpleVO;
import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderTrayItemVO;
import com.nflg.wms.repository.entity.WmsDeliverStructuralPackageOrderTrayItem;
import com.nflg.wms.repository.entity.WmsStructuralPackageOrderTrayItem;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
@ -18,11 +18,11 @@ import java.util.List;
* @author 代码生成器生成
* @since 2025
*/
public interface IWmsDeliverStructuralPackageOrderTrayItemService extends IService<WmsDeliverStructuralPackageOrderTrayItem> {
public interface IWmsStructuralPackageOrderTrayItemService extends IService<WmsStructuralPackageOrderTrayItem> {
void deleteByOrderId(Long id);
List<WmsDeliverStructuralPackageOrderTrayItem> getList(@Valid @NotNull Long id);
List<WmsStructuralPackageOrderTrayItem> getList(@Valid @NotNull Long id);
void deleteByOrderIds(List<Long> deleteIds);

6
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsDeliverStructuralPackageOrderTrayService.java → nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStructuralPackageOrderTrayService.java
View File

@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.nflg.wms.common.pojo.qo.DeliverStructuralPackageOrderSearchByStateQO;
import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderExtendVO;
import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderTrayVO;
import com.nflg.wms.repository.entity.WmsDeliverStructuralPackageOrderTray;
import com.nflg.wms.repository.entity.WmsStructuralPackageOrderTray;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
@ -20,11 +20,11 @@ import java.util.List;
* @author 代码生成器生成
* @since 2025
*/
public interface IWmsDeliverStructuralPackageOrderTrayService extends IService<WmsDeliverStructuralPackageOrderTray> {
public interface IWmsStructuralPackageOrderTrayService extends IService<WmsStructuralPackageOrderTray> {
void deleteByOrderId(Long id);
List<WmsDeliverStructuralPackageOrderTray> getList(@Valid @NotNull Long orderId);
List<WmsStructuralPackageOrderTray> getList(@Valid @NotNull Long orderId);
void deleteByOrderIds(List<Long> deleteIds);

34
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsDeliverStructuralPackageOrderServiceImpl.java → nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageOrderServiceImpl.java
View File

@ -9,13 +9,13 @@ import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderForPackageItemVO
import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderVO;
import com.nflg.wms.common.util.UserUtil;
import com.nflg.wms.common.util.VUtil;
import com.nflg.wms.repository.entity.WmsDeliverStructuralPackageOrder;
import com.nflg.wms.repository.entity.WmsDeliverStructuralPackageOrderTray;
import com.nflg.wms.repository.mapper.WmsDeliverStructuralPackageOrderMapper;
import com.nflg.wms.repository.entity.WmsStructuralPackageOrder;
import com.nflg.wms.repository.entity.WmsStructuralPackageOrderTray;
import com.nflg.wms.repository.mapper.WmsStructuralPackageOrderMapper;
import com.nflg.wms.repository.service.IAuditLogService;
import com.nflg.wms.repository.service.IWmsDeliverStructuralPackageOrderService;
import com.nflg.wms.repository.service.IWmsDeliverStructuralPackageOrderTrayItemService;
import com.nflg.wms.repository.service.IWmsDeliverStructuralPackageOrderTrayService;
import com.nflg.wms.repository.service.IWmsStructuralPackageOrderService;
import com.nflg.wms.repository.service.IWmsStructuralPackageOrderTrayItemService;
import com.nflg.wms.repository.service.IWmsStructuralPackageOrderTrayService;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -33,19 +33,19 @@ import java.util.Objects;
* @since 2025
*/
@Service
public class WmsDeliverStructuralPackageOrderServiceImpl extends ServiceImpl<WmsDeliverStructuralPackageOrderMapper, WmsDeliverStructuralPackageOrder> implements IWmsDeliverStructuralPackageOrderService {
public class WmsStructuralPackageOrderServiceImpl extends ServiceImpl<WmsStructuralPackageOrderMapper, WmsStructuralPackageOrder> implements IWmsStructuralPackageOrderService {
@Resource
private IAuditLogService auditLogService;
@Resource
private IWmsDeliverStructuralPackageOrderTrayService deliverStructuralPackageOrderTrayService;
private IWmsStructuralPackageOrderTrayService deliverStructuralPackageOrderTrayService;
@Resource
private IWmsDeliverStructuralPackageOrderTrayItemService deliverStructuralPackageOrderTrayItemService;
private IWmsStructuralPackageOrderTrayItemService deliverStructuralPackageOrderTrayItemService;
@Override
public void addOrUpdate(WmsDeliverStructuralPackageOrder order) {
public void addOrUpdate(WmsStructuralPackageOrder order) {
if (Objects.isNull(order.getId())){
add(order);
}else {
@ -72,8 +72,8 @@ public class WmsDeliverStructuralPackageOrderServiceImpl extends ServiceImpl<Wms
@Override
public void deleteByIds(List<Long> deleteIds) {
VUtil.trueThrowBusinessError(deliverStructuralPackageOrderTrayService.lambdaQuery()
.ne(WmsDeliverStructuralPackageOrderTray::getState, OrderState.Unpackaged.getState())
.in(WmsDeliverStructuralPackageOrderTray::getOrderId, deleteIds)
.ne(WmsStructuralPackageOrderTray::getState, OrderState.Unpackaged.getState())
.in(WmsStructuralPackageOrderTray::getOrderId, deleteIds)
.exists())
.throwMessage("删除失败，有托盘已打包");
removeBatchByIds(deleteIds);
@ -86,18 +86,18 @@ public class WmsDeliverStructuralPackageOrderServiceImpl extends ServiceImpl<Wms
return baseMapper.getInfoByExternalOrderNo(orderNo);
}
private void add(WmsDeliverStructuralPackageOrder order){
private void add(WmsStructuralPackageOrder order){
order.setCreateBy(UserUtil.getUserName());
order.setCreateTime(LocalDateTime.now());
save(order);
auditLogService.addInsert(WmsDeliverStructuralPackageOrder.class,order, order.getCreateBy());
auditLogService.addInsert(WmsStructuralPackageOrder.class,order, order.getCreateBy());
}
private void update(WmsDeliverStructuralPackageOrder order){
WmsDeliverStructuralPackageOrder old=getById(order.getId());
private void update(WmsStructuralPackageOrder order){
WmsStructuralPackageOrder old=getById(order.getId());
order.setUpdateBy(UserUtil.getUserName());
order.setUpdateTime(LocalDateTime.now());
updateById(order);
auditLogService.addUpdate(WmsDeliverStructuralPackageOrder.class,old,order, order.getUpdateBy());
auditLogService.addUpdate(WmsStructuralPackageOrder.class,old,order, order.getUpdateBy());
}
}

16
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsDeliverStructuralPackageOrderTrayItemServiceImpl.java → nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageOrderTrayItemServiceImpl.java
View File

@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderTrayItemSimpleVO;
import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderTrayItemVO;
import com.nflg.wms.repository.entity.WmsDeliverStructuralPackageOrderTrayItem;
import com.nflg.wms.repository.mapper.WmsDeliverStructuralPackageOrderTrayItemMapper;
import com.nflg.wms.repository.service.IWmsDeliverStructuralPackageOrderTrayItemService;
import com.nflg.wms.repository.entity.WmsStructuralPackageOrderTrayItem;
import com.nflg.wms.repository.mapper.WmsStructuralPackageOrderTrayItemMapper;
import com.nflg.wms.repository.service.IWmsStructuralPackageOrderTrayItemService;
import org.springframework.stereotype.Service;
import java.util.List;
@ -20,21 +20,21 @@ import java.util.List;
* @since 2025
*/
@Service
public class WmsDeliverStructuralPackageOrderTrayItemServiceImpl extends ServiceImpl<WmsDeliverStructuralPackageOrderTrayItemMapper, WmsDeliverStructuralPackageOrderTrayItem> implements IWmsDeliverStructuralPackageOrderTrayItemService {
public class WmsStructuralPackageOrderTrayItemServiceImpl extends ServiceImpl<WmsStructuralPackageOrderTrayItemMapper, WmsStructuralPackageOrderTrayItem> implements IWmsStructuralPackageOrderTrayItemService {
@Override
public void deleteByOrderId(Long id) {
remove(new LambdaQueryWrapper<WmsDeliverStructuralPackageOrderTrayItem>().eq(WmsDeliverStructuralPackageOrderTrayItem::getOrderId, id));
remove(new LambdaQueryWrapper<WmsStructuralPackageOrderTrayItem>().eq(WmsStructuralPackageOrderTrayItem::getOrderId, id));
}
@Override
public List<WmsDeliverStructuralPackageOrderTrayItem> getList(Long id) {
return lambdaQuery().eq(WmsDeliverStructuralPackageOrderTrayItem::getOrderId, id).list();
public List<WmsStructuralPackageOrderTrayItem> getList(Long id) {
return lambdaQuery().eq(WmsStructuralPackageOrderTrayItem::getOrderId, id).list();
}
@Override
public void deleteByOrderIds(List<Long> deleteIds) {
remove(new LambdaQueryWrapper<WmsDeliverStructuralPackageOrderTrayItem>().in(WmsDeliverStructuralPackageOrderTrayItem::getOrderId, deleteIds));
remove(new LambdaQueryWrapper<WmsStructuralPackageOrderTrayItem>().in(WmsStructuralPackageOrderTrayItem::getOrderId, deleteIds));
}
@Override

16
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsDeliverStructuralPackageOrderTrayServiceImpl.java → nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageOrderTrayServiceImpl.java
View File

@ -7,9 +7,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nflg.wms.common.pojo.qo.DeliverStructuralPackageOrderSearchByStateQO;
import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderExtendVO;
import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderTrayVO;
import com.nflg.wms.repository.entity.WmsDeliverStructuralPackageOrderTray;
import com.nflg.wms.repository.mapper.WmsDeliverStructuralPackageOrderTrayMapper;
import com.nflg.wms.repository.service.IWmsDeliverStructuralPackageOrderTrayService;
import com.nflg.wms.repository.entity.WmsStructuralPackageOrderTray;
import com.nflg.wms.repository.mapper.WmsStructuralPackageOrderTrayMapper;
import com.nflg.wms.repository.service.IWmsStructuralPackageOrderTrayService;
import org.springframework.stereotype.Service;
import java.util.List;
@ -23,21 +23,21 @@ import java.util.List;
* @since 2025
*/
@Service
public class WmsDeliverStructuralPackageOrderTrayServiceImpl extends ServiceImpl<WmsDeliverStructuralPackageOrderTrayMapper, WmsDeliverStructuralPackageOrderTray> implements IWmsDeliverStructuralPackageOrderTrayService {
public class WmsStructuralPackageOrderTrayServiceImpl extends ServiceImpl<WmsStructuralPackageOrderTrayMapper, WmsStructuralPackageOrderTray> implements IWmsStructuralPackageOrderTrayService {
@Override
public void deleteByOrderId(Long id) {
remove(new LambdaQueryWrapper<WmsDeliverStructuralPackageOrderTray>().eq(WmsDeliverStructuralPackageOrderTray::getOrderId, id));
remove(new LambdaQueryWrapper<WmsStructuralPackageOrderTray>().eq(WmsStructuralPackageOrderTray::getOrderId, id));
}
@Override
public List<WmsDeliverStructuralPackageOrderTray> getList(Long orderId) {
return lambdaQuery().eq(WmsDeliverStructuralPackageOrderTray::getOrderId, orderId).list();
public List<WmsStructuralPackageOrderTray> getList(Long orderId) {
return lambdaQuery().eq(WmsStructuralPackageOrderTray::getOrderId, orderId).list();
}
@Override
public void deleteByOrderIds(List<Long> deleteIds) {
remove(new LambdaQueryWrapper<WmsDeliverStructuralPackageOrderTray>().in(WmsDeliverStructuralPackageOrderTray::getOrderId, deleteIds));
remove(new LambdaQueryWrapper<WmsStructuralPackageOrderTray>().in(WmsStructuralPackageOrderTray::getOrderId, deleteIds));
}
@Override

10
nflg-wms-repository/src/main/resources/mapper/WmsDeliverStructuralPackageOrderMapper.xml → nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml
View File

@ -1,11 +1,11 @@
<?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="com.nflg.wms.repository.mapper.WmsDeliverStructuralPackageOrderMapper">
<mapper namespace="com.nflg.wms.repository.mapper.WmsStructuralPackageOrderMapper">
<select id="search" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderVO">
SELECT o.*,m.no||wb."no" AS "workbench_code",us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no"
,sp."no" AS "package_no",sp."name" AS "package_desc",m."no" AS "model_no"
FROM wms_deliver_structural_package_order o
FROM wms_structural_package_order o
LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id"
LEFT JOIN user_supplier us ON o.supplier_id=us.user_id
LEFT JOIN wms_structural_package sp ON o.package_id=sp."id"
@ -39,7 +39,7 @@
<select id="getList" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderVO">
SELECT o.*,m.no||wb."no" AS "workbench_code",us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no"
,sp."no" AS "package_no",sp."name" AS "package_desc",m."no" AS "model_no"
FROM wms_deliver_structural_package_order o
FROM wms_structural_package_order o
LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id"
LEFT JOIN user_supplier us ON o.supplier_id=us.user_id
LEFT JOIN wms_structural_package sp ON o.package_id=sp."id"
@ -51,7 +51,7 @@
<select id="getInfo" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderVO">
SELECT o.*,m.no||wb."no" AS "workbench_code",us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no"
,sp."no" AS "package_no",sp."name" AS "package_desc",m."no" AS "model_no"
FROM wms_deliver_structural_package_order o
FROM wms_structural_package_order o
LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id"
LEFT JOIN user_supplier us ON o.supplier_id=us.user_id
LEFT JOIN wms_structural_package sp ON o.package_id=sp."id"
@ -64,7 +64,7 @@
resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderForPackageItemVO">
SELECT o.*,m.no||wb."no" AS "workbench_code",us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no"
,sp."no" AS "package_no",sp."name" AS "package_desc",m."no" AS "model_no"
FROM wms_deliver_structural_package_order o
FROM wms_structural_package_order o
LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id"
LEFT JOIN user_supplier us ON o.supplier_id=us.user_id
LEFT JOIN wms_structural_package sp ON o.package_id=sp."id"

12
nflg-wms-repository/src/main/resources/mapper/WmsDeliverStructuralPackageOrderTrayItemMapper.xml → nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayItemMapper.xml
View File

@ -1,13 +1,13 @@
<?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="com.nflg.wms.repository.mapper.WmsDeliverStructuralPackageOrderTrayItemMapper">
<mapper namespace="com.nflg.wms.repository.mapper.WmsStructuralPackageOrderTrayItemMapper">
<select id="getListByTrayId" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderTrayItemVO">
SELECT ROW_NUMBER() OVER (ORDER BY o.id) AS "index",oti.*,ot."no" as "tray_no",ot."state",sp."no" as "package_no"
,sp."name" as "package_desc"
FROM wms_deliver_structural_package_order_tray ot
INNER JOIN wms_deliver_structural_package_order_tray_item oti ON ot."id"=oti.tray_id
INNER JOIN wms_deliver_structural_package_order o ON o."id"=ot.order_id
FROM wms_structural_package_order_tray ot
INNER JOIN wms_structural_package_order_tray_item oti ON ot."id"=oti.tray_id
INNER JOIN wms_structural_package_order o ON o."id"=ot.order_id
LEFT JOIN wms_structural_package sp ON o.package_id=sp."id"
where ot.id=#{id}
order by o.id
@ -16,8 +16,8 @@
<select id="getSimpleListByTrayNo"
resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderTrayItemSimpleVO">
select oti.*
from wms_deliver_structural_package_order_tray ot
inner join wms_deliver_structural_package_order_tray_item oti on ot."id"=oti.tray_id
from wms_structural_package_order_tray ot
inner join wms_structural_package_order_tray_item oti on ot."id"=oti.tray_id
where ot.no=#{trayNo}
</select>
</mapper>

20
nflg-wms-repository/src/main/resources/mapper/WmsDeliverStructuralPackageOrderTrayMapper.xml → nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml
View File

@ -1,16 +1,16 @@
<?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="com.nflg.wms.repository.mapper.WmsDeliverStructuralPackageOrderTrayMapper">
<mapper namespace="com.nflg.wms.repository.mapper.WmsStructuralPackageOrderTrayMapper">
<select id="searchByState" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderExtendVO">
SELECT ROW_NUMBER() OVER (ORDER BY o.id desc) AS "index",ot.id,o.*,m.no||wb."no" AS "workbench_code",us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no"
,sp."no" AS "package_no",sp."name" AS "package_desc",m."no" AS "model_no",ot.no as "tray_no",ot.tray,ot.station,ot.state
FROM wms_deliver_structural_package_order o
FROM wms_structural_package_order o
LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id"
LEFT JOIN user_supplier us ON o.supplier_id=us.user_id
LEFT JOIN wms_structural_package sp ON o.package_id=sp."id"
LEFT JOIN wms_model m on o.model_id=m."id"
inner join wms_deliver_structural_package_order_tray ot on o.id=ot.order_id
inner join wms_structural_package_order_tray ot on o.id=ot.order_id
where ot.state=#{request.state}
<if test="request.orderNo!=null and request.orderNo!=''">
and o.order_no=#{request.orderNo}
@ -39,12 +39,12 @@
<select id="getListByIds" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderExtendVO">
SELECT ROW_NUMBER() OVER (ORDER BY o.id desc) AS "index",ot.id,o.*,m.no||wb."no" AS "workbench_code",us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no"
,sp."no" AS "package_no",sp."name" AS "package_desc",m."no" AS "model_no",ot.no as "tray_no",ot.tray,ot.station,ot.state
FROM wms_deliver_structural_package_order o
FROM wms_structural_package_order o
LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id"
LEFT JOIN user_supplier us ON o.supplier_id=us.user_id
LEFT JOIN wms_structural_package sp ON o.package_id=sp."id"
LEFT JOIN wms_model m on o.model_id=m."id"
inner join wms_deliver_structural_package_order_tray ot on o.id=ot.order_id
inner join wms_structural_package_order_tray ot on o.id=ot.order_id
where ot.id in
<foreach item="item" collection="ids" separator="," open="(" close=")">
#{item}
@ -55,18 +55,18 @@
SELECT ot.id,ot.weight,o.*,m.no||wb."no" AS "workbench_code",us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no"
,sp.cate as "package_cate",sp."no" AS "package_no",sp."name" AS "package_desc",m."no" AS "model_no"
,ot.no as "tray_no",ot.tray,ot.station,ot.state,sp.version as "package_version",sp.drawing_no as "package_drawing_no"
FROM wms_deliver_structural_package_order o
FROM wms_structural_package_order o
LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id"
LEFT JOIN user_supplier us ON o.supplier_id=us.user_id
LEFT JOIN wms_structural_package sp ON o.package_id=sp."id"
LEFT JOIN wms_model m on o.model_id=m."id"
inner join wms_deliver_structural_package_order_tray ot on o.id=ot.order_id
inner join wms_structural_package_order_tray ot on o.id=ot.order_id
where ot.id=#{id}
</select>
<select id="getLast" resultType="java.lang.String">
select no
from wms_deliver_structural_package_order_tray
from wms_structural_package_order_tray
where no like concat(#{key},'%')
order by id desc
limit 1
@ -74,12 +74,12 @@
<select id="getInfoByNo" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderTrayVO">
SELECT o.external_order_no,o.row_no,sp."no" AS "package_no",sp."name" AS "package_desc",ot.num,us.supplier_name,us.supplier_code
FROM wms_deliver_structural_package_order o
FROM wms_structural_package_order o
LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id"
LEFT JOIN user_supplier us ON o.supplier_id=us.user_id
LEFT JOIN wms_structural_package sp ON o.package_id=sp."id"
LEFT JOIN wms_model m on o.model_id=m."id"
inner join wms_deliver_structural_package_order_tray ot on o.id=ot.order_id
inner join wms_structural_package_order_tray ot on o.id=ot.order_id
where ot.no=#{no}
</select>
</mapper>