feat(wms): 添加无码操作类型标识字段
- 在多个出库单据实体中新增type字段用于区分扫码和无码操作 - 为组件出库、成本中心回退、生产回退等业务实体添加类型标识 - 修改控制器逻辑在创建订单时设置type值为1表示无码操作 - 临时禁用二维码存在性检查功能以支持无码场景
This commit is contained in:
曹鹏飞
parent
f0edb4cf2c
commit
4c554b0c4b
|
|
@ -458,7 +458,7 @@ public class ComponentOutboundController extends BaseController {
|
|||
Map<Long, WmsComponentPackingItem> packingItemMap = packingItems.stream()
|
||||
.collect(Collectors.toMap(WmsComponentPackingItem::getId, item -> item));
|
||||
|
||||
WmsComponentOutbound outbound = setWmsComponentOutbound(packing).setFinish(true);
|
||||
WmsComponentOutbound outbound = setWmsComponentOutbound(packing).setFinish(true).setType(1);
|
||||
List<WmsComponentOutboundItem> outboundItems = new ArrayList<>();
|
||||
List<InventoryOutDTO> inventories = new ArrayList<>();
|
||||
List<OutMaterialScanRecord> records = new ArrayList<>();
|
||||
|
|
|
|||
|
|
@ -257,6 +257,7 @@ public class InCostCenterBackController extends BaseController {
|
|||
.setNo(serialNumberControllerService.generateSerialNumber(11))
|
||||
.setOrderId(order.getId())
|
||||
.setLgort(request.getItems().get(0).getWarehouseNo())
|
||||
.setType(1)
|
||||
.setCreateBy(UserUtil.getUserName())
|
||||
.setCreateTime(LocalDateTime.now());
|
||||
List<WmsInCostcenterBackItem> datas = inCostcenterBackItemService.getList(order.getId());
|
||||
|
|
|
|||
|
|
@ -263,6 +263,7 @@ public class InProduceBackController extends BaseController {
|
|||
WmsInProduceBackTicket ticket = new WmsInProduceBackTicket()
|
||||
.setNo(serialNumberControllerService.generateSerialNumber(13))
|
||||
.setProduceBackId(order.getId())
|
||||
.setType(1)
|
||||
.setCreateBy(UserUtil.getUserName())
|
||||
.setCreateTime(LocalDateTime.now());
|
||||
inProduceBackTicketService.save(ticket);
|
||||
|
|
|
|||
|
|
@ -540,6 +540,7 @@ public class InProduceOrderController extends BaseController {
|
|||
order.setMblnr(dto.getE_MBLNR());
|
||||
order.setMjahr(dto.getE_MJAHR());
|
||||
order.setState((short) 1);
|
||||
order.setType(1);
|
||||
order.setUpdateBy(UserUtil.getUserName());
|
||||
order.setUpdateTime(LocalDateTime.now());
|
||||
produceOrderService.updateById(order);
|
||||
|
|
|
|||
|
|
@ -470,6 +470,7 @@ public class InProduceOrderSurplusController extends BaseController {
|
|||
.setNo(serialNumberControllerService.generateSerialNumber(25))
|
||||
.setOrderId(currentOrder.getId())
|
||||
.setLgort(warehouseNos.iterator().next())
|
||||
.setType(1)
|
||||
.setCreateBy(UserUtil.getUserName())
|
||||
.setCreateTime(LocalDateTime.now());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -336,6 +336,7 @@ public class OutAssistanceController extends BaseController {
|
|||
.setOrderId(order.getId())
|
||||
.setLgort(request.getItems().get(0).getWarehouseNo())
|
||||
.setFinish(true)
|
||||
.setType(1)
|
||||
.setCreateBy(UserUtil.getUserName())
|
||||
.setCreateTime(LocalDateTime.now());
|
||||
List<WmsOutAssistanceItem> datas = outAssistanceItemService.getList(order.getId());
|
||||
|
|
|
|||
|
|
@ -337,6 +337,7 @@ public class OutCostCenterController extends BaseController {
|
|||
.setOrderId(order.getId())
|
||||
.setLgort(request.getItems().get(0).getWarehouseNo())
|
||||
.setFinish(true)
|
||||
.setType(1)
|
||||
.setCreateBy(UserUtil.getUserName())
|
||||
.setCreateTime(LocalDateTime.now());
|
||||
List<WmsOutCostcenterItem> datas = outCostcenterItemService.getList(order.getId());
|
||||
|
|
|
|||
|
|
@ -464,6 +464,7 @@ public class OutProduceController extends BaseController {
|
|||
.setProduceId(order.getId())
|
||||
.setLgort(request.getItems().get(0).getWarehouseNo())
|
||||
.setFinish(true)
|
||||
.setType(1)
|
||||
.setCreateBy(UserUtil.getUserName())
|
||||
.setCreateTime(LocalDateTime.now());
|
||||
List<WmsOutProduceItem> datas = outProduceItemService.getList(order.getId());
|
||||
|
|
|
|||
|
|
@ -547,6 +547,7 @@ public class TransferCompanyController extends BaseController {
|
|||
.setOrderId(order.getId())
|
||||
.setLgort(order.getLgort())
|
||||
.setFinish(true)
|
||||
.setType(1)
|
||||
.setCreateBy(UserUtil.getUserName())
|
||||
.setCreateTime(LocalDateTime.now());
|
||||
|
||||
|
|
|
|||
|
|
@ -573,6 +573,7 @@ public class TransferFactoryController extends BaseController {
|
|||
.setLgort(request.getItems().get(0).getWarehouseNo())
|
||||
.setOrderId(order.getId())
|
||||
.setFinish(true)
|
||||
.setType(1)
|
||||
.setCreateBy(UserUtil.getUserName())
|
||||
.setCreateTime(LocalDateTime.now());
|
||||
|
||||
|
|
|
|||
|
|
@ -25,9 +25,10 @@ public class NoScanningBaseControllerService {
|
|||
* @return 是否生成过二维码
|
||||
*/
|
||||
public boolean existsQrCode(String materialNo) {
|
||||
return qrCodeMasterService.lambdaQuery()
|
||||
.eq(WmsQrCodeMaster::getMaterialCode, materialNo)
|
||||
.exists();
|
||||
// return qrCodeMasterService.lambdaQuery()
|
||||
// .eq(WmsQrCodeMaster::getMaterialCode, materialNo)
|
||||
// .exists();
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -212,4 +212,9 @@ public class WmsComponentOutbound implements Serializable {
|
|||
*/
|
||||
@TableField("audit_time")
|
||||
public LocalDateTime auditTime;
|
||||
|
||||
/**
|
||||
* 来源类型，0：扫码；1：无码
|
||||
*/
|
||||
private Integer type;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -64,4 +64,9 @@ public class WmsInCostcenterBackTicket implements Serializable {
|
|||
* 实际入库库存地点编号
|
||||
*/
|
||||
private String lgort;
|
||||
|
||||
/**
|
||||
* 来源类型，0：扫码；1：无码
|
||||
*/
|
||||
private Integer type;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,6 +40,11 @@ public class WmsInProduceBackTicket implements Serializable {
|
|||
*/
|
||||
private String no;
|
||||
|
||||
/**
|
||||
* 来源类型，0：扫码；1：无码
|
||||
*/
|
||||
private Integer type;
|
||||
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -68,6 +68,11 @@ public class WmsInProduceOrder implements Serializable {
|
|||
*/
|
||||
private String mjahr;
|
||||
|
||||
/**
|
||||
* 来源类型，0：扫码；1：无码
|
||||
*/
|
||||
private Integer type;
|
||||
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -55,6 +55,11 @@ public class WmsInProduceOrderSurplusTicket implements Serializable {
|
|||
*/
|
||||
private String docYear;
|
||||
|
||||
/**
|
||||
* 来源类型，0：扫码；1：无码
|
||||
*/
|
||||
private Integer type;
|
||||
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -94,4 +94,9 @@ public class WmsOutAssistanceTicket implements Serializable {
|
|||
*/
|
||||
@TableField("audit_time")
|
||||
public LocalDateTime auditTime;
|
||||
|
||||
/**
|
||||
* 来源类型，0：扫码；1：无码
|
||||
*/
|
||||
private Integer type;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -94,4 +94,9 @@ public class WmsOutCostcenterTicket implements Serializable {
|
|||
*/
|
||||
@TableField("audit_time")
|
||||
public LocalDateTime auditTime;
|
||||
|
||||
/**
|
||||
* 来源类型，0：扫码；1：无码
|
||||
*/
|
||||
private Integer type;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -94,4 +94,9 @@ public class WmsOutProduceTicket implements Serializable {
|
|||
*/
|
||||
@TableField("audit_time")
|
||||
public LocalDateTime auditTime;
|
||||
|
||||
/**
|
||||
* 来源类型，0：扫码；1：无码
|
||||
*/
|
||||
private Integer type;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -114,4 +114,9 @@ public class WmsTransferCompanyTicket implements Serializable {
|
|||
*/
|
||||
@TableField("audit_time")
|
||||
public LocalDateTime auditTime;
|
||||
|
||||
/**
|
||||
* 来源类型，0：扫码；1：无码
|
||||
*/
|
||||
private Integer type;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -114,4 +114,9 @@ public class WmsTransferFactoryTicket implements Serializable {
|
|||
*/
|
||||
@TableField("audit_time")
|
||||
public LocalDateTime auditTime;
|
||||
|
||||
/**
|
||||
* 来源类型，0：扫码；1：无码
|
||||
*/
|
||||
private Integer type;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue