yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
product
chuang 2 years ago
parent 9474ebc8e7 3cefa1410e
commit 1e9b2fb2af
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File

24
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java
Unescape View File

@ -756,9 +756,9 @@ public class SaleorderitemController {
// Map<String,Object> materialIdMap = new HashMap<>();
// jg_salesorder_item0Model.setMaterialId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_name",jg_salesorder_item0Model.getMaterialId(),materialIdMap));
// }
if (jg_salesorder_item0ModelList!=null && jg_salesorder_item0ModelList.size()>0) {
vo.setSalesorder_item0List(jg_salesorder_item0ModelList);
}
List<ReceiptoutsoitemEntity> jg_receiptoutList = saleorderitemService.GetReceiptoutsoitemList(id);
List<ReceiptoutsoitemModel> jg_receiptoutModelList = new ArrayList<>();
if (jg_receiptoutList!=null && jg_receiptoutList.size()>0) {
@ -777,9 +777,9 @@ public class SaleorderitemController {
// jg_receiptoutModel.setWarehouseId(generaterSwapUtil.getPopupSelectValue("399117969575232581","id","name",jg_receiptoutModel.getWarehouseId(),warehouseMap));
}
}
if (jg_receiptoutModelList!=null && jg_receiptoutModelList.size()>0) {
vo.setReceiptoutsoitemList(jg_receiptoutModelList);
}
QueryWrapper<ArinvoicesEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(ArinvoicesEntity::getSalesOrderId,id);
List<ArinvoicesEntity> arinvoicesList = arinvoicesService.list(queryWrapper);
@ -795,9 +795,9 @@ public class SaleorderitemController {
jg_arinvoices_item0Model.setAttachMent(generaterSwapUtil.getFileNameInJson(jg_arinvoices_item0Model.getAttachMent()));
}
}
if (jg_arinvoices_item0ModelList!=null && jg_arinvoices_item0ModelList.size()>0) {
vo.setArinvoices_item0soitemList(jg_arinvoices_item0ModelList);
}
QueryWrapper<Collection_item0Entity> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.lambda().eq(Collection_item0Entity::getSalesorderId,id);
List<Collection_item0Entity> collection_item0Entity = collection_item0Service.list(queryWrapper1);
@ -811,23 +811,23 @@ public class SaleorderitemController {
List<CollectionsoitemModel> jg_collectionModelList = JsonUtil.getJsonToList(collectionsoitemEntityList, CollectionsoitemModel.class);
for (CollectionsoitemModel jg_collectionModel : jg_collectionModelList) {
}
if (jg_collectionModelList!=null && jg_collectionModelList.size()>0) {
vo.setCollectionsoitemList(jg_collectionModelList);
}
List<SalesbacksoitemEntity> jg_salesbackList = saleorderitemService.GetSalesbacksoitemList(id);
List<SalesbacksoitemModel> jg_salesbackModelList = JsonUtil.getJsonToList(jg_salesbackList,SalesbacksoitemModel.class);
for(SalesbacksoitemModel jg_salesbackModel : jg_salesbackModelList){
}
if (jg_salesbackModelList!=null && jg_salesbackModelList.size()>0) {
vo.setSalesbacksoitemList(jg_salesbackModelList);
}
List<PaymentsoitemEntity> jg_paymentList = saleorderitemService.GetPaymentsoitemList(id);
List<PaymentsoitemModel> jg_paymentModelList = JsonUtil.getJsonToList(jg_paymentList,PaymentsoitemModel.class);
for(PaymentsoitemModel jg_paymentModel : jg_paymentModelList){
}
if (jg_paymentModelList!=null && jg_paymentModelList.size()>0) {
vo.setPaymentsoitemList(jg_paymentModelList);
}
List<PoundlistEntity> poundlist = saleorderitemService.GetPoundlistList(id);
vo.setPoundlistentityList(poundlist);

2
SC-web/src/views/scm/basicInformation/arinvoices/Detail.vue
Unescape View File

@ -1,5 +1,5 @@
<template>
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'"
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'详情'"
:close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
width="1500px">

2
SC-web/src/views/scm/basicInformation/collection/Detail.vue
Unescape View File

@ -1,5 +1,5 @@
<template>
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'详情'" :close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1500px">
<el-row :gutter="15" class="">
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right">

2
SC-web/src/views/scm/basicInformation/receiptout/Detail.vue
Unescape View File

@ -1,5 +1,5 @@
<template>
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'"
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'详情'"
:close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
width="1500px">

2
SC-web/src/views/scm/basicInformation/saleback/Detail.vue
Unescape View File

@ -1,5 +1,5 @@
<template>
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'详情'" :close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1500px">
<el-row :gutter="15" class="">
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px"

4
SC-web/src/views/scm/basicInformation/saleorder/Detail.vue
Unescape View File

@ -1,5 +1,5 @@
<template>
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'"
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'详情'"
:close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
width="1500px">
@ -668,7 +668,7 @@
</el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false"> 取 消</el-button>
<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
<!-- <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button> -->
</span>
</el-dialog>
</template>

Write Preview
Loading…
Cancel
Save