Merge remote-tracking branch 'origin/main'

product
bawei 2 years ago
commit a835573022

@ -88,7 +88,7 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
int total = 0;
int poundlistNum = 0;
QueryWrapper<PoundlistEntity> poundlistQueryWrapper = new QueryWrapper<>();
//poundlistQueryWrapper.lambda().eq(PoundlistEntity::getIsExamine, "1");
poundlistQueryWrapper.lambda().eq(PoundlistEntity::getIsExamine, "1");
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
@ -105,7 +105,7 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
}
if (!isPc && appPermission) {
if (!userProvider.get().getIsAdministrator()) {
Object poundlistObj = authorizeService.getCondition(new AuthorizeConditionModel(poundlistQueryWrapper, poundlistPagination.getMenuId(), "jg_poundlist"));
Object poundlistObj = authorizeService.getCondition2(new AuthorizeConditionModel(poundlistQueryWrapper, poundlistPagination.getMenuId(), "jg_poundlist"));
if (ObjectUtil.isEmpty(poundlistObj)) {
return new ArrayList<>();
} else {

@ -27,6 +27,6 @@ public interface PurchaseorderitemMapper extends BaseMapper<PurchaseorderitemEnt
List<HashMap<String,Object>> getTitleInfo(@Param("ew")Wrapper<PurchaseorderitemEntity> queryWrapper);
List<HashMap<String,Object>> getWordExcelInfo(@Param("ew")Wrapper<PurchaseorderitemEntity> queryWrapper);
List<HashMap<String,Object>> getVehicleInfo(@Param("ew")Wrapper<PurchaseorderitemEntity> queryWrapper);
IPage<PurchaseorderitemEntity> queryByKeyword(@Param("page") Page<PurchaseorderitemEntity> page, @Param("purchaseorderPagination") PurchaseorderPagination purchaseorderPagination);
IPage<PurchaseorderitemEntity> queryByKeyword(@Param("page") Page<PurchaseorderitemEntity> page, @Param("purchaseorderPagination") PurchaseorderPagination purchaseorderPagination, @Param("ew") Wrapper<PurchaseorderitemEntity> queryWrapper);
List<Purchaseorder_item0Entity> queryPurchaseOrderItem(String id);
}

@ -855,6 +855,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
int total = 0;
int purchaseorderNum = 0;
QueryWrapper<PurchaseorderitemEntity> purchaseorderQueryWrapper = new QueryWrapper<>();
purchaseorderQueryWrapper.lambda().eq(PurchaseorderitemEntity::getDeleteMark, "0");
int purchaseorder_item0Num = 0;
QueryWrapper<Purchaseorder_item0Entity> purchaseorder_item0QueryWrapper = new QueryWrapper<>();
int purchasebackitemNum = 0;
@ -870,7 +871,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if (isPc && pcPermission) {
if (!userProvider.get().getIsAdministrator()) {
Object purchaseorderObj = authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper, purchaseorderPagination.getMenuId(), "jg_purchaseorder"));
Object purchaseorderObj = authorizeService.getCondition2(new AuthorizeConditionModel(purchaseorderQueryWrapper, purchaseorderPagination.getMenuId(), "jg_purchaseorder"));
if (ObjectUtil.isEmpty(purchaseorderObj)) {
return new ArrayList<>();
} else {
@ -916,7 +917,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
}
if (!isPc && appPermission) {
if (!userProvider.get().getIsAdministrator()) {
Object purchaseorderObj = authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper, purchaseorderPagination.getMenuId(), "jg_purchaseorder"));
Object purchaseorderObj = authorizeService.getCondition2(new AuthorizeConditionModel(purchaseorderQueryWrapper, purchaseorderPagination.getMenuId(), "jg_purchaseorder"));
if (ObjectUtil.isEmpty(purchaseorderObj)) {
return new ArrayList<>();
} else {
@ -1015,7 +1016,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
purchaseorderPagination.setDepartmentId(detpartment);
}
IPage<PurchaseorderitemEntity> userIPage = purchaseorderitemMapper.queryByKeyword(page, purchaseorderPagination);
IPage<PurchaseorderitemEntity> userIPage = purchaseorderitemMapper.queryByKeyword(page, purchaseorderPagination, purchaseorderQueryWrapper);
return purchaseorderPagination.setData(userIPage.getRecords(), userIPage.getTotal());

@ -1,6 +1,7 @@
package jnpf.receiptin.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jnpf.receiptin.entity.ReceiptinEntity;
@ -18,5 +19,5 @@ import org.apache.ibatis.annotations.Param;
*/
public interface ReceiptinMapper extends BaseMapper<ReceiptinEntity> {
IPage<ReceiptinEntity> queryByKeyword(@Param("page") Page<ReceiptinEntity> page, @Param("receiptinPagination") ReceiptinPagination receiptinPagination);
IPage<ReceiptinEntity> queryByKeyword(@Param("page") Page<ReceiptinEntity> page, @Param("receiptinPagination") ReceiptinPagination receiptinPagination, @Param("ew") Wrapper<ReceiptinEntity> queryWrapper);
}

@ -76,6 +76,7 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
int total=0;
int receiptinNum =0;
QueryWrapper<ReceiptinEntity> receiptinQueryWrapper=new QueryWrapper<>();
receiptinQueryWrapper.lambda().eq(ReceiptinEntity::getDeleteMark, "0");
int receiptin_item0Num =0;
QueryWrapper<Receiptin_item0Entity> receiptin_item0QueryWrapper=new QueryWrapper<>();
boolean pcPermission = true;
@ -83,7 +84,7 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object receiptinObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin"));
Object receiptinObj=authorizeService.getCondition2(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin"));
if (ObjectUtil.isEmpty(receiptinObj)){
return new ArrayList<>();
} else {
@ -101,7 +102,7 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object receiptinObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin"));
Object receiptinObj=authorizeService.getCondition2(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin"));
if (ObjectUtil.isEmpty(receiptinObj)){
return new ArrayList<>();
} else {
@ -163,7 +164,7 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
if (StringUtil.isNotNull(detpartment)) {
receiptinPagination.setDepartmentId(detpartment);
}
IPage<ReceiptinEntity> userIPage = receiptinMapper.queryByKeyword(page, receiptinPagination);
IPage<ReceiptinEntity> userIPage = receiptinMapper.queryByKeyword(page, receiptinPagination, receiptinQueryWrapper);
return receiptinPagination.setData(userIPage.getRecords(),userIPage.getTotal());
/*if(StringUtil.isNotEmpty(receiptinPagination.getDocumentno())){
receiptinNum++;

@ -46,6 +46,8 @@ import jnpf.saleback.entity.Saleback_item0Entity;
import jnpf.saleorder.mapper.ReceiptoutsoitemMapper;
import jnpf.vehicle.entity.VehicleEntity;
import jnpf.vehicle.service.VehicleService;
import jnpf.warehouse.entity.WareHouseEntity;
import jnpf.warehouse.service.WareHouseService;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
@ -145,6 +147,8 @@ public class SaleorderitemController {
@Autowired
private ReservoirareaService reservoirareaService;
@Autowired
private WareHouseService wareHouseService;
@Autowired
private ReceiptoutService receiptoutService;
@Autowired
private ArinvoicesService arinvoicesService;
@ -216,9 +220,17 @@ public class SaleorderitemController {
if (receiptin_item0Entity.size()>0){
if (receiptin_item0Entity.get(0).getReservoirareaId() != null){
entity.setReservoirareaId(receiptin_item0Entity.get(0).getReservoirareaId());
ReservoirareaEntity reservoirareaEntity = reservoirareaService.getById(entity.getReservoirareaId());
if(reservoirareaEntity != null){
entity.setReservoirareaName(reservoirareaEntity.getAreaname());
}
}
if (receiptin_item0Entity.get(0).getWarehouseId() != null){
entity.setWarehouseId(receiptin_item0Entity.get(0).getWarehouseId());
WareHouseEntity wareHouseEntity = wareHouseService.getById(entity.getWarehouseId());
if(wareHouseEntity != null){
entity.setWarehouseName(wareHouseEntity.getName());
}
}
}
VehicleEntity vehicleEntity = vehicleService.getById(entity.getVehicleId());

@ -145,6 +145,14 @@ public class Salesorder_item0Entity {
@TableField(exist = false)
private String warehouseId;
/** 库区id */
@TableField(exist = false)
private String reservoirareaName;
/** 仓库id */
@TableField(exist = false)
private String warehouseName;
@TableField(exist = false)
private PoundlistEntity poundEntity;

@ -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
${ew.customSqlSegment} and 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
${ew.customSqlSegment} 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>
@ -88,7 +88,6 @@ WHERE a.delete_mark = 0 and
<if test="poundlistPagination.isPay != null and poundlistPagination.isPay != ''">
AND a.is_pay = #{poundlistPagination.isPay}
</if>
/*modified by 巴卫*/
<!--<if test="poundlistPagination.departmentId != null and poundlistPagination.departmentId != ''">
AND a.department_id = #{poundlistPagination.departmentId}
</if>

@ -259,15 +259,7 @@
from jg_purchaseorder a
LEFT JOIN jg_supplier b on a.supplier_id = b.id
LEFT JOIN jg_contract c on a.contract_code = c.id
WHERE 1=1 and a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0
/*添加权限*/
<if test="purchaseorderPagination.departmentId != null and purchaseorderPagination.departmentId != ''">
AND a.department_id = #{purchaseorderPagination.departmentId}
</if>
<if test="purchaseorderPagination.orgnizeId != null and purchaseorderPagination.orgnizeId != ''">
AND a.orgnize_id = #{purchaseorderPagination.orgnizeId}
</if>
${ew.customSqlSegment} and a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0
<if test="purchaseorderPagination.keyword != null and purchaseorderPagination.keyword != ''">
AND (c.contract_name LIKE CONCAT('%',#{purchaseorderPagination.keyword},'%') OR b.supplier_name LIKE CONCAT('%',#{purchaseorderPagination.keyword},'%'))
</if>

@ -6,14 +6,7 @@
from jg_receiptin a
LEFT JOIN jg_purchaseorder b on a.souceno = b.id
LEFT JOIN jg_supplier d on a.supplier_id = d.id
where 1=1 and a.delete_mark = 0 and b.delete_mark = 0 and d.delete_mark = 0
/*添加权限*/
<if test="receiptinPagination.departmentId != null and receiptinPagination.departmentId != ''">
AND a.department_id = #{receiptinPagination.departmentId}
</if>
<if test="receiptinPagination.orgnizeId != null and receiptinPagination.orgnizeId != ''">
AND a.orgnize_id = #{receiptinPagination.orgnizeId}
</if>
${ew.customSqlSegment} and a.delete_mark = 0 and b.delete_mark = 0 and d.delete_mark = 0
<if test="receiptinPagination.startDate != null and receiptinPagination.endDate != null">
AND a.creator_time &gt; #{receiptinPagination.startDate} AND a.creator_time &lt;= #{receiptinPagination.endDate}
</if>

@ -84,11 +84,6 @@
checked: '',
}
},
computed: {
menuId() {
return this.$route.meta.modelId || ''
}
},
methods: {
rowdbClick(row){
this.checked = row.id
@ -104,7 +99,7 @@
this.listLoading = true
this.listQuery.areacode = this.areacode
this.listQuery.areaname = this.areaname
this.listQuery.menuId = this.menuId
this.listQuery.menuId = '380669124906343173'
let listQuery = this.listQuery
request({
url: `/api/example/Reservoirarea/getList`,

File diff suppressed because it is too large Load Diff

@ -1,156 +0,0 @@
<template>
<el-dialog title="选择库区" :close-on-click-modal="false" :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center"
lock-scroll append-to-body width="1000px">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="8">
<el-form-item label="库区编码">
<el-input v-model="areacode" placeholder="请输入库区编码查询" clearable @keyup.enter.native="init()" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="库区名称">
<el-input v-model="areaname" placeholder="请输入库区名称查询" clearable @keyup.enter.native="init()" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="init()">{{$t('common.search')}}
</el-button>
<el-button icon="el-icon-refresh-right" @click="refresh()">{{$t('common.reset')}}
</el-button>
</el-form-item>
</el-col>
</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="init()" />
</el-tooltip>
</div>
</el-row>
<JNPF-table v-loading="listLoading" :data="list" @row-click="rowClick" @row-dblclick="rowdbClick" :border="false" :hasNO="false">
<el-table-column width="35">
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="checkedRow.id">&nbsp;</el-radio>
</template>
</el-table-column>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="areacode" label="库区编码" />
<el-table-column prop="areaname" label="库区名称" />
<el-table-column prop="maximum" label="最高库存" />
<el-table-column prop="safety" label="安全库存" />
<el-table-column prop="minimum" label="最低库存" />
<el-table-column prop="warehouseId" label="仓库名称" />
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="refresh" />
<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>
</span>
</el-dialog>
</template>
<script>
import request from '@/utils/request'
import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
import {
getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import {
GoodsList
} from '@/api/extend/order'
export default {
data() {
return {
visible: false,
listLoading: true,
areacode: '',
areaname: '',
list: [],
total: 0,
checkedRow: {},
listQuery: {
currentPage: 1,
pageSize: 20,
sort: "desc",
sidx: "creatorTime",
areacode: '',
areaname: '',
},
total: 0,
checked: '',
}
},
computed: {
menuId() {
return this.$route.meta.modelId || ''
}
},
methods: {
rowdbClick(row){
this.checked = row.id
this.checkedRow = row
this.select();
},
rowClick(row) {
this.checked = row.id
this.checkedRow = row
},
init() {
this.visible = true
this.listLoading = true
this.listQuery.areacode = this.areacode
this.listQuery.areaname = this.areaname
this.listQuery.menuId = this.menuId
let listQuery = this.listQuery
request({
url: `/api/example/Reservoirarea/getList`,
method: 'post',
data: listQuery
}).then(res => {
this.list = res.data.list
this.total = res.data.pagination.total
this.listLoading = false
})
/* GoodsList(query).then(res => {
this.list = res.data.list
this.total = res.data.pagination.total
this.listLoading = false
}) */
},
refresh() {
this.areacode = ''
this.areaname = ''
this.init()
},
select() {
if (this.checked == '') return
this.$emit('refreshDataList', this.checkedRow)
this.visible = false
},
handleSelectionChange(val) {
this.checked = val
}
}
}
</script>
<style lang="scss" scoped>
>>>.el-dialog__body {
height: 70vh;
padding: 0 0 10px !important;
display: flex;
flex-direction: column;
overflow: hidden;
.JNPF-common-search-box {
margin-bottom: 0;
.JNPF-common-search-box-right {
padding: 10px 10px 0 0;
}
}
}
</style>

@ -156,29 +156,20 @@
</el-input>
</template>
</el-table-column>
<el-table-column prop="reservoirareaId" label="库区名称" align="center" width="130">
<template slot-scope="scope">
<popupSelect v-model="scope.row.reservoirareaId"
placeholder="请选择" clearable :field="'reservoirareaId'+scope.$index"
interfaceId="381404161809350213"
:columnOptions="receiptout_item0reservoirareaIdcolumnOptions" propsValue="id"
relationField="areaname" popupType="dialog"
popupWidth="800px" @change="areaSelect"
>
</popupSelect>
</template>
</el-table-column>
<el-table-column prop="warehouseId" label="仓库名称" align="center" width="130">
<template slot-scope="scope">
<popupSelect v-model="scope.row.warehouseId"
placeholder="请选择" clearable :field="'reservoirareaId'+scope.$index"
interfaceId="399117969575232581"
:columnOptions="receiptout_item0reservoirareaIdcolumnOptions" propsValue="id"
relationField="name" popupType="dialog"
popupWidth="800px" disabled>
</popupSelect>
</template>
</el-table-column>
<el-table-column prop="reservoirareaId" width="200" label="库区">
<template slot-scope="scope">
<el-input v-model="scope.row.reservoirareaName" placeholder="选择库区"
readonly @click.native="choiceReservoirareaId(scope.$index)">
</el-input>
</template>
</el-table-column>
<el-table-column prop="warehouseId" width="200" label="仓库">
<template slot-scope="scope">
<el-input v-model="scope.row.warehouseName" placeholder="选择库区"
readonly>
</el-input>
</template>
</el-table-column>
<el-table-column prop="batchNo" label="批次号" align="center" width="180">
<template slot-scope="scope">
<el-input v-model="scope.row.batchNo"
@ -262,18 +253,22 @@
<el-button @click="visible = false"> </el-button>
<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail" :disabled="submitDisabled"> </el-button>
</span>
<ReservoirareaBox v-if="formVisible" ref="form" @refreshDataList="initData" />
</el-dialog>
</template>
<script>
import request from '@/utils/request'
import ReservoirareaBox from '../receiptin/ReservoirareaBox'
import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
export default {
components: {},
components: {ReservoirareaBox},
props: [],
data() {
return {
comIndex: -1,
formVisible: false,
submitDisabled: false,
visible: false,
loading: false,
@ -359,6 +354,30 @@
mounted() {
},
methods: {
initData(reservoirarea) {
for (let i = 0; i < this.dataForm.receiptout_item0List.length; i++) {
if (this.comIndex == 0) {
this.dataForm.receiptout_item0List.forEach((column, index) => {
column.reservoirareaId = reservoirarea.id;
column.warehouseId = reservoirarea.houseId;
column.reservoirareaName = reservoirarea.areaname;
column.warehouseName = reservoirarea.houseName;
});
} else {
this.dataForm.receiptout_item0List[this.comIndex].reservoirareaId = reservoirarea.id;
this.dataForm.receiptout_item0List[this.comIndex].warehouseId = reservoirarea.houseId;
this.dataForm.receiptout_item0List[this.comIndex].reservoirareaName = reservoirarea.areaname;
this.dataForm.receiptout_item0List[this.comIndex].warehouseName = reservoirarea.houseName;
}
}
},
choiceReservoirareaId(index) {
this.comIndex = index;
this.formVisible = true
this.$nextTick(() => {
this.$refs.form.init()
})
},
getSummaries(param) {
const {columns, data} = param;
const sums = [];
@ -429,9 +448,7 @@
this.dataForm.receiptout_item0List[i].rateAmount =this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.receiptout_item0List[i].amount, item.fullName),100)
}
})
debugger
this.dataForm.receiptout_item0List[i].unit = list[0].list[i].poundEntity.unit;
debugger
this.dataForm.receiptout_item0List[i].poundType = list[0].list[i].poundEntity.poundType;
}
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
@ -494,6 +511,8 @@
materialId: undefined,
reservoirareaId: undefined,
warehouseId: undefined,
reservoirareaName: undefined,
warehouseName: undefined,
deliveryNum: undefined,
unit: undefined,
price: undefined,

Loading…
Cancel
Save