磅单列表修复

product
17602169347 2 years ago
parent b93eaecf1f
commit 8f20b27519

@ -168,27 +168,27 @@ public class PoundlistController {
poundlistListVO.setPrice(poundlistListVO.getPurchasePrice());
poundlistListVO.setRate("0");
poundlistListVO.setPountType(poundlistListVO.getPoundType());
poundlistListVO.setAmount(new BigDecimal(poundlistListVO.getSettlement()).multiply(new BigDecimal(poundlistListVO.getPrice())).toString());
poundlistListVO.setNotAmount(new BigDecimal(poundlistListVO.getAmount()).multiply(new BigDecimal("0.87")).toString());
poundlistListVO.setSaleAmount(new BigDecimal(poundlistListVO.getSettlement()).multiply(new BigDecimal(poundlistListVO.getSalesPrice())).toString());
poundlistListVO.setAmount(new BigDecimal(poundlistListVO.getSettlement()).multiply(new BigDecimal(poundlistListVO.getPrice())).toPlainString());
poundlistListVO.setNotAmount(new BigDecimal(poundlistListVO.getAmount()).multiply(new BigDecimal("0.87")).toPlainString());
poundlistListVO.setSaleAmount(new BigDecimal(poundlistListVO.getSettlement()).multiply(new BigDecimal(poundlistListVO.getSalesPrice())).toPlainString());
switch (poundlistListVO.getSaleRate()) {
case "1":
poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("0.91")).toString());
poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("0.91")).toPlainString());
break;
case "2":
poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("0.94")).toString());
poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("0.94")).toPlainString());
break;
case "3":
poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("0.95")).toString());
poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("0.95")).toPlainString());
break;
case "4":
poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("0.97")).toString());
poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("0.97")).toPlainString());
break;
case "5":
poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("1")).toString());
poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("1")).toPlainString());
break;
default:
poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("0.87")).toString());
poundlistListVO.setSaleNotAmount(new BigDecimal(poundlistListVO.getSaleAmount()).multiply(new BigDecimal("0.87")).toPlainString());
break;
}
poundlistListVO.setRateAmount(String.valueOf(Double.parseDouble(poundlistListVO.getAmount()) - Double.parseDouble(poundlistListVO.getNotAmount())));

@ -69,7 +69,7 @@ WHERE a.delete_mark = 0 and
LEFT JOIN jg_natural i on a.natural_id = i.id
LEFT JOIN jg_purchaseorder_item0 j on a.id = j.poundlist_id
LEFT JOIN jg_salesorder_item0 k on a.id = k.poundlist_id
where a.is_examine = '1' and a.delete_mark = 0
where a.is_examine = '1' and a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0 and d.delete_mark = 0 and e.delete_mark = 0 and f.delete_mark = 0 and g.delete_mark = 0
<if test="poundlistPagination.keyword != null and poundlistPagination.keyword != ''">
AND (b.ticketno LIKE CONCAT('%',#{poundlistPagination.keyword},'%') OR c.supplier_name LIKE CONCAT('%',#{poundlistPagination.keyword},'%') OR d.supplier_nm LIKE CONCAT('%',#{poundlistPagination.keyword},'%'))
</if>
@ -151,7 +151,7 @@ WHERE a.delete_mark = 0 and
LEFT JOIN jg_natural i on a.natural_id = i.id
LEFT JOIN jg_purchaseorder_item0 j on a.id = j.poundlist_id
LEFT JOIN jg_purchaseorder k on k.id = j.purchaseorder_id
where a.delete_mark = 0 and a.id = #{id}
where a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0 and d.delete_mark = 0 and e.delete_mark = 0 and f.delete_mark = 0 and g.delete_mark = 0 and a.id = #{id}
</select>
<select id="queryPoundListByIds" resultType="jnpf.poundlist.entity.PoundlistEntity">
@ -167,7 +167,7 @@ WHERE a.delete_mark = 0 and
LEFT JOIN jg_natural i on a.natural_id = i.id
LEFT JOIN jg_purchaseorder_item0 j on a.id = j.poundlist_id
LEFT JOIN jg_purchaseorder k on k.id = j.purchaseorder_id
where a.delete_mark = 0 and a.id in
where a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0 and d.delete_mark = 0 and e.delete_mark = 0 and f.delete_mark = 0 and g.delete_mark = 0 and a.id in
<foreach collection="poundlistIdList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
@ -188,7 +188,7 @@ WHERE a.delete_mark = 0 and
LEFT JOIN jg_purchaseorder_item0 j on a.id = j.poundlist_id
LEFT JOIN jg_purchaseorder k on k.id = j.purchaseorder_id
LEFT JOIN jg_paymentdoc_item1 l on (a.id = l.poundlist_id and k.id = l.purchaseorder_id and l.paymentdoc_id = #{paymentdocId})
where a.delete_mark = 0 and a.id in
where a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0 and d.delete_mark = 0 and e.delete_mark = 0 and f.delete_mark = 0 and g.delete_mark = 0 and a.id in
<foreach collection="poundlistIdList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>

@ -21,7 +21,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="金额" prop="amount">
<el-input-number v-model="dataForm.amount" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}' readonly>
<el-input-number v-model="dataForm.amount" placeholder="数字文本" :step="1" :style='{"width":"100%"}' readonly>
</el-input-number>
</el-form-item>
@ -69,7 +69,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="发票金额" prop="invoiceAmount">
<el-input-number v-model="dataForm.invoiceAmount" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}' readonly>
<el-input-number v-model="dataForm.invoiceAmount" placeholder="数字文本" :step="1" :style='{"width":"100%"}' readonly>
</el-input-number>
</el-form-item>

@ -22,7 +22,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="金额" prop="amount">
<el-input-number v-model="dataForm.amount" placeholder="数字文本" :step="1" :precision="6"
<el-input-number v-model="dataForm.amount" placeholder="数字文本" :step="1"
:style='{"width":"100%"}' :disabled="true">
</el-input-number>
@ -66,7 +66,7 @@
</el-col> -->
<el-col :span="8">
<el-form-item label="发票金额" prop="invoiceAmount">
<el-input-number v-model="dataForm.invoiceAmount" placeholder="数字文本" :step="1" :precision="6"
<el-input-number v-model="dataForm.invoiceAmount" placeholder="数字文本" :step="1"
:style='{"width":"100%"}' :disabled="true">
</el-input-number>

@ -63,9 +63,8 @@
<screenfull isContainer />
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" custom-column border>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="documentNo" label="单据编号" width="200" align="center" sortable="custom" />
<el-table-column prop="businessDate" label="业务日期" width="150" align="center" sortable="custom" />
<el-table-column prop="purchaseorderId" label="采购订单号" width="150" align="center" sortable="custom" />

@ -52,9 +52,8 @@
<screenfull isContainer />
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" custom-column border>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="documentno" label="单据编号" sortable width="200" align="center" />
<el-table-column prop="paymentno" label="来源单号" sortable width="200" align="center" />
<el-table-column prop="suppliername" label="供应商" sortable width="200" align="center" />

@ -36,8 +36,7 @@
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
@selection-change="handleSelectionChange" has-c :hasNO="false" custom-column border>
<el-table-column type="index" width="50" label="序号" align="center" />
@selection-change="handleSelectionChange" has-c custom-column border>
<el-table-column prop="documentNo" label="单据编号" width="200" align="center"
sortable="custom" />
<el-table-column label="是否提交" width="100" prop="isSubmit" align="center" sortable="custom">

@ -63,7 +63,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="金额" prop="amount">
<el-input-number v-model="dataForm.amount" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}' :disabled="true">
<el-input-number v-model="dataForm.amount" placeholder="数字文本" :step="1" :style='{"width":"100%"}' :disabled="true">
</el-input-number>
</el-form-item>
@ -98,7 +98,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="发票金额" prop="invoiceAmount">
<el-input-number v-model="dataForm.invoiceAmount" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}'>
<el-input-number v-model="dataForm.invoiceAmount" placeholder="数字文本" :step="1" :style='{"width":"100%"}'>
</el-input-number>
</el-form-item>

@ -65,7 +65,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="金额" prop="amount">
<el-input-number v-model="dataForm.amount" placeholder="数字文本" :step="1" :precision="6"
<el-input-number v-model="dataForm.amount" placeholder="数字文本" :step="1"
:style='{"width":"100%"}'>
</el-input-number>
@ -102,7 +102,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="发票金额" prop="invoiceAmount">
<el-input-number v-model="dataForm.invoiceAmount" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}'>
<el-input-number v-model="dataForm.invoiceAmount" placeholder="数字文本" :step="1" :style='{"width":"100%"}'>
</el-input-number>
</el-form-item>

@ -64,7 +64,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="金额" prop="amount">
<el-input-number v-model="dataForm.amount" placeholder="数字文本" :step="1" :precision="6"
<el-input-number v-model="dataForm.amount" placeholder="数字文本" :step="1"
:style='{"width":"100%"}' :disabled="true">
</el-input-number>
@ -101,7 +101,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="发票金额" prop="invoiceAmount">
<el-input-number v-model="dataForm.invoiceAmount" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}'>
<el-input-number v-model="dataForm.invoiceAmount" placeholder="数字文本" :step="1" :style='{"width":"100%"}'>
</el-input-number>
</el-form-item>

@ -77,9 +77,8 @@
<screenfull isContainer />
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" custom-column border>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="documentNo" label="单据编号" sortable width="200" align="center" />
<!-- <el-table-column label="单据状态 " sortable width="150" prop="status" align="center" >-->
<!-- <template slot-scope="scope">-->

@ -66,9 +66,8 @@
<screenfull isContainer />
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" custom-column border>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="documentno" label="单据编号" sortable width="200" align="center" />
<el-table-column prop="supplier" label="供应商" sortable width="220" align="center" />
<el-table-column prop="receiptamount" label="入库金额" sortable width="120" align="center" />

@ -42,9 +42,8 @@
<screenfull isContainer/>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" custom-column border>
<el-table-column type="index" width="50" label="序号" fixed="center" align="center" />
<el-table-column prop="id" label="ID" width="0" align="left" fixed="center" sortable/>
<el-table-column prop="ticketno" label="车牌号" width="0" align="center" sortable/>
<el-table-column prop="drivername" label="司机" width="0" align="center" sortable/>

Loading…
Cancel
Save