mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_1.0.2' into dev_1.0.2

dev_1.0.2
wangy 2026-05-15 12:34:30 +08:00
parent d9effe68c0 00f91b394a
commit 2fdbafa0c3
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
oms_web/oms_vue/src/views/inventory/inner/index.vue
View File

@ -196,7 +196,7 @@
<el-table :data="form.inventoryInfoList"> <el-table :data="form.inventoryInfoList">
<template v-if="!isServiceIn"> <template v-if="!isServiceIn">
<el-table-column type="index" label="序号"/> <el-table-column type="index" label="序号"/>
<el-table-column label="SN码" prop="productSn" /> <el-table-column label="SN码" prop="productSn" width="250" />
<el-table-column label="授权码" prop="licenseKey" /> <el-table-column label="授权码" prop="licenseKey" />
<el-table-column label="产品编码" prop="productCode" /> <el-table-column label="产品编码" prop="productCode" />
<el-table-column label="产品型号" prop="model" /> <el-table-column label="产品型号" prop="model" />
@ -399,6 +399,10 @@ export default {
this.$modal.msgError("SN码最后一位必须为数字"); this.$modal.msgError("SN码最后一位必须为数字");
return; return;
} }
if (snNumber.length > 6) {
snPrefix = snPrefix + snNumber.substring(0, snNumber.length - 6);
snNumber = snNumber.substring(snNumber.length - 6);
}
let startNumber = parseInt(snNumber); let startNumber = parseInt(snNumber);
let productsToAdd = []; let productsToAdd = [];

8
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java
View File

@ -19,6 +19,7 @@ import com.ruoyi.sip.mapper.InventoryOuterMapper;
import com.ruoyi.sip.service.*; import com.ruoyi.sip.service.*;
import com.ruoyi.sip.vo.DeliveryApproveVo; import com.ruoyi.sip.vo.DeliveryApproveVo;
import com.ruoyi.sip.vo.DeliveryInfoVo; import com.ruoyi.sip.vo.DeliveryInfoVo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
@ -37,6 +38,7 @@ import javax.annotation.Resource;
* @author ruoyi * @author ruoyi
* @date 2025-08-12 * @date 2025-08-12
*/ */
@Slf4j
@Service @Service
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService { public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
@ -328,10 +330,12 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
public void generateServiceBillsWhenAllDelivered(String orderCode) { public void generateServiceBillsWhenAllDelivered(String orderCode) {
ProjectOrderInfo orderInfo = projectOrderInfoService.selectProjectOrderInfoByOrderCode(orderCode); ProjectOrderInfo orderInfo = projectOrderInfoService.selectProjectOrderInfoByOrderCode(orderCode);
if (ObjectUtils.isEmpty(orderInfo)) { if (ObjectUtils.isEmpty(orderInfo)) {
throw new ServiceException("无对应订单信息"); log.warn("无对应订单信息");
return;
} }
if (!ProjectOrderInfo.DeliveryStatusEnum.ALL_DELIVERY.getCode().equals(orderInfo.getDeliveryStatus())) { if (!ProjectOrderInfo.DeliveryStatusEnum.ALL_DELIVERY.getCode().equals(orderInfo.getDeliveryStatus())) {
throw new ServiceException("当前订单未全部发货"); log.warn("当前订单未全部发货");
return;
} }
List<ProjectProductInfo> serviceProductInfos = CollUtil.isEmpty(orderInfo.getMaintenanceProjectProductInfoList()) List<ProjectProductInfo> serviceProductInfos = CollUtil.isEmpty(orderInfo.getMaintenanceProjectProductInfoList())
? Collections.emptyList() ? Collections.emptyList()