change(wms): 修改WMS多个页面的物料选择对话框功能

- 在 instockOrderCopy 和 linkage 组件中添加物料选择对话框
- 实现物料编码点击检索功能,替换原有的直接选择方式
- 新增 MaterialSelectInWMS 组件用于展示和选择物料信息
master
zch 2 weeks ago
parent 7d4e568835
commit c454b61ed0

@ -1,5 +1,7 @@
package org.dromara.wms.domain; package org.dromara.wms.domain;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import org.dromara.common.tenant.core.TenantEntity; import org.dromara.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import lombok.Data; import lombok.Data;
@ -7,6 +9,9 @@ import lombok.EqualsAndHashCode;
import java.io.Serial; import java.io.Serial;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
/** /**
* - wms_purchase_order_detail * - wms_purchase_order_detail
@ -68,6 +73,10 @@ public class WmsPurchaseOrderDetail extends TenantEntity {
*/ */
private BigDecimal deliveryQty; private BigDecimal deliveryQty;
/**
* id
*/
@TableField(exist = false)
private Long materialId; private Long materialId;

@ -70,6 +70,9 @@ public class WmsPurchaseOrderDetailBo extends BaseEntity {
*/ */
private BigDecimal deliveryQty; private BigDecimal deliveryQty;
/**
* id
*/
private Long materialId; private Long materialId;

@ -108,15 +108,16 @@ public class WmsAllocateOrderDetailServiceImpl implements IWmsAllocateOrderDetai
* @return * @return
*/ */
@Override @Override
@Transactional( rollbackFor = Exception.class )
public Boolean insertByBo(List<WmsAllocateOrderDetailBo> bo) { public Boolean insertByBo(List<WmsAllocateOrderDetailBo> bo) {
ArrayList<WmsAllocateOrderDetail> list = new ArrayList<>(); int i = 0;
for (WmsAllocateOrderDetailBo detailBo : bo) { for (WmsAllocateOrderDetailBo detailBo : bo) {
WmsAllocateOrderDetail add = MapstructUtils.convert(detailBo, WmsAllocateOrderDetail.class); WmsAllocateOrderDetail add = MapstructUtils.convert(detailBo, WmsAllocateOrderDetail.class);
add.setCreateBy(LoginHelper.getUsername()); /* add.setCreateBy(LoginHelper.getUsername());
add.setTenantId(LoginHelper.getTenantId()); add.setTenantId(LoginHelper.getTenantId());*/
list.add(add); i = baseMapper.insert(add);
} }
int i = baseMapper.insertDetails(list); // int i = baseMapper.insertDetails(list);
return i > 0; return i > 0;
} }

@ -132,7 +132,7 @@ public class WmsPurchaseOrderDetailServiceImpl implements IWmsPurchaseOrderDetai
public Boolean updateByBo(WmsPurchaseOrderDetailBo bo) { public Boolean updateByBo(WmsPurchaseOrderDetailBo bo) {
WmsPurchaseOrderDetail update = MapstructUtils.convert(bo, WmsPurchaseOrderDetail.class); WmsPurchaseOrderDetail update = MapstructUtils.convert(bo, WmsPurchaseOrderDetail.class);
validEntityBeforeSave(update); validEntityBeforeSave(update);
update.setUpdateBy(LoginHelper.getUserId()); // update.setUpdateBy(LoginHelper.getUserId());
return baseMapper.updateById(update) > 0; return baseMapper.updateById(update) > 0;
} }

Loading…
Cancel
Save