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

Merge branch 'refs/heads/master' into dev_1.0.0

dev_1.0.0
chenhao 2025-12-12 11:00:27 +08:00
parent 2f51b56298 0b1d0f45cc
commit a19909d1bf
22 changed files with 142 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
oms_web/oms_vue/src/api/system/user.js
View File

@ -79,7 +79,7 @@ export function changeUserStatus(userId, status) {
// 查询用户个人信息
export function getUserProfile() {
return request({
url: '/system/user/profile',
url: '/system/user/profile/vue',
method: 'get'
})
}
@ -94,14 +94,11 @@ export function updateUserProfile(data) {
}
// 用户密码重置
export function updateUserPwd(oldPassword, newPassword) {
const data = {
oldPassword,
newPassword
}
export function updateUserPwd(data) {
return request({
url: '/system/user/profile/updatePwd',
method: 'put',
url: '/system/user/profile/resetPwd',
method: 'post',
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
data: data
})
}

22
oms_web/oms_vue/src/router/index.js
View File

@ -74,6 +74,28 @@ export const constantRoutes = [
}
]
},
{
path: '/purchase',
component: Layout,
children: [
{
path: 'approved',
component: () => import('@/views/approve/purchaase/approved/index'),
hidden: true
},
]
},
{
path: '/approve',
component: Layout,
children: [
{
path: 'orderLog',
component: () => import('@/views/approve/approved_order/index'),
hidden: true
},
]
},
{
path: '/user',
component: Layout,

8
oms_web/oms_vue/src/views/approve/approved_order/index.vue
View File

@ -56,6 +56,14 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
size="mini"
@click="()=>{this.$router.back()}"
>返回</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>

16
oms_web/oms_vue/src/views/approve/order/index.vue
View File

@ -58,7 +58,18 @@
<el-row :gutter="10" class="mb8">
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
size="mini"
@click="toApproved()"
>审批历史</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="orderList">
<el-table-column label="合同编号" align="center" prop="orderCode" />
<el-table-column label="项目名称" align="center" prop="projectName" />
@ -155,6 +166,11 @@ export default {
this.getList();
},
methods: {
toApproved(){
this.$router.push({
path: '/approve/orderLog',
});
},
/** 查询订单列表 */
getList() {
this.loading = true;

15
oms_web/oms_vue/src/views/approve/purchaase/approve/index.vue
View File

@ -29,7 +29,18 @@
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
size="mini"
@click="toApproved()"
>审批历史</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="purchaseorderList">
<!-- 表格列定义 -->
<el-table-column label="序号" type="index" width="50" align="center" />
@ -122,6 +133,7 @@ export default {
loading: true,
showSearch: true,
total: 0,
confirmDialogTitle:'',
purchaseorderList: [],
queryParams: {
pageNum: 1,
@ -168,6 +180,9 @@ export default {
});
},
methods: {
toApproved(){
this.$router.push( '/purchase/approved' )
},
// 列表页方法
getList() {
this.loading = true;

11
oms_web/oms_vue/src/views/approve/purchaase/approved/index.vue
View File

@ -29,7 +29,18 @@
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
size="mini"
@click="()=>{this.$router.back()}"
>返回</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="purchaseorderList">
<!-- 表格列定义 -->
<el-table-column label="序号" type="index" width="50" align="center" />

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

@ -421,7 +421,7 @@ export default {
handleQuery() {
this.queryParams.pageNum = 1;
if (this.activeTab==='service'){
this.queryParams.productTypeList = ['11','22'];
this.queryParams.productTypeList = ['11','22','70'];
}else{
this.queryParams.productTypeList = ['1','2','99'];
}
@ -452,7 +452,7 @@ export default {
this.reset();
if (type==='maintenance'){
this.isServiceIn = true;
this.queryProductType=['11','22']
this.queryProductType=['11','22','70']
}else{
this.isServiceIn = false;
this.queryProductType=['1','2','99']

2
oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue
View File

@ -177,7 +177,7 @@ export default {
});
},
handleSelectPurchaseBeforeImport() {
if ((this.productData.orderType || '1') === '1') {
if (((this.productData.orderType || '1') === '1' ) && !(this.outerData.vendorName.startsWith('新华三') && this.productData.productType==='2')) {
this.purchaseOrderSelectVisible = true;
}else{
this.handleImport()

10
oms_web/oms_vue/src/views/project/order/OrderDetail.vue
View File

@ -149,7 +149,7 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<select-project :visible.sync="selectProjectVisible" @project-selected="handleProjectSelected"/>
<select-project :visible.sync="selectProjectVisible" @project-selected="selectProject"/>
<select-user :visible.sync="selectUserVisible" @user-selected="handleUserSelected"/>
<select-partner :visible.sync="selectPartnerVisible" @partner-selected="handlePartnerSelected"/>
<select-commit-type :visible.sync="selectCommitTypeVisible" :order-channel="form.orderChannel" @commit-type-selected="handleCommitTypeSelected"/>
@ -400,8 +400,6 @@ export default {
]
});
this.activeContractVersionTab = currentVersion;
console.log('11111')
console.log(this.projectId)
if (this.projectId) {
getProject(this.projectId).then(response => {
this.handleProjectSelected(response.data.project);
@ -409,6 +407,11 @@ export default {
}
}
},
selectProject(projectData){
getProject(projectData.id).then(response => {
this.handleProjectSelected(response.data.project);
});
},
handleClose() {
this.$emit('update:visible', false);
},
@ -505,6 +508,7 @@ export default {
this.form.industryType = projectData.industryType;
this.isProjectSelected = true;
this.selectProjectVisible = false;
this.form.shipmentAmount = this.totalConfigAmount;
},
openSelectPeople() {
this.selectUserVisible = true;

4
oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderDetail.vue
View File

@ -19,7 +19,7 @@
<el-col :span="12">
<el-form-item label="制造商" prop="vendorId">
<el-select v-model="form.vendorId" placeholder="请选择制造商" style="width:100%" @change="handleVendorChange">
<el-option v-for="item in vendorOptions" :key="item.vendorId" :label="item.vendorName" :value="item.vendorId"></el-option>
<el-option v-for="item in vendorOptions" :key="item.vendorId" :label="item.vendorAddress" :value="item.vendorId"></el-option>
</el-select>
</el-form-item>
</el-col>
@ -27,7 +27,7 @@
<el-row v-if="selectedVendor.vendorId">
<el-col :span="12">
<el-form-item label="制造商名称">
<span>{{ selectedVendor.vendorAddress }}</span>
<span>{{ selectedVendor.vendorName }}</span>
</el-form-item>
</el-col>
<el-col :span="12">

5
oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderDetailView.vue
View File

@ -142,6 +142,11 @@
<span>{{ scope.row.price }}</span>
</template>
</el-table-column>
<el-table-column label="税率(%)" prop="taxRate">
<template slot-scope="scope">
<span>{{ scope.row.taxRate *100}}</span>
</template>
</el-table-column>
<el-table-column label="含税小计" prop="amountTotal"></el-table-column>
<el-table-column label="交货日期">
<template slot-scope="scope">

6
oms_web/oms_vue/src/views/system/user/profile/index.vue
View File

@ -25,7 +25,7 @@
</li>
<li class="list-group-item">
<svg-icon icon-class="tree" />所属部门
<div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div>
<div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} </div>
</li>
<li class="list-group-item">
<svg-icon icon-class="peoples" />所属角色
@ -86,8 +86,8 @@ export default {
getUser() {
getUserProfile().then(response => {
this.user = response.data
this.roleGroup = response.roleGroup
this.postGroup = response.postGroup
this.roleGroup = this.user.roles.map(item=>item.roleName).join(',')
})
}
}

9
oms_web/oms_vue/src/views/system/user/profile/resetPwd.vue
View File

@ -55,7 +55,14 @@ export default {
submit() {
this.$refs["form"].validate(valid => {
if (valid) {
updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
let data={
userId:this.user.userId,
loginName:this.user.loginName,
oldPassword: this.user.oldPassword,
newPassword: this.user.newPassword,
confirmPassword: this.user.newPassword
}
updateUserPwd(data).then(response => {
this.$modal.msgSuccess("修改成功")
})
}

8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
View File

@ -56,6 +56,14 @@ public class SysProfileController extends BaseController
mmap.put("postGroup", userService.selectUserPostGroup(user.getUserId()));
return prefix + "/profile";
}
@GetMapping("/vue")
@ResponseBody
public AjaxResult profileVue()
{
SysUser user = getSysUser();
return AjaxResult.success(user);
}
@GetMapping("/checkPassword")
@ResponseBody

7
ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectOrderInfoController.java
View File

@ -142,6 +142,13 @@ public class ProjectOrderInfoController extends BaseController
// return prefix + "/approve";
return AjaxResult.success();
}
@PostMapping("/order/approve/batch")
@ResponseBody
public AjaxResult approveOrderBatch(@RequestBody Todo todo) {
projectOrderInfoService.approveOrderBatch(todo);
return AjaxResult.success();
}
/**
* 查询订单管理列表
*/

1
ruoyi-sip/src/main/java/com/ruoyi/sip/domain/InventoryOuterDetail.java
View File

@ -42,5 +42,6 @@ public class InventoryOuterDetail extends BaseEntity
private String productCode;
private String model;
private String productName;
private String productType;
}

2
ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProjectOrderInfoService.java
View File

@ -103,4 +103,6 @@ public interface IProjectOrderInfoService
String financeExport(ProjectOrderInfo projectOrderInfo);
void approveOrderBatch(Todo todo);
}

1
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryOuterServiceImpl.java
View File

@ -271,6 +271,7 @@ public class InventoryOuterServiceImpl implements IInventoryOuterService
vo.setId(item.getId());
vo.setProductCode(item.getProductCode());
vo.setModel(item.getModel());
vo.setProductType(item.getProductType());
vo.setQuantity(item.getQuantity());
vo.setWarehouseId(item.getWarehouseId());
vo.setWarehouseName(item.getWarehouseName());

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

@ -276,7 +276,7 @@ public class OmsInventoryInnerServiceImpl implements IOmsInventoryInnerService {
throw new ServiceException("产品编码对应产品未找到");
}
Map<String, OmsWarehouseInfo> warehouseInfoMap=Collections.emptyMap();
if ("2".equalsIgnoreCase(orderType)){
if ("2".equalsIgnoreCase(orderType) || (("2".equalsIgnoreCase(productInfos.get(0).getType()) && productInfos.get(0).getVendorName().startsWith("新华三"))) ){
List<String> warehouseNameList = inventoryInfoExcelDtoList.stream().map(InventoryInfoExcelDto::getWarehouseName).distinct().collect(Collectors.toList());
if (warehouseNameList.size() > 1){
throw new ServiceException("导入清单只能有一个仓库");
@ -297,7 +297,7 @@ public class OmsInventoryInnerServiceImpl implements IOmsInventoryInnerService {
info.setModel(productInfos.get(0).getModel());
info.setProductDesc(productInfos.get(0).getDescription());
info.setInnerPrice(item.getInnerPrice());
if ("2".equalsIgnoreCase(orderType)){
if ("2".equalsIgnoreCase(orderType)|| (("2".equalsIgnoreCase(productInfos.get(0).getType()) && productInfos.get(0).getVendorName().startsWith("新华三"))) ){
OmsWarehouseInfo omsWarehouseInfo = finalWarehouseInfoMap.get(item.getWarehouseName());
info.setWarehouseId(omsWarehouseInfo.getId());
info.setWarehouseName(omsWarehouseInfo.getWarehouseName());

13
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
View File

@ -1552,6 +1552,19 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
}
}
@Override
public void approveOrderBatch(Todo todo) {
Todo query = new Todo();
query.setApproveUser(getSysUser().getUserId().toString());
query.setProcessKeyList(Arrays.asList(orderOnlineFlowKey,orderOfflineFlowKey));
List<Todo> list = todoService.selectTodoList(query);
for (Todo todo1 : list) {
todo1.setVariables(new HashMap<>(todo.getVariables()));
approveOrder(todo1);
}
}
/**
* 生成第一个sheet的数据
*

1
ruoyi-sip/src/main/java/com/ruoyi/sip/vo/OuterDeliveryProductVo.java
View File

@ -28,5 +28,6 @@ public class OuterDeliveryProductVo {
private String warehouseName;
private String orderType;
private Long warehouseId;
private String productType;
}

3
ruoyi-sip/src/main/resources/mapper/inventory/InventoryOuterDetailMapper.xml
View File

@ -21,7 +21,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
t2.warehouse_name,
t4.product_code,
t4.model,
t4.available_count
t4.available_count,
t4.type as product_type
from oms_inventory_outer_detail t1
left join oms_warehouse_info t2 on t1.warehouse_id=t2.id
left join oms_inventory_outer t3 on t1.outer_code=t3.outer_code