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

Merge remote-tracking branch 'origin/feature/NoScanning' into feature/NoScanning

This commit is contained in:
yf001217 2026-06-03 17:18:50 +08:00
parent 0c735378c3 4c554b0c4b
commit e598e816ba
21 changed files with 64 additions and 4 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/controller/ComponentOutboundController.java
View File

@ -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<>();

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java
View File

@ -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());

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java
View File

@ -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);

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java
View File

@ -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);

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java
View File

@ -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());
}

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java
View File

@ -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());

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java
View File

@ -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());

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java
View File

@ -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());

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java
View File

@ -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());

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java
View File

@ -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());

7
nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NoScanningBaseControllerService.java
View File

@ -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;
}
/**

5
nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsComponentOutbound.java
View File

@ -212,4 +212,9 @@ public class WmsComponentOutbound implements Serializable {
*/
@TableField("audit_time")
public LocalDateTime auditTime;
/**
* 来源类型，0：扫码；1：无码
*/
private Integer type;
}

5
nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInCostcenterBackTicket.java
View File

@ -64,4 +64,9 @@ public class WmsInCostcenterBackTicket implements Serializable {
* 实际入库库存地点编号
*/
private String lgort;
/**
* 来源类型，0：扫码；1：无码
*/
private Integer type;
}

5
nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceBackTicket.java
View File

@ -40,6 +40,11 @@ public class WmsInProduceBackTicket implements Serializable {
*/
private String no;
/**
* 来源类型，0：扫码；1：无码
*/
private Integer type;
/**
* 创建人
*/

5
nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceOrder.java
View File

@ -68,6 +68,11 @@ public class WmsInProduceOrder implements Serializable {
*/
private String mjahr;
/**
* 来源类型，0：扫码；1：无码
*/
private Integer type;
/**
* 创建人
*/

5
nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceOrderSurplusTicket.java
View File

@ -55,6 +55,11 @@ public class WmsInProduceOrderSurplusTicket implements Serializable {
*/
private String docYear;
/**
* 来源类型，0：扫码；1：无码
*/
private Integer type;
/**
* 创建人
*/

5
nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutAssistanceTicket.java
View File

@ -94,4 +94,9 @@ public class WmsOutAssistanceTicket implements Serializable {
*/
@TableField("audit_time")
public LocalDateTime auditTime;
/**
* 来源类型，0：扫码；1：无码
*/
private Integer type;
}

5
nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutCostcenterTicket.java
View File

@ -94,4 +94,9 @@ public class WmsOutCostcenterTicket implements Serializable {
*/
@TableField("audit_time")
public LocalDateTime auditTime;
/**
* 来源类型，0：扫码；1：无码
*/
private Integer type;
}

5
nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutProduceTicket.java
View File

@ -94,4 +94,9 @@ public class WmsOutProduceTicket implements Serializable {
*/
@TableField("audit_time")
public LocalDateTime auditTime;
/**
* 来源类型，0：扫码；1：无码
*/
private Integer type;
}

5
nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferCompanyTicket.java
View File

@ -114,4 +114,9 @@ public class WmsTransferCompanyTicket implements Serializable {
*/
@TableField("audit_time")
public LocalDateTime auditTime;
/**
* 来源类型，0：扫码；1：无码
*/
private Integer type;
}

5
nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferFactoryTicket.java
View File

@ -114,4 +114,9 @@ public class WmsTransferFactoryTicket implements Serializable {
*/
@TableField("audit_time")
public LocalDateTime auditTime;
/**
* 来源类型，0：扫码；1：无码
*/
private Integer type;
}