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

Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2

Browse Source
jg-waiwang-pro
vayne 4 months ago
parent d9d1b440ca d2c27e1e7e
commit 6d87ecc47a
8 changed files with 73 additions and 36 deletions
Show Stats Download Patch File Download Diff File

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

@ -1652,7 +1652,7 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
lowCell2.setCellStyle(lineStyle); lowCell2.setCellStyle(lineStyle);
// lowCell10.setCellValue(priceSum.toString()); // lowCell10.setCellValue(priceSum.toString());
// 合计 // 合计
lowCell10.setCellValue(amount.toString()); lowCell10.setCellValue(priceSum.toString());
lowCell10.setCellStyle(lineStyle); lowCell10.setCellStyle(lineStyle);
lowRow.createCell(1).setCellStyle(lineStyle); lowRow.createCell(1).setCellStyle(lineStyle);
lowRow.createCell(2).setCellStyle(lineStyle); lowRow.createCell(2).setCellStyle(lineStyle);

1
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java
Unescape View File

@ -1037,6 +1037,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
yunguanSaleSettlementModel.setSLIT_FLAG("0"); yunguanSaleSettlementModel.setSLIT_FLAG("0");
yunguanSaleSettlementModel.setREAD_FLAG("N"); yunguanSaleSettlementModel.setREAD_FLAG("N");
yunguanSaleSettlementModel.setESB_STATUS("N"); yunguanSaleSettlementModel.setESB_STATUS("N");
yunguanSaleSettlementModel.setLINE_SUM(cwsettlementForm.getCwsettlementsummaryList().size());
JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordHead", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementModel)); JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordHead", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementModel));
if (ObjectUtil.isNotEmpty(purchaseCode)){ if (ObjectUtil.isNotEmpty(purchaseCode)){
if (purchaseCode.get("code").equals("200")) { if (purchaseCode.get("code").equals("200")) {

3
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleSettlementModel.java
Unescape View File

@ -116,4 +116,7 @@ public class YunguanSaleSettlementModel {
/** ESB错误信息 **/ /** ESB错误信息 **/
@JSONField(name = "ESB_MESSAGE") @JSONField(name = "ESB_MESSAGE")
private String ESB_MESSAGE; private String ESB_MESSAGE;
/** 关联行数量 **/
@JSONField(name = "LINE_SUM")
private int LINE_SUM;
} }

43
jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue
Unescape View File

@ -1368,7 +1368,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfInput v-model="scope.row.spec" <JnpfInput v-model="scope.row.spec"
@change="changeData('cwsettlementsummary-spec',scope.$index)" @change="changeData('cwsettlementsummary-spec',scope.$index)"
placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'> placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput> </JnpfInput>
</template> </template>
</el-table-column> </el-table-column>
@ -1470,8 +1470,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfInput v-model="scope.row.settlementSubtotalNo" <JnpfInput v-model="scope.row.settlementSubtotalNo"
@change="changeData('cwsettlementsummary-settlementSubtotalNo',scope.$index)" @change="changeData('cwsettlementsummary-settlementSubtotalNo',scope.$index)"
placeholder="请输入" addonBefore="¥" :disabled="true" clearable placeholder="请输入" addonBefore="¥" clearable :style='{"width":"100%"}'>
:style='{"width":"100%"}'>
</JnpfInput> </JnpfInput>
</template> </template>
</el-table-column> </el-table-column>
@ -1512,8 +1511,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfInput v-model="scope.row.settlementTotalNo" <JnpfInput v-model="scope.row.settlementTotalNo"
@change="changeData('cwsettlementsummary-settlementTotalNo',scope.$index)" @change="changeData('cwsettlementsummary-settlementTotalNo',scope.$index)"
placeholder="请输入" addonBefore="¥" :disabled="true" clearable placeholder="请输入" addonBefore="¥" clearable :style='{"width":"100%"}'>
:style='{"width":"100%"}'>
</JnpfInput> </JnpfInput>
</template> </template>
</el-table-column> </el-table-column>
@ -2954,25 +2952,26 @@ export default {
this.dataForm.overdueAmount = overdueAmount; this.dataForm.overdueAmount = overdueAmount;
// debugger // debugger
var data = JSON.parse(JSON.stringify(this.dataForm.cwsettlementaccountList)) // var data = JSON.parse(JSON.stringify(this.dataForm.cwsettlementaccountList))
var order = this.dataForm.cwsettlementaccountList[0].code // var order = this.dataForm.cwsettlementaccountList[0].code
console.log(order); // console.log(order);
var dataProduct = JSON.parse(JSON.stringify(res.data)) // var dataProduct = JSON.parse(JSON.stringify(res.data))
console.log(dataProduct); // console.log(dataProduct);
var productid = res.data[0].productId // var productid = res.data[0].productId
data.forEach(item => { // data.forEach(item => {
dataProduct.forEach(item1 => { // dataProduct.forEach(item1 => {
// debugger // // debugger
if (item.code == order && item1.productId == productid) { // if (item.code == order && item1.productId == productid) {
this.dataForm.cwsettlementsummaryList = this.sameReduce(res.data); // this.dataForm.cwsettlementsummaryList = this.sameReduce(res.data);
} else { // } else {
this.dataForm.cwsettlementsummaryList = res.data; // this.dataForm.cwsettlementsummaryList = res.data;
return // return
} // }
}) // })
}) // })
this.dataForm.cwsettlementsummaryList = res.data;
this.dataForm.cwsettlementsummaryList.forEach(item => { this.dataForm.cwsettlementsummaryList.forEach(item => {
item.settlementPrice = this.jnpf.floatDiv(item.settlementSubtotal, item.settlementSum);//汇总结算含税单价 item.settlementPrice = this.jnpf.floatDiv(item.settlementSubtotal, item.settlementSum);//汇总结算含税单价

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

@ -136,9 +136,9 @@
@change="poundlistUploadSuccess" :disabled="judgeWrite('voucherPictures')" @change="poundlistUploadSuccess" :disabled="judgeWrite('voucherPictures')"
:fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0"> :fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
</JnpfUploadPoundsImg> --> </JnpfUploadPoundsImg> -->
<JnpfUploadImgB v-model="dataForm.voucherPictures" <JnpfUploadImgB v-model="dataForm.voucherPictures" @change="poundlistUploadSuccess"
@change="poundlistUploadSuccess" :disabled="judgeWrite('voucherPictures')" :disabled="judgeWrite('voucherPictures')" :fileSize="10" sizeUnit="MB" :limit="1"
:fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0"> pathType="defaultPath" :isAccount="0">
</JnpfUploadImgB> </JnpfUploadImgB>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
@ -196,6 +196,14 @@
</JnpfPopupSelect> </JnpfPopupSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" v-if="judgeShow('orderNo')">
<jnpf-form-tip-item label="订单序号" v-if="judgeShow('orderNo')" prop="orderNo">
<JnpfInput v-model="dataForm.orderNo" @change="changeData('orderNo', -1)"
placeholder="请输入" :disabled="judgeWrite('orderNo')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" v-if="judgeShow('-${html.relationField}')"> <el-col :span="24" v-if="judgeShow('-${html.relationField}')">
<jnpf-form-tip-item label-width="0"> <jnpf-form-tip-item label-width="0">
<div class="JNPF-common-title"> <div class="JNPF-common-title">

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

@ -137,9 +137,9 @@
:fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0"> :fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
</JnpfUploadPoundImg> --> </JnpfUploadPoundImg> -->
<JnpfUploadImgB v-model="dataForm.voucherPictures" <JnpfUploadImgB v-model="dataForm.voucherPictures" @change="poundlistUploadSuccess"
@change="poundlistUploadSuccess" :disabled="judgeWrite('voucherPictures')" :disabled="judgeWrite('voucherPictures')" :fileSize="10" sizeUnit="MB" :limit="1"
:fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0"> pathType="defaultPath" :isAccount="0">
</JnpfUploadImgB> </JnpfUploadImgB>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
@ -197,6 +197,16 @@
</JnpfPopupSelect> </JnpfPopupSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" v-if="judgeShow('orderNo')">
<jnpf-form-tip-item label="订单序号" v-if="judgeShow('orderNo')" prop="orderNo">
<JnpfInput v-model="dataForm.orderNo" @change="changeData('orderNo', -1)"
placeholder="请输入" :disabled="judgeWrite('orderNo')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" v-if="judgeShow('-${html.relationField}')"> <el-col :span="24" v-if="judgeShow('-${html.relationField}')">
<jnpf-form-tip-item label-width="0"> <jnpf-form-tip-item label-width="0">
<div class="JNPF-common-title"> <div class="JNPF-common-title">

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

@ -123,9 +123,9 @@
:fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0"> :fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
</JnpfUploadPoundsImg> --> </JnpfUploadPoundsImg> -->
<JnpfUploadImgB v-model="dataForm.voucherPictures" <JnpfUploadImgB v-model="dataForm.voucherPictures" @change="poundlistUploadSuccess"
@change="poundlistUploadSuccess" :disabled="judgeWrite('voucherPictures')" :disabled="judgeWrite('voucherPictures')" :fileSize="10" sizeUnit="MB" :limit="1"
:fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0"> pathType="defaultPath" :isAccount="0">
</JnpfUploadImgB> </JnpfUploadImgB>
</jnpf-form-tip-item> </jnpf-form-tip-item>
@ -184,6 +184,14 @@
</JnpfPopupSelect> </JnpfPopupSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" v-if="judgeShow('orderNo')">
<jnpf-form-tip-item label="订单序号" v-if="judgeShow('orderNo')" prop="orderNo">
<JnpfInput v-model="dataForm.orderNo" @change="changeData('orderNo', -1)"
placeholder="请输入" :disabled="judgeWrite('orderNo')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" v-if="judgeShow('-${html.relationField}')"> <el-col :span="24" v-if="judgeShow('-${html.relationField}')">
<jnpf-form-tip-item label-width="0"> <jnpf-form-tip-item label-width="0">
<div class="JNPF-common-title"> <div class="JNPF-common-title">

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

@ -121,9 +121,9 @@
@change="poundlistUploadSuccess" :disabled="judgeWrite('voucherPictures')" @change="poundlistUploadSuccess" :disabled="judgeWrite('voucherPictures')"
:fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0"> :fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
</JnpfUploadPoundImg> --> </JnpfUploadPoundImg> -->
<JnpfUploadImgB v-model="dataForm.voucherPictures" <JnpfUploadImgB v-model="dataForm.voucherPictures" @change="poundlistUploadSuccess"
@change="poundlistUploadSuccess" :disabled="judgeWrite('voucherPictures')" :disabled="judgeWrite('voucherPictures')" :fileSize="10" sizeUnit="MB" :limit="1"
:fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0"> pathType="defaultPath" :isAccount="0">
</JnpfUploadImgB> </JnpfUploadImgB>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
@ -181,6 +181,14 @@
</JnpfPopupSelect> </JnpfPopupSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" v-if="judgeShow('orderNo')">
<jnpf-form-tip-item label="订单序号" v-if="judgeShow('orderNo')" prop="orderNo">
<JnpfInput v-model="dataForm.orderNo" @change="changeData('orderNo', -1)"
placeholder="请输入" :disabled="judgeWrite('orderNo')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" v-if="judgeShow('-${html.relationField}')"> <el-col :span="24" v-if="judgeShow('-${html.relationField}')">
<jnpf-form-tip-item label-width="0"> <jnpf-form-tip-item label-width="0">
<div class="JNPF-common-title"> <div class="JNPF-common-title">

Write Preview
Loading…
Cancel
Save