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

fix：入库单录入时修改采购状态

dev_1.0.2
jiangpeng 2026-04-21 17:46:42 +08:00
parent 53b84e0c9b
commit ce4044bf8c
10 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oms_web/oms_vue/src/views/finance/payment/index.vue
View File

@ -149,6 +149,8 @@
</el-row>
<el-table v-loading="loading" :data="paymentList" show-summary :summary-method="getSummaries">
<el-table-column label="项目编号" align="center" prop="projectCode" width="120" />
<el-table-column label="项目名称" align="center" prop="projectName" width="260" />
<el-table-column label="采购-付款单编号" width="200" align="center" prop="paymentBillCode">
<template slot-scope="scope">
<a @click="handleDetail(scope.row)" class="link-type">{{ scope.row.paymentBillCode }}</a>

2
oms_web/oms_vue/src/views/finance/receive/index.vue
View File

@ -123,6 +123,8 @@
</el-row>
<el-table v-loading="loading" :data="receiveList">
<el-table-column label="项目编号" align="center" prop="projectCode" width="120" />
<el-table-column label="项目名称" align="center" prop="projectName" width="260" />
<el-table-column label="销售-收款单编号" align="center" prop="receiptBillCode" width="180" />
<el-table-column label="预计收款时间" align="center" prop="receiptTime" width="120">
<template slot-scope="scope">

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

@ -422,7 +422,7 @@ export default {
handleQuery() {
this.queryParams.pageNum = 1;
if (this.activeTab==='service'){
this.queryParams.productTypeList = ['11','22','70'];
this.queryParams.productTypeList = ['3','11','22','70'];
}else{
this.queryParams.productTypeList = ['1','2','99'];
}
@ -453,7 +453,7 @@ export default {
this.reset();
if (type==='maintenance'){
this.isServiceIn = true;
this.queryProductType=['11','22','70']
this.queryProductType=['3','11','22','70']
}else{
this.isServiceIn = false;
this.queryProductType=['1','2','99']
@ -494,7 +494,7 @@ export default {
const id = row.id;
getInner(id).then(response => {
this.form = response.data;
if (['11', '22'].includes(this.form.productType)) {
if (['3','11', '22'].includes(this.form.productType)) {
this.detailComponent = 'ServiceDetail';
} else {
this.detailComponent = 'OrderDetail';

2
oms_web/oms_vue/src/views/system/product/index.vue
View File

@ -250,7 +250,7 @@
<el-form-item label="产品描述" prop="description">
<el-input v-model="form.description" type="textarea" placeholder="请输入产品描述" />
</el-form-item>
<el-form-item v-if="form.type == '11' || form.type == '22'" label="维保年限" prop="value">
<el-form-item v-if="form.type == '11' || form.type == '22' || form.type == '3'" label="维保年限" prop="value">
<el-input-number v-model="form.value" placeholder="请输入维保年限" />
</el-form-item>
</el-form>

2
ruoyi-admin/src/main/resources/templates/system/product/add.html
View File

@ -139,7 +139,7 @@
});
function changeType(){
let type=$('[name="type"]').val()
if(type=='11'||type=='22'){
if(type=='3'||type=='11'||type=='22'){
$('#valueBox').show()
}else{
$('#valueBox').hide()

2
ruoyi-admin/src/main/resources/templates/system/product/edit.html
View File

@ -120,7 +120,7 @@
}
function changeType(){
let type=$('[name="type"]').val()
if(type=='11'||type=='22'){
if(type=='3'||type=='11'||type=='22'){
$('#valueBox').show()
}else{
$('#valueBox').hide()

16
ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPaymentBill.java
View File

@ -26,6 +26,14 @@ public class OmsPaymentBill extends BaseEntity
/** 主键ID */
private Long id;
/** 项目编号 */
@Excel(name = "项目编号")
private String projectCode;
/** 项目名称 */
@Excel(name = "项目名称")
private String projectName;
/** 付款单编号 */
@Excel(name = "付款单编号")
private String paymentBillCode;
@ -65,14 +73,6 @@ public class OmsPaymentBill extends BaseEntity
/** 删除标志（0代表存在 2代表删除） */
private String delFlag;
/** 项目编号 */
@Excel(name = "项目编号")
private String projectCode;
/** 项目名称 */
@Excel(name = "项目名称")
private String projectName;
/** 预付单剩余额度 */
// @Excel(name = "预付单剩余额度")
private BigDecimal preResidueAmount;

4
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsInventoryInnerServiceImpl.java
View File

@ -190,6 +190,8 @@ public class OmsInventoryInnerServiceImpl implements IOmsInventoryInnerService {
});
inventoryInfoService.saveBatch(inventoryInfoList);
productInfoService.updateAvailableCount(omsInventoryInner.getQuantity(),omsInventoryInner.getProductCode());
//修改对应的采购订单
purchaseOrderService.innerWarehouse(omsInventoryInner.getItemId(),omsInventoryInner.getQuantity());
return omsInventoryInnerMapper.insertOmsInventoryInner(omsInventoryInner);
}
@ -211,6 +213,8 @@ public class OmsInventoryInnerServiceImpl implements IOmsInventoryInnerService {
@Override
public int updateOmsInventoryInner(OmsInventoryInner omsInventoryInner) {
omsInventoryInner.setUpdateTime(DateUtils.getNowDate());
//修改对应的采购订单
purchaseOrderService.innerWarehouse(omsInventoryInner.getItemId(),omsInventoryInner.getQuantity());
return omsInventoryInnerMapper.updateOmsInventoryInner(omsInventoryInner);
}

6
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java
View File

@ -368,12 +368,14 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To
BigDecimal totalQuantity = entry.getValue().stream()
.map(OmsPurchaseOrderItem::getQuantity)
.filter(Objects::nonNull)
.reduce(BigDecimal.ZERO, BigDecimal::add);
.reduce(BigDecimal.ZERO, BigDecimal::add)
.max(BigDecimal.ZERO);
BigDecimal totalInnerQuantity = entry.getValue().stream()
.map(OmsPurchaseOrderItem::getInnerQuantity)
.filter(Objects::nonNull)
.reduce(BigDecimal.ZERO, BigDecimal::add);
.reduce(BigDecimal.ZERO, BigDecimal::add)
.max(BigDecimal.ZERO);
// 根据规则判断状态
int status;

2
ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapper.xml
View File

@ -472,7 +472,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<foreach collection="list" item="item" index="index" separator=";">
update oms_purchase_order_item t1
left join oms_purchase_order t2 on t1.purchase_id = t2.id
set t1.inner_quantity = t1.inner_quantity- #{item.innerQuantity}
set t1.inner_quantity = (case when t1.inner_quantity- #{item.innerQuantity} &lt; 0 then 0 else t1.inner_quantity- #{item.innerQuantity} end)
where t1.product_code = #{item.productCode} and t2.purchase_no=#{item.purchaseNo}
</foreach>
</update>