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

Merge remote-tracking branch 'origin/qms/develop' into qms/develop

This commit is contained in:
yf001217 2026-06-15 23:03:05 +08:00
parent ac55314af6 f228433428
commit 39894531f5
6 changed files with 100 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java
View File

@ -980,13 +980,13 @@ public class QmsIssueTicketControllerService {
issueTicketToDoService.processed(entity.getId());
// 推送消息给工单创建人
if (entity.getCreateUserId() != null) {
QmsIssueTicketToDo todoItem = new QmsIssueTicketToDo()
.setTicketId(entity.getId())
.setHandlerUserId(entity.getCreateUserId());
issueTicketToDoService.save(todoItem);
}
// // 推送消息给工单创建人
// if (entity.getCreateUserId() != null) {
// QmsIssueTicketToDo todoItem = new QmsIssueTicketToDo()
// .setTicketId(entity.getId())
// .setHandlerUserId(entity.getCreateUserId());
// issueTicketToDoService.save(todoItem);
// }
if (request.getApprovalStatus() != 6) {
wmsIncomingInspectionTaskCallbackService.processAsync(entity.getSourceId(), request.getApprovalStatus());

29
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketTodoControllerService.java
View File

@ -34,19 +34,22 @@ public class QmsIssueTicketTodoControllerService {
if (CollectionUtil.isNotEmpty(pageData.getRecords())) {
pageData.getRecords().forEach(item -> {
item.setIsRead(true);
if (item.getStatus() != 2) {
item.setCurrentHandleUserName(
StrUtil.join(",",
issueTicketProcessService.lambdaQuery()
.select(QmsIssueTicketProcess::getHandlerUserName)
.eq(QmsIssueTicketProcess::getIssueTicketId, item.getTicketId())
.list()
.stream()
.map(QmsIssueTicketProcess::getHandlerUserName)
.toList()
)
);
if (item.getStatus() < 2) {
if (item.getSourceType() == 0) {
item.setCurrentHandleUserName(item.getCreateUserName());
} else {
item.setCurrentHandleUserName(
StrUtil.join(",",
issueTicketProcessService.lambdaQuery()
.select(QmsIssueTicketProcess::getHandlerUserName)
.eq(QmsIssueTicketProcess::getIssueTicketId, item.getTicketId())
.list()
.stream()
.map(QmsIssueTicketProcess::getHandlerUserName)
.toList()
)
);
}
}
});
}

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

@ -176,42 +176,43 @@ public class InProduceOrderController extends BaseController {
)
.toList();
produceOrderItemService.saveBatch(items);
qrCodeMasterService.saveBatch(
items.stream().map(it -> new WmsQrCodeMaster()
.setBarcodeCode(KeyUtil.next())
.setProcessStage(BarCodeProcessStage.ForStorage.getState())
.setBarcodeType(BarCodeType.Production.getState())
.setMaterialCode(it.getMaterialNo())
.setMaterialDescription(it.getMaterialDesc())
.setPackagingType((short) 0)
.setQuantity(NumberUtil.multiply(it.getNum(), parent.getNum()))
.setUnit(it.getUnit())
.setBatchNo(it.getBatchNo())
.setSerialNo(it.getSernr())
.setExtendId(it.getId())
.setCreateUserId(UserUtil.getUserId())
.setCreateUserName(UserUtil.getUserName())
.setCreateTime(LocalDateTime.now())
).toList()
);
} else {
qrCodeMasterService.save(new WmsQrCodeMaster()
.setBarcodeCode(KeyUtil.next())
.setProcessStage(BarCodeProcessStage.ForStorage.getState())
.setBarcodeType(BarCodeType.Production.getState())
.setMaterialCode(parent.getMaterialNo())
.setMaterialDescription(parent.getMaterialDesc())
.setPackagingType((short) 0)
.setQuantity(parent.getNum())
.setUnit(parent.getUnit())
.setBatchNo(parent.getBatchNo())
.setSerialNo(parent.getSernr())
.setExtendId(parent.getId())
.setCreateUserId(UserUtil.getUserId())
.setCreateUserName(UserUtil.getUserName())
.setCreateTime(LocalDateTime.now())
);
// qrCodeMasterService.saveBatch(
// items.stream().map(it -> new WmsQrCodeMaster()
// .setBarcodeCode(KeyUtil.next())
// .setProcessStage(BarCodeProcessStage.ForStorage.getState())
// .setBarcodeType(BarCodeType.Production.getState())
// .setMaterialCode(it.getMaterialNo())
// .setMaterialDescription(it.getMaterialDesc())
// .setPackagingType((short) 0)
// .setQuantity(NumberUtil.multiply(it.getNum(), parent.getNum()))
// .setUnit(it.getUnit())
// .setBatchNo(it.getBatchNo())
// .setSerialNo(it.getSernr())
// .setExtendId(it.getId())
// .setCreateUserId(UserUtil.getUserId())
// .setCreateUserName(UserUtil.getUserName())
// .setCreateTime(LocalDateTime.now())
// ).toList()
// );
}
// else {
// qrCodeMasterService.save(new WmsQrCodeMaster()
// .setBarcodeCode(KeyUtil.next())
// .setProcessStage(BarCodeProcessStage.ForStorage.getState())
// .setBarcodeType(BarCodeType.Production.getState())
// .setMaterialCode(parent.getMaterialNo())
// .setMaterialDescription(parent.getMaterialDesc())
// .setPackagingType((short) 0)
// .setQuantity(parent.getNum())
// .setUnit(parent.getUnit())
// .setBatchNo(parent.getBatchNo())
// .setSerialNo(parent.getSernr())
// .setExtendId(parent.getId())
// .setCreateUserId(UserUtil.getUserId())
// .setCreateUserName(UserUtil.getUserName())
// .setCreateTime(LocalDateTime.now())
// );
// }
if (request.isNeedInspection()) {
qmsService.pushPdiInspection(order.getOrderNo(), parent);
}
@ -286,7 +287,12 @@ public class InProduceOrderController extends BaseController {
if (order.getList()) {
items.removeIf(it -> it.getParentId() == 0);
}
List<QrCodeMasterPrintDTO> datas = convertToPrintDTO(qrCodeMasterService.getByExtendIds(items.stream().map(WmsInProduceOrderItem::getId).toList()));
BigDecimal parentNum = items.stream()
.filter(it -> it.getParentId() == 0)
.map(WmsInProduceOrderItem::getNum)
.findFirst()
.orElse(BigDecimal.ONE);
List<QrCodeMasterPrintDTO> datas = convertToPrintDTO(getQrCodesByItems(items,parentNum));
Map<String, Object> variables = new HashMap<>();
variables.put("list", datas);
if (Objects.equals(type, 1)) {
@ -300,6 +306,32 @@ public class InProduceOrderController extends BaseController {
}
}
private List<WmsQrCodeMaster> getQrCodesByItems(List<WmsInProduceOrderItem> items, BigDecimal parentNum) {
List<WmsQrCodeMaster> qrCodeMasters = qrCodeMasterService.getByExtendIds(items.stream().map(WmsInProduceOrderItem::getId).toList());
items.removeIf(it -> qrCodeMasters.stream().anyMatch(qr -> qr.getExtendId().equals(it.getId())));
if (CollectionUtil.isNotEmpty(items)){
List<WmsQrCodeMaster> qrNew=items.stream().map(it -> new WmsQrCodeMaster()
.setBarcodeCode(KeyUtil.next())
.setProcessStage(BarCodeProcessStage.ForStorage.getState())
.setBarcodeType(BarCodeType.Production.getState())
.setMaterialCode(it.getMaterialNo())
.setMaterialDescription(it.getMaterialDesc())
.setPackagingType((short) 0)
.setQuantity(NumberUtil.multiply(it.getNum(), parentNum))
.setUnit(it.getUnit())
.setBatchNo(it.getBatchNo())
.setSerialNo(it.getSernr())
.setExtendId(it.getId())
.setCreateUserId(UserUtil.getUserId())
.setCreateUserName(UserUtil.getUserName())
.setCreateTime(LocalDateTime.now())
).toList();
qrCodeMasterService.saveBatch(qrNew);
qrCodeMasters.addAll(qrNew);
}
return qrCodeMasters;
}
/**
* 导出物料标签图片ZIP
* @param id 订单ID
@ -314,7 +346,12 @@ public class InProduceOrderController extends BaseController {
if (order.getList()) {
items.removeIf(it -> it.getParentId() == 0);
}
List<QrCodeMasterPrintDTO> datas = convertToPrintDTO(qrCodeMasterService.getByExtendIds(items.stream().map(WmsInProduceOrderItem::getId).toList()));
BigDecimal parentNum = items.stream()
.filter(it -> it.getParentId() == 0)
.map(WmsInProduceOrderItem::getNum)
.findFirst()
.orElse(BigDecimal.ONE);
List<QrCodeMasterPrintDTO> datas = convertToPrintDTO(getQrCodesByItems(items, parentNum));
ByteArrayOutputStream baos = new ByteArrayOutputStream();
try (ZipOutputStream zos = new ZipOutputStream(baos)) {
for (QrCodeMasterPrintDTO it : datas) {

2
nflg-wms-common/src/main/java/com/nflg/wms/common/constant/BarCodeProcessStage.java
View File

@ -57,7 +57,7 @@ public enum BarCodeProcessStage {
*/
Reject((short) 11, "拒收"),
/**
* 已拒收
* 已越库
*/
Cross((short) 12, "已越库");

2
nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml
View File

@ -177,7 +177,7 @@
)
</if>
</where>
ORDER BY t.required_finish_time ASC
ORDER BY t.inspection_status,t.required_finish_time ASC
</select>
<select id="getDetail" resultType="com.nflg.wms.common.pojo.vo.QmsIncomingInspectionTaskVO">

2
nflg-wms-repository/src/main/resources/mapper/WmsOutAssistanceItemMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.nflg.wms.repository.mapper.WmsOutAssistanceItemMapper">
<select id="getLockedNum" resultType="java.math.BigDecimal">
SELECT COALESCE(SUM(oai."left",0)) AS "lockedNum"
SELECT COALESCE(SUM(oai."left"),0) AS "lockedNum"
FROM wms_out_assistance_item oai
INNER JOIN wms_out_assistance oa ON oai.order_id=oa."id"
WHERE oa.ebeln=#{ebeln} AND oai.ebelp=#{ebelp}