规格修改

jg-waiwang-pro
XI_TENG\xixi_ 4 months ago
parent d2c27e1e7e
commit bc1cd1a74a

@ -232,6 +232,7 @@
<result column="salesOrderMultiples" property="salesOrderMultiples"/>
<result column="input_tax_rate" property="inputTaxRate"/>
<result column="output_tax_rate" property="outputTaxRate"/>
<result column="spec1" property="spec1"/>
</resultMap>
<select id="querySaleContract" resultMap="contractList">
@ -662,7 +663,8 @@
a.buckle_weight as buckleWeight,
IFNULL(c.purchase_amount,0) as purchaseAmount,
IFNULL(c.sale_amount,0) as saleAmount,
c.order_no as orderNo
c.order_no as orderNo,
a.spec AS spec1
FROM
`jg_voucher_product` a
RIGHT JOIN jg_voucher c ON a.voucher_id = c.id AND c.f_delete_mark IS NULL

@ -244,7 +244,7 @@
e.vehicle_number vehicleName,
c.poundlist_time poundlistTime,
f.product_id productId,
f.spec spec,
l.spec spec,
f.unit unit,
IFNULL(f.gross_weight,0) grossWeight,
IFNULL(f.tare_weight,0) tareWeight,
@ -267,11 +267,14 @@
LEFT JOIN jg_contract i on h.contract_id = i.id
LEFT JOIN jg_contract_commodity j on (j.contract_id = i.id and f.product_id = j.product_id)
LEFT JOIN jg_product k on f.product_id = k.id
LEFT JOIN jg_warehousing_storage_product l on l.warehousing_storage_id = b.id
where a.warehousing_storage_id in
<foreach item="item" index="index" collection="storageIdList"
open="(" separator="," close=")">
#{item}
</foreach>
GROUP BY a.id
</select>
<select id="getWarehousingstorageList5" resultType="jnpf.entity.CwaccountvoucherEntity">
@ -375,7 +378,7 @@
e.vehicle_number vehicleName,
c.poundlist_time poundlistTime,
f.product_id productId,
f.spec spec,
l.spec spec,
f.unit unit,
IFNULL(f.gross_weight,0) grossWeight,
IFNULL(f.tare_weight,0) tareWeight,
@ -399,11 +402,13 @@
LEFT JOIN jg_contract i on h.contract_id = i.id
LEFT JOIN jg_contract_commodity j on (j.contract_id = i.id and f.product_id = j.product_id)
LEFT JOIN jg_product k on f.product_id = k.id
LEFT JOIN jg_warehousing_outbound_product l on l.warehousing_outbound_id = b.id
where a.warehousing_outbound_id in
<foreach item="item" index="index" collection="storageIdList"
open="(" separator="," close=")">
#{item}
</foreach>
GROUP BY a.id
</select>
<select id="getWarehousingstorageList8" resultType="jnpf.entity.CwaccountvoucherEntity">

@ -104,6 +104,8 @@
d.code orderCode,
(SELECT COUNT(1) from jg_warehousing_storage_product WHERE warehousing_storage_id = a.id) skuNum,
(SELECT COUNT(1) from jg_warehousing_storage_poundlist WHERE warehousing_storage_id = a.id) voucherNum,
(SELECT SUM(storage_number) from jg_warehousing_storage_product WHERE warehousing_storage_id = a.id) outboundNumber,
a.f_creator_time storageTime,
case a.warehousing_storage_type WHEN 1 THEN '采购入库' WHEN 15 THEN '采购收货单入库' END warehousingStorageType,
e.name warehouseName
@ -131,6 +133,7 @@
d.code orderCode,
(SELECT COUNT(1) from jg_warehousing_storage_product WHERE warehousing_storage_id = a.id) skuNum,
(SELECT COUNT(1) from jg_warehousing_storage_poundlist WHERE warehousing_storage_id = a.id) voucherNum,
(SELECT SUM(storage_number) from jg_warehousing_storage_product WHERE warehousing_storage_id = a.id) outboundNumber,
a.f_creator_time storageTime,
case a.warehousing_storage_type WHEN 1 THEN '采购入库' WHEN 15 THEN '采购收货单入库' END warehousingStorageType,
e.name warehouseName
@ -218,6 +221,7 @@
d.code orderCode,
(SELECT COUNT(1) from jg_warehousing_outbound_product WHERE warehousing_outbound_id = a.id) skuNum,
(SELECT COUNT(1) from jg_warehousing_outbound_poundlist WHERE warehousing_outbound_id = a.id) voucherNum,
(SELECT SUM(outbound_number) from jg_warehousing_outbound_product WHERE warehousing_outbound_id = a.id) outboundNumber,
a.f_creator_time storageTime,
case a.warehousing_outbound_type WHEN 1 THEN '销售出库' WHEN 12 THEN '销售发货单出库' END warehousingStorageType,
e.name warehouseName
@ -245,6 +249,7 @@
d.code orderCode,
(SELECT COUNT(1) from jg_warehousing_outbound_product WHERE warehousing_outbound_id = a.id) skuNum,
(SELECT COUNT(1) from jg_warehousing_outbound_poundlist WHERE warehousing_outbound_id = a.id) voucherNum,
(SELECT SUM(outbound_number) from jg_warehousing_outbound_product WHERE warehousing_outbound_id = a.id) outboundNumber,
a.f_creator_time storageTime,
case a.warehousing_outbound_type WHEN 1 THEN '销售出库' WHEN 12 THEN '销售发货单出库' END warehousingStorageType,
e.name warehouseName

@ -1213,7 +1213,7 @@ public class BusinessOrderController {
@GetMapping("/createReceiptOrderByVoucher")
public ActionResult createReceiptOrderByVoucher(@RequestParam("businessOrderId") String businessOrderId)throws IOException{
QueryWrapper<BusinessOrderEntity> businessOrderQueryWrapper=new QueryWrapper<>();
businessOrderQueryWrapper.eq("a.id",businessOrderId);
businessOrderQueryWrapper.eq("a.id",businessOrderId);
businessOrderQueryWrapper.isNull("a.f_delete_mark");
businessOrderQueryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
List<BusinessOrderEntity> businessOrderEntityList = businessOrderService.purchaseOrderByReceiptOrderInfo(businessOrderQueryWrapper);

@ -311,6 +311,7 @@ public class ProductWarehouseEntity {
private BigDecimal clearWeight;
@TableField(exist = false)
private String orderNo;
@TableField(exist = false)
private String spec1;
}

@ -109,7 +109,8 @@ public class WarehousingStorageEntity {
private String realName;
@TableField(exist = false)
private String realNameA;
@TableField(exist = false)
private String outboundNumber;
}

@ -1,16 +1,18 @@
<template>
<el-dialog title="选择出入库单" :close-on-click-modal="false" :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center"
lock-scroll append-to-body width="800px">
<el-dialog title="选择出入库单" :close-on-click-modal="false" :visible.sync="visible"
class="JNPF-dialog JNPF-dialog_center" lock-scroll append-to-body width="800px">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="10">
<el-form-item label="关键词">
<el-input v-model="keyword" placeholder="请输入关键词查询" clearable @keyup.enter.native="search()" />
<el-input v-model="keyword" placeholder="请输入关键词查询" clearable
@keyup.enter.native="search()" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()">{{ $t('common.search') }}
<el-button type="primary" icon="el-icon-search"
@click="search()">{{ $t('common.search') }}
</el-button>
<el-button icon="el-icon-refresh-right" @click="refresh()">{{ $t('common.reset') }}
</el-button>
@ -19,26 +21,33 @@
</el-form>
<div class="JNPF-common-search-box-right">
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="search()" />
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="search()" />
</el-tooltip>
</div>
</el-row>
<JNPF-table v-loading="listLoading" :data="list" hasC @selection-change="handleSelectionChange" :border="false">
<el-table-column prop="documentNo" label="单据编号" align="center" sortable width="200" fixed="left">
<JNPF-table v-loading="listLoading" :data="list" hasC @selection-change="handleSelectionChange"
:border="false">
<el-table-column prop="documentNo" label="单据编号" align="center" sortable width="200"
fixed="left">
</el-table-column>
<el-table-column prop="warehousingStorageType" label="业务类型" align="center" sortable width="200" fixed="left">
<el-table-column prop="warehousingStorageType" label="业务类型" align="center" sortable
width="200" fixed="left">
</el-table-column>
<el-table-column prop="warehouseName" label="入库仓库" align="center" width="150">
</el-table-column>
<el-table-column prop="orderCode" label="关联采购单号" align="center" width="200">
</el-table-column>
<el-table-column prop="outboundNumber" label="重量" align="center" width="200">
</el-table-column>
<el-table-column prop="skuNum" label="商品数" align="center" width="200">
</el-table-column>
<el-table-column prop="voucherNum" label="凭证数" align="center" width="200">
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="init" />
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="init" />
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">{{ $t('common.cancelButton') }}</el-button>
<el-button type="primary" @click="select()">{{ $t('common.confirmButton') }}</el-button>
@ -81,16 +90,16 @@ export default {
if (excludeIdList && excludeIdList instanceof Array) {
this.excludeIdList = excludeIdList;
}
if (subjectId && typeof(subjectId) == 'string') {
if (subjectId && typeof (subjectId) == 'string') {
this.subjectId = subjectId;
}
if (contractId && typeof(contractId) == 'string') {
if (contractId && typeof (contractId) == 'string') {
this.contractId = contractId;
}
if (type && typeof(type) == 'string') {
if (type && typeof (type) == 'string') {
this.type = type;
}
if (businessType && typeof(businessType) == 'string') {
if (businessType && typeof (businessType) == 'string') {
this.businessType = businessType;
}
let query = {
@ -144,7 +153,7 @@ export default {
}
</script>
<style lang="scss" scoped>
>>>.el-dialog__body {
>>> .el-dialog__body {
height: 70vh;
padding: 0 0 10px !important;
display: flex;

@ -448,6 +448,21 @@
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="规格" v-if="judgeShow('deliveryvoucherrelation-spec')"
prop="spec" width="140">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('deliveryvoucherrelationList-spec')">*</span>规格
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.spec" @change="
changeData('deliveryvoucherrelation-spec', scope.$index)
" placeholder="请输入" clearable :style=" { width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="单据类型"
v-if="judgeShow('deliveryvoucherrelation-documentType')" prop="documentType"
width="130">
@ -584,20 +599,7 @@
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="规格" v-if="judgeShow('deliveryvoucherrelation-spec')"
prop="spec" width="140">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('deliveryvoucherrelationList-spec')">*</span>规格
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.spec" @change="
changeData('deliveryvoucherrelation-spec', scope.$index)
" placeholder="请输入" :disabled="true
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="单位" v-if="judgeShow('deliveryvoucherrelation-unit')"
prop="unit" width="110">
<template slot="header">
@ -787,8 +789,7 @@
<template slot-scope="scope">
<JnpfInput v-model="scope.row.spec" @change="
changeData('deliveryproductrelation-spec', scope.$index)
" placeholder="请输入" :disabled="true
" clearable :style="{ width: '100%' }">
" placeholder="请输入" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
@ -1887,6 +1888,7 @@ export default {
p.taxCount = e.taxCount
p.notTaxPrice = e.notTaxPrice
p.notTaxCount = e.notTaxCount
p.spec = e.spec
}
})
const defaultArr = this.dataForm.deliveryProductRelationList

@ -160,7 +160,7 @@
</el-table-column>
<el-table-column prop="buckleWeight" label="扣重" align="center" width="200">
</el-table-column>
<el-table-column prop="clear_weight" label="净重" align="center" width="200">
<el-table-column prop="clearWeight" label="净重" align="center" width="200">
</el-table-column>
<el-table-column prop="purchaseContractNo" label="采购合同编号" align="center" width="260">
</el-table-column>

@ -351,6 +351,21 @@
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="规格" v-if="judgeShow('deliveryvoucherrelation-spec')"
prop="spec" width="150">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('deliveryvoucherrelationList-spec')">*</span>规格
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.spec"
@change="changeData('deliveryvoucherrelation-spec', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="单据类型"
v-if="judgeShow('deliveryvoucherrelation-documentType')" prop="documentType"
width="150">
@ -367,6 +382,7 @@
</JnpfSelect>
</template>
</el-table-column>
<el-table-column label="凭证类型"
v-if="judgeShow('deliveryvoucherrelation-voucherType')" prop="voucherType"
width="150">
@ -459,19 +475,7 @@
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="规格" v-if="judgeShow('deliveryvoucherrelation-spec')"
prop="spec" width="150">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('deliveryvoucherrelationList-spec')">*</span>规格
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.spec"
@change="changeData('deliveryvoucherrelation-spec', scope.$index)"
placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="单位" v-if="judgeShow('deliveryvoucherrelation-unit')"
prop="unit" width="100">
<template slot="header">
@ -620,7 +624,7 @@
<template slot-scope="scope">
<JnpfInput v-model="scope.row.spec"
@change="changeData('deliveryproductrelation-spec', scope.$index)"
placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>

@ -110,7 +110,7 @@
<el-table-column prop="voucherProductList[0].netWeight" label="结算量" align="center"
width="120">
</el-table-column>
<el-table-column prop="voucherProductList[0].clear_weight" label="净重" align="center"
<el-table-column prop="voucherProductList[0].clearWeight" label="净重" align="center"
width="120">
</el-table-column>
<el-table-column prop="customerName1" label="客户" align="center" width="200">

@ -222,7 +222,7 @@
<template slot-scope="scope">
<JnpfInput v-model="scope.row.spec"
@change="changeData('voucherproduct-spec', scope.$index)" placeholder="请输入"
:disabled="true" clearable :style='{ "width": "100%" }'>
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>

@ -804,7 +804,7 @@
@change="changeData('businessorderproductrelational-spec', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-spec')"
clearable :style='{ "width": "100%" }' readonly>
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -1872,6 +1872,7 @@ export default {
item.tax = item.outputTaxRate
item.salesMainUnitId = item.unit
item.voucherIdList = voucherIdList.voucherIds
item.spec = item.spec1
if (item.saleAmount !== 0) {
item.businessPrice = this.jnpf.floatDiv(item.saleAmount, item.netWeight).toFixed(6)
item.taxCount = this.jnpf.floatMul(item.businessNum, item.businessPrice).toFixed(2) //

@ -123,7 +123,7 @@
<template slot-scope="scope">
<JnpfInput v-model="scope.row.spec"
@change="changeData('voucherproduct-spec',scope.$index)" placeholder="请输入"
disabled clearable :style='{"width":"100%"}'>
clearable :style='{"width":"100%"}'>
</JnpfInput>
</template>
</el-table-column>

Loading…
Cancel
Save