yunxi
/
jigangSCM2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

4.24测试问题修改

Browse Source
jg-waiwang-pro
vayne 6 months ago
parent be51f68fe0
commit fb3d17d46f
10 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File

16
jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ReturnCargoOrderMapper.xml
Unescape View File

@ -58,14 +58,12 @@
WHEN '2' THEN
'待审核'
WHEN '3' THEN
'待锁定'
WHEN '4' THEN
'待出库'
WHEN '5' THEN
WHEN '4' THEN
'部分出库'
WHEN '6' THEN
WHEN '5' THEN
'已完成'
WHEN '7' THEN
WHEN '6' THEN
'已关闭'
END
WHEN document_type = '2' THEN
@ -76,12 +74,14 @@
WHEN '2' THEN
'待审核'
WHEN '3' THEN
'待出库'
'待锁定'
WHEN '4' THEN
'部分出库'
'待出库'
WHEN '5' THEN
'已完成'
'部分出库'
WHEN '6' THEN
'已完成'
WHEN '7' THEN
'已关闭'
END
END AS documentStatus1,

2
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessLineConfigServiceImpl.java
Unescape View File

@ -160,7 +160,7 @@ public class BusinessLineConfigServiceImpl extends ServiceImpl<BusinessLineConfi
allRuleIDlist = allRuleList;
}
}
boolean pcPermission = false;
boolean pcPermission = true;
boolean appPermission = false;
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){

2
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessLineServiceImpl.java
Unescape View File

@ -188,7 +188,7 @@ public class BusinessLineServiceImpl extends ServiceImpl<BusinessLineMapper, Bus
allRuleIDlist = allRuleList;
}
}
boolean pcPermission = false;
boolean pcPermission = true;
boolean appPermission = false;
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){

8
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java
Unescape View File

@ -260,7 +260,7 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
String value = businessOrderPagination.getBusinessType() instanceof List ?
JsonUtil.getObjectToString(businessOrderPagination.getBusinessType()) :
String.valueOf(businessOrderPagination.getBusinessType());
businessOrderQueryWrapper.like("a.business_type",value);
businessOrderQueryWrapper.eq("a.business_type",value);
}
@ -270,7 +270,7 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
String value = businessOrderPagination.getDeliveryType() instanceof List ?
JsonUtil.getObjectToString(businessOrderPagination.getDeliveryType()) :
String.valueOf(businessOrderPagination.getDeliveryType());
businessOrderQueryWrapper.like("a.delivery_type",value);
businessOrderQueryWrapper.eq("a.delivery_type",value);
}
@ -603,7 +603,7 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
String value = businessOrderPagination.getBusinessType() instanceof List ?
JsonUtil.getObjectToString(businessOrderPagination.getBusinessType()) :
String.valueOf(businessOrderPagination.getBusinessType());
businessOrderQueryWrapper.like("a.business_type",value);
businessOrderQueryWrapper.eq("a.business_type",value);
}
@ -613,7 +613,7 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
String value = businessOrderPagination.getDeliveryType() instanceof List ?
JsonUtil.getObjectToString(businessOrderPagination.getDeliveryType()) :
String.valueOf(businessOrderPagination.getDeliveryType());
businessOrderQueryWrapper.like("a.delivery_type",value);
businessOrderQueryWrapper.eq("a.delivery_type",value);
}

2
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java
Unescape View File

@ -154,7 +154,7 @@ public class VoucherController {
List<Map<String, Object>> realList=new ArrayList<>();
for (VoucherEntity entity : list) {
List<String> placeDispatchArr = JSON.parseArray(entity.getPlaceDispatch(), String.class);
List<String> destinationArr = JSON.parseArray(entity.getPlaceDispatch(), String.class);
List<String> destinationArr = JSON.parseArray(entity.getDestination(), String.class);
List<ProvinceEntity> placeDispatchList = provinceService.getProList(placeDispatchArr);
List<ProvinceEntity> destinationList = provinceService.getProList(destinationArr);
List<String> placeDispatchs = placeDispatchList.stream().map(ProvinceEntity::getFullName).collect(Collectors.toList());

9
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/form.vue
Unescape View File

@ -500,11 +500,10 @@
@change="changeData('vouchervehicle-vehicleId', scope.$index)"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.vouchervehiclevehicleId" placeholder="请选择"
:disabled="judgeWrite('vouchervehicleList') || judgeWrite('vouchervehicleList-vehicleId')"
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='vehicle_number' :field="'vehicleId' + scope.$index"
interfaceId="529920852288864453" :pageSize="20"
:columnOptions="vouchervehiclevehicleIdcolumnOptions" clearable
:disabled="true" propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='vehicle_number'
:field="'vehicleId' + scope.$index" interfaceId="529920852288864453"
:pageSize="20" :columnOptions="vouchervehiclevehicleIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>

2
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/form.vue
Unescape View File

@ -1436,7 +1436,7 @@ export default {
currencyProps: { "label": "fullName", "value": "id" },
saleModeOptions: [{ "fullName": "以销定采", "id": "1" }, { "fullName": "以采定销", "id": "2" }],
saleModeProps: { "label": "fullName", "value": "id" },
correlatedOrderIdcolumnOptions: [{ "label": "订单编号", "value": "code" }, { "label": "单据类型", "value": "order_type" }, { "label": "是否紧急订单", "value": "urgent_order" },],
correlatedOrderIdcolumnOptions: [{ "label": "订单编号", "value": "code" }, { "label": "单据类型", "value": "orderType1" }, { "label": "状态", "value": "saleStatus" },],
fixPriceModeOptions: [{ "fullName": "锁价模式", "id": "1" }, { "fullName": "后结算模式", "id": "2" }],
fixPriceModeProps: { "label": "fullName", "value": "id" },
secondSubjectBasicIdcolumnOptions: [{ "label": "供应商名称", "value": "name" }, { "label": "国家", "value": "country" }, { "label": "地址", "value": "address" }, { "label": "电话", "value": "phone" }],

11
jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptVoucher/form.vue
Unescape View File

@ -469,7 +469,9 @@
<template slot-scope="scope">
<JnpfInput v-model="scope.row.driverName"
@change="changeData('vouchervehicle-driverName', scope.$index)"
placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
placeholder="请输入"
:disabled="judgeWrite('vouchervehicleList') || judgeWrite('vouchervehicleList-driverName')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -482,7 +484,9 @@
<template slot-scope="scope">
<JnpfInput v-model="scope.row.telephone"
@change="changeData('vouchervehicle-telephone', scope.$index)"
placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
placeholder="请输入"
:disabled="judgeWrite('vouchervehicleList') || judgeWrite('vouchervehicleList-telephone')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -495,7 +499,8 @@
<template slot-scope="scope">
<JnpfInput v-model="scope.row.carrier"
@change="changeData('vouchervehicle-carrier', scope.$index)" placeholder="请输入"
:disabled="true" clearable :style='{ "width": "100%" }'>
:disabled="judgeWrite('vouchervehicleList') || judgeWrite('vouchervehicleList-carrier')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>

3
jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue
Unescape View File

@ -1349,7 +1349,7 @@ export default {
currencyProps: { "label": "fullName", "value": "id" },
saleModeOptions: [{ "fullName": "以销定采", "id": "1" }, { "fullName": "以采定销", "id": "2" }],
saleModeProps: { "label": "fullName", "value": "id" },
correlatedOrderIdcolumnOptions: [{ "label": "订单编号", "value": "code" }, { "label": "单据类型", "value": "order_type" }, { "label": "是否紧急订单", "value": "urgent_order" },],
correlatedOrderIdcolumnOptions: [{ "label": "订单编号", "value": "code" }, { "label": "单据类型", "value": "orderType1" }, { "label": "状态", "value": "purchaseStatus" },],
fixPriceModeOptions: [{ "fullName": "锁价模式", "id": "1" }, { "fullName": "后结算模式", "id": "2" }],
fixPriceModeProps: { "label": "fullName", "value": "id" },
secondSubjectBasicIdcolumnOptions: [{ "label": "客户名称", "value": "name" }, { "label": "国家", "value": "country" }, { "label": "地址", "value": "address" }, { "label": "电话", "value": "phone" }],
@ -1791,6 +1791,7 @@ export default {
this.dataForm.businessOrderProductRelationalList = data[0].businessOrderProductRelationalList
}
if (data.flag == '发货凭证生成销售订单') {
debugger
this.productCreate = true
this.dataForm.orderType = '3'
this.dataForm.enterpriseId = data[0].supplierId

1
jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOutBoundNotice/form.vue
Unescape View File

@ -924,6 +924,7 @@ export default {
item.warehousingUnitId = item.salesMainUnitId;
}
);
debugger
this.dataForm.warehousingProductList =
saleOrder.businessOrderProductRelationalList;
});

Write Preview
Loading…
Cancel
Save