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

跳过质检

Browse Source
jg-waiwang-pro
XI_TENG\xixi_ 4 months ago
parent 92c87e5e40
commit 92249159ab
12 changed files with 259 additions and 200 deletions
Show Stats Download Patch File Download Diff File

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

@ -834,7 +834,7 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
organize = organize.replace("]","");
QueryWrapper<VoucherEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("b.product_id",voucherPagination.getProductId());
queryWrapper.eq("a.voucher_status","4");
// queryWrapper.eq("a.voucher_status","4"); //质检之后为4的凭证
queryWrapper.notIn(ObjectUtils.isNotEmpty(voucherPagination.getExcludeIdList()),"a.id",voucherPagination.getExcludeIdList());
queryWrapper.in(ObjectUtils.isNotEmpty(voucherPagination.getProductIdList()),"b.product_id",voucherPagination.getProductIdList());
queryWrapper.isNull("a.f_delete_mark");

18
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingNotificationServiceImpl.java
Unescape View File

@ -192,6 +192,16 @@ public class WarehousingNotificationServiceImpl extends ServiceImpl<WarehousingN
}
}
if(isPc){
if(ObjectUtil.isNotEmpty(warehousingNotificationPagination.getCreatorTime())){
warehousingNotificationNum++;
List PreparationTimeList = JsonUtil.getJsonToList(warehousingNotificationPagination.getCreatorTime(),String.class);
Long fir = Long.valueOf(String.valueOf(PreparationTimeList.get(0)));
Long sec = Long.valueOf(String.valueOf(PreparationTimeList.get(1)));
warehousingNotificationQueryWrapper.ge("a.f_creator_time", new Date(fir))
.le("a.f_creator_time", DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
}
if(ObjectUtil.isNotEmpty(warehousingNotificationPagination.getWarehousingCode())){
warehousingNotificationNum++;
@ -427,6 +437,14 @@ public class WarehousingNotificationServiceImpl extends ServiceImpl<WarehousingN
}
}
if(isPc){
if(ObjectUtil.isNotEmpty(warehousingNotificationPagination.getCreatorTime())){
warehousingNotificationNum++;
List PreparationTimeList = JsonUtil.getJsonToList(warehousingNotificationPagination.getCreatorTime(),String.class);
Long fir = Long.valueOf(String.valueOf(PreparationTimeList.get(0)));
Long sec = Long.valueOf(String.valueOf(PreparationTimeList.get(1)));
warehousingNotificationQueryWrapper.ge("a.f_creator_time", new Date(fir))
.le("a.f_creator_time", DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
}
if(ObjectUtil.isNotEmpty(warehousingNotificationPagination.getWarehousingCode())){
warehousingNotificationNum++;

10
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java
Unescape View File

@ -256,15 +256,7 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
}
}
if(isPc){
if(ObjectUtil.isNotEmpty(warehousingOutboundPagination.getTableField119_batchNumber())){
warehousingOutboundProductNum++;
String value = warehousingOutboundPagination.getTableField119_batchNumber() instanceof List ?
JsonUtil.getObjectToString(warehousingOutboundPagination.getTableField119_batchNumber()) :
String.valueOf(warehousingOutboundPagination.getTableField119_batchNumber());
warehousingOutboundProductQueryWrapper.lambda().like(WarehousingOutboundProductEntity::getBatchNumber,value);
}
if(ObjectUtil.isNotEmpty(warehousingOutboundPagination.getDocumentNo())){
warehousingOutboundNum++;
@ -272,7 +264,7 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
String value = warehousingOutboundPagination.getDocumentNo() instanceof List ?
JsonUtil.getObjectToString(warehousingOutboundPagination.getDocumentNo()) :
String.valueOf(warehousingOutboundPagination.getDocumentNo());
warehousingOutboundQueryWrapper.lambda().like(WarehousingOutboundEntity::getDocumentNo,value);
warehousingOutboundQueryWrapper.like("a.document_no",value);
}

11
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java
Unescape View File

@ -269,15 +269,6 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
}
}
if(isPc){
if(ObjectUtil.isNotEmpty(warehousingStoragePagination.getTableField119_batchNumber())){
warehousingStorageProductNum++;
String value = warehousingStoragePagination.getTableField119_batchNumber() instanceof List ?
JsonUtil.getObjectToString(warehousingStoragePagination.getTableField119_batchNumber()) :
String.valueOf(warehousingStoragePagination.getTableField119_batchNumber());
warehousingStorageProductQueryWrapper.lambda().like(WarehousingStorageProductEntity::getBatchNumber,value);
}
if(ObjectUtil.isNotEmpty(warehousingStoragePagination.getDocumentNo())){
warehousingStorageNum++;
@ -285,7 +276,7 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
String value = warehousingStoragePagination.getDocumentNo() instanceof List ?
JsonUtil.getObjectToString(warehousingStoragePagination.getDocumentNo()) :
String.valueOf(warehousingStoragePagination.getDocumentNo());
warehousingStorageQueryWrapper.lambda().like(WarehousingStorageEntity::getDocumentNo,value);
warehousingStorageQueryWrapper.like("a.document_no",value);
}

7
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingStorageController.java
Unescape View File

@ -532,8 +532,6 @@ public class WarehousingStorageController {
flowTaskNodeEntityQueryWrapper.lambda().eq(FlowTaskNodeEntity::getTaskId, flowTaskEntity.getId());
List<FlowTaskNodeEntity> flowTaskNodeEntityList = flowTaskNodeService.list(flowTaskNodeEntityQueryWrapper);
if (flowTaskNodeEntityList != null && flowTaskNodeEntityList.size() > 0 && "end".equals(flowTaskNodeEntityList.get(0).getNodeNext())) {
//审核通过修改入库通知
WarehousingNotificationEntity warehousingNotificationEntity = warehousingNotificationService.getInfo(warehousingStorageForm.getWarehousingId());
// if (warehousingNotificationEntity!=null){
// BigDecimal maxNum = BigDecimal.ZERO;
// BigDecimal YNum = BigDecimal.ZERO;
@ -567,7 +565,8 @@ public class WarehousingStorageController {
//// warehousingNotificationEntity.setNotificationStorageNumber();
// }
//上面注释是多次入库，现在先弄成一次性入库
//审核通过修改入库通知
WarehousingNotificationEntity warehousingNotificationEntity = warehousingNotificationService.getInfo(warehousingStorageForm.getWarehousingId());
//审核后入库单改为3
warehousingStorageForm.setWarehousingStorageStatus("3");
warehousingStorageService.saveOrUpdate(warehousingStorageForm,id,false);
@ -575,7 +574,7 @@ public class WarehousingStorageController {
if (warehousingNotificationEntity!=null){
warehousingNotificationEntity.setWarehousingStatus("4");
warehousingNotificationEntity.setIsFlow(1);
// warehousingNotificationService.saveOrUpdate(warehousingNotificationEntity);
warehousingNotificationService.saveOrUpdate(warehousingNotificationEntity);
//修改采购订单的
if (warehousingNotificationEntity.getWarehousingType().equals("1")){

4
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/warehousingnotification/WarehousingNotificationPagination.java
Unescape View File

@ -34,4 +34,8 @@ public class WarehousingNotificationPagination extends Pagination {
/** 业务类型 */
@JsonProperty("warehousingType")
private Object warehousingType;
/** 制单时间 */
@JsonProperty("creatorTime")
private Object creatorTime;
}

20
jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/form.vue
Unescape View File

@ -160,7 +160,7 @@
<jnpf-form-tip-item label-width="0">
<el-table :data="dataForm.warehousingOutboundPoundlistList" size='mini' border>
<el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
<el-table-column label="关联凭证" min-width="150px"
<!-- <el-table-column label="关联凭证" min-width="150px"
v-if="judgeShow('warehousingoutboundpoundlist-voucherId')" prop="voucherId"
align="center" width="220" fixed="left">
<template slot="header">
@ -179,6 +179,17 @@
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column> -->
<el-table-column label="关联凭证" prop="poundCode" align="center" width="250">
<template slot="header">
<span class="required-sign"></span>关联凭证
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.poundCode" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="单据类型" prop="documentTypes" align="center" width="150">
@ -203,7 +214,7 @@
</template>
</el-table-column>
<el-table-column label="磅单编号" prop="poundCode" align="center" width="150">
<!-- <el-table-column label="磅单编号" prop="poundCode" align="center" width="150">
<template slot="header">
<span class="required-sign"></span>磅单编号
</template>
@ -212,7 +223,7 @@
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
</el-table-column> -->
<!-- <el-table-column label="磅单时间" prop="poundlistTime" align="center" width="150">
<template slot="header">
@ -798,7 +809,8 @@ export default {
vehicleId: e.vehicleId,
productId: e.productId,
voucherId: e.id,
poundCode: e.poundCode,
poundCode: e.voucherCode,
// poundCode: e.poundCode,
poundlistTime: e.poundlistTime,
vehicleNumber: e.vehicleNumber,
unit: e.unit,

20
jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/index.vue
Unescape View File

@ -4,6 +4,14 @@
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.creatorTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据编号">
<el-input v-model="query.documentNo" placeholder="请输入" clearable> </el-input>
@ -11,7 +19,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="入库时间">
<el-form-item label="出库时间">
<JnpfDateRangePicker v-model="query.warehousingTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
@ -24,12 +32,7 @@
<JnpfUserSelect v-model="query.creatorUserId" placeholder="请选择" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="创建时间">
<JnpfDateRangePicker v-model="query.creatorTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
</template>
<el-col :span="6">
<el-form-item>
@ -439,6 +442,9 @@ export default {
},
//初始化查询的默认数据
async initSearchData() {
let date = new Date();
let dateWithoutTime = new Date(date.getFullYear(), date.getMonth(), date.getDate());
this.query.creatorTime = [dateWithoutTime.getTime(), dateWithoutTime.getTime()]
},
initData() {
this.listLoading = true;

323
jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/form.vue
Unescape View File

@ -156,7 +156,7 @@
<jnpf-form-tip-item label-width="0">
<el-table :data="dataForm.warehousingStoragePoundlistList" size='mini' border>
<el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
<el-table-column label="关联凭证"
<!-- <el-table-column label="关联凭证"
v-if="judgeShow('warehousingstoragepoundlist-voucherId')" prop="voucherId"
align="center" width="220" fixed="left">
<template slot="header">
@ -178,6 +178,17 @@
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column> -->
<el-table-column label="关联凭证" prop="poundCode" align="center" width="250">
<template slot="header">
<span class="required-sign"></span>关联凭证
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.poundCode" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="单据类型" prop="documentTypes" align="center" width="150">
@ -206,18 +217,16 @@
</template>
</el-table-column>
<el-table-column label="磅单编号" prop="poundCode" align="center" width="150">
<!-- <el-table-column label="磅单编号" prop="poundCode" align="center" width="150">
<template slot="header">
<span class="required-sign"></span>磅单编号
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.poundCode" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
</el-table-column> -->
<!-- <el-table-column label="磅单时间" prop="poundlistTime" align="center" width="150">
@ -240,121 +249,121 @@
v-if="judgeRequired('warehousingstoragepoundlistList-poundlistTime')">*</span>磅单时间
</template>
<template slot-scope="scope">
<JnpfDatePicker v-model="scope.row.poundlistTime"
@change="changeData('warehousingoutboundpoundlist-poundlistTime', scope.$index)"
:startTime="dateTime(false, 1, 1, '', '')"
:endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
:disabled="judgeWrite('warehousingstoragepoundlistList') || judgeWrite('warehousingstoragepoundlistList-poundlistTime')"
clearable :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
</JnpfDatePicker>
</template>
<JnpfDatePicker v-model="scope.row.poundlistTime"
@change="changeData('warehousingoutboundpoundlist-poundlistTime', scope.$index)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
placeholder="请选择"
:disabled="judgeWrite('warehousingstoragepoundlistList') || judgeWrite('warehousingstoragepoundlistList-poundlistTime')"
clearable :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
</JnpfDatePicker>
</template>
</el-table-column>
<el-table-column label="车辆信息" prop="vehicleName" align="center" width="150">
<template slot="header">
<span class="required-sign"></span>车辆信息
</template>
<span class="required-sign"></span>车辆信息
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.vehicleName" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
<JnpfInput v-model="scope.row.vehicleName" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="商品名称" prop="productName" align="center" width="150">
<template slot="header">
<span class="required-sign"></span>商品名称
</template>
<span class="required-sign"></span>商品名称
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.productName" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
<JnpfInput v-model="scope.row.productName" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="规格" prop="spec" align="center" width="150">
<template slot="header">
<span class="required-sign"></span>规格
</template>
<span class="required-sign"></span>规格
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.spec" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
<JnpfInput v-model="scope.row.spec" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="单位" prop="unit" align="center" width="150">
<template slot="header">
<span class="required-sign"></span>单位
</template>
<span class="required-sign"></span>单位
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.unit" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
<JnpfInput v-model="scope.row.unit" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="毛重" prop="grossWeight" align="center" width="150">
<template slot="header">
<span class="required-sign"></span>毛重
</template>
<span class="required-sign"></span>毛重
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.grossWeight" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
<JnpfInput v-model="scope.row.grossWeight" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="皮重" prop="tareWeight" align="center" width="150">
<template slot="header">
<span class="required-sign"></span>皮重
</template>
<span class="required-sign"></span>皮重
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.tareWeight" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
<JnpfInput v-model="scope.row.tareWeight" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="扣重" prop="buckleWeight" align="center" width="150">
<template slot="header">
<span class="required-sign"></span>扣重
</template>
<span class="required-sign"></span>扣重
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.buckleWeight" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
<JnpfInput v-model="scope.row.buckleWeight" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="净重" prop="netWeight" align="center" width="150">
<template slot="header">
<span class="required-sign"></span>净重
</template>
<span class="required-sign"></span>净重
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.netWeight" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
<JnpfInput v-model="scope.row.netWeight" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="操作" width="50" align="center" fixed="right"
v-if="!judgeWrite('warehousingstoragepoundlistList')">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delwarehousingstoragepoundlistList(scope.$index)">删除</el-button>
</template>
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delwarehousingstoragepoundlistList(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
<!-- <div class="table-actions" @click="addwarehousingstoragepoundlistList()"
@ -387,49 +396,47 @@
width="200" fixed="left" align="center">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingstorageproductList-productId')">*</span>商品名称
</template>
<span class="required-sign"
v-if="judgeRequired('warehousingstorageproductList-productId')">*</span>商品名称
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.productId" @change="changeDataProduct"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.warehousingstorageproductproductId"
placeholder="请选择"
:disabled="judgeWrite('warehousingstorageproductList') || judgeWrite('warehousingstorageproductList-productId')"
hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='name' :field="'productId' + scope.$index"
interfaceId="529622659227471749" :pageSize="20"
:columnOptions="warehousingstorageproductproductIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
<JnpfPopupSelect v-model="scope.row.productId" @change="changeDataProduct"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.warehousingstorageproductproductId" placeholder="请选择"
:disabled="judgeWrite('warehousingstorageproductList') || judgeWrite('warehousingstorageproductList-productId')"
hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='name' :field="'productId' + scope.$index" interfaceId="529622659227471749"
:pageSize="20" :columnOptions="warehousingstorageproductproductIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="规格" prop="spec" width="200" align="center">
<template slot="header">
<span class="required-sign"></span>规格
</template>
<span class="required-sign"></span>规格
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.spec" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
<JnpfInput v-model="scope.row.spec" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="库存单位" prop="inventoryUnitId" width="200" align="center">
<template slot="header">
<span class="required-sign"></span>库存单位
</template>
<span class="required-sign"></span>库存单位
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.inventoryUnitId" placeholder="请输入" disabled
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
<JnpfInput v-model="scope.row.inventoryUnitId" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="入库单位"
@ -437,15 +444,15 @@
width="200" align="center">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingstorageproductList-storageUnit')">*</span>入库单位
</template>
<span class="required-sign"
v-if="judgeRequired('warehousingstorageproductList-storageUnit')">*</span>入库单位
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.storageUnit" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
<JnpfInput v-model="scope.row.storageUnit" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
<!-- <template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.storageUnit"
@ -469,37 +476,36 @@
width="200" align="center">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingstorageproductList-storageAreaId')">*</span>入库货区
</template>
<span class="required-sign"
v-if="judgeRequired('warehousingstorageproductList-storageAreaId')">*</span>入库货区
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.storageAreaId"
@change="changeData('warehousingstorageproduct-storageAreaId', scope.$index)"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.warehousingstorageproductstorageAreaId"
placeholder="请选择" disabled hasPage propsValue="id" popupWidth="800px"
popupTitle="选择数据" popupType="dialog" relationField='cargo_name'
:field="'storageAreaId' + scope.$index" interfaceId="529624294691458949"
:pageSize="20"
:columnOptions="warehousingstorageproductstorageAreaIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
<JnpfPopupSelect v-model="scope.row.storageAreaId"
@change="changeData('warehousingstorageproduct-storageAreaId', scope.$index)"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.warehousingstorageproductstorageAreaId" placeholder="请选择" disabled
hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='cargo_name' :field="'storageAreaId' + scope.$index"
interfaceId="529624294691458949" :pageSize="20"
:columnOptions="warehousingstorageproductstorageAreaIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="入库数量"
v-if="judgeShow('warehousingstorageproduct-storageNumber')" prop="storageNumber"
width="200" align="center">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingstorageproductList-storageNumber')">*</span>入库数量
</template>
<span class="required-sign"
v-if="judgeRequired('warehousingstorageproductList-storageNumber')">*</span>入库数量
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.storageNumber"
@change="changeData('warehousingstorageproduct-storageNumber', scope.$index)"
placeholder="请输入" disabled clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
<JnpfInput v-model="scope.row.storageNumber"
@change="changeData('warehousingstorageproduct-storageNumber', scope.$index)" placeholder="请输入"
disabled clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="已入库数量"
@ -507,30 +513,30 @@
prop="receivedQuantity" width="200" align="center">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingstorageproductList-receivedQuantity')">*</span>已入库数量
</template>
<span class="required-sign"
v-if="judgeRequired('warehousingstorageproductList-receivedQuantity')">*</span>已入库数量
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.receivedQuantity"
@change="changeData('warehousingstorageproduct-receivedQuantity', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('warehousingstorageproductList') || judgeWrite('warehousingstorageproductList-receivedQuantity')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
<JnpfInput v-model="scope.row.receivedQuantity"
@change="changeData('warehousingstorageproduct-receivedQuantity', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('warehousingstorageproductList') || judgeWrite('warehousingstorageproductList-receivedQuantity')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="采购单价" prop="businessPrice" width="150" align="center">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingstorageproductList-businessPrice')">*</span>采购单价
</template>
<span class="required-sign"
v-if="judgeRequired('warehousingstorageproductList-businessPrice')">*</span>采购单价
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.businessPrice" @input="priceCount(scope.row)"
placeholder="请输入" disabled clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
<JnpfInput v-model="scope.row.businessPrice" @input="priceCount(scope.row)" placeholder="请输入"
disabled clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="批次号"
@ -538,16 +544,16 @@
width="200" align="center">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingstorageproductList-batchNumber')">*</span>批次号
</template>
<span class="required-sign"
v-if="judgeRequired('warehousingstorageproductList-batchNumber')">*</span>批次号
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.batchNumber"
@change="changeData('warehousingstorageproduct-batchNumber', scope.$index)"
placeholder="系统自动生成" disabled readonly :style='{ "width": "100%" }'>
</JnpfInput>
</template>
<JnpfInput v-model="scope.row.batchNumber"
@change="changeData('warehousingstorageproduct-batchNumber', scope.$index)" placeholder="系统自动生成"
disabled readonly :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="生产日期"
@ -555,19 +561,19 @@
prop="dateManufacture" width="200" align="center">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingstorageproductList-dateManufacture')">*</span>生产日期
</template>
<span class="required-sign"
v-if="judgeRequired('warehousingstorageproductList-dateManufacture')">*</span>生产日期
</template>
<template slot-scope="scope">
<JnpfDatePicker v-model="scope.row.dateManufacture"
@change="changeData('warehousingstorageproduct-dateManufacture', scope.$index)"
:startTime="dateTime(false, 1, 1, '', '')"
:endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
:disabled="judgeWrite('warehousingstorageproductList') || judgeWrite('warehousingstorageproductList-dateManufacture')"
clearable :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
</JnpfDatePicker>
</template>
<JnpfDatePicker v-model="scope.row.dateManufacture"
@change="changeData('warehousingstorageproduct-dateManufacture', scope.$index)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
placeholder="请选择"
:disabled="judgeWrite('warehousingstorageproductList') || judgeWrite('warehousingstorageproductList-dateManufacture')"
clearable :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
</JnpfDatePicker>
</template>
</el-table-column>
<!-- <el-table-column label="操作" width="50" align="center" fixed="right"
v-if="!judgeWrite('warehousingstorageproductList')">
@ -831,9 +837,10 @@ export default {
const e = list[i];
let item = {
voucherId: e.id,
poundCode: e.voucherCode,
documentTypes: e.documentType1,
voucherTypes: e.voucherType1,
poundCode: e.poundCode,
// poundCode: e.poundCode,
poundlistTime: e.poundlistTime,
vehicleName: e.vehicleNumber,
unit: e.unit,

20
jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/index.vue
Unescape View File

@ -3,6 +3,13 @@
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.creatorTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据编号">
<el-input v-model="query.documentNo" placeholder="请输入" clearable> </el-input>
@ -30,12 +37,7 @@
<JnpfUserSelect v-model="query.creatorUserId" placeholder="请选择" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="创建时间">
<JnpfDateRangePicker v-model="query.creatorTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
</template>
<el-col :span="6">
<el-form-item>
@ -510,7 +512,11 @@ export default {
// this.initData()
},
//初始化查询的默认数据
async initSearchData() { },
async initSearchData() {
let date = new Date();
let dateWithoutTime = new Date(date.getFullYear(), date.getMonth(), date.getDate());
this.query.creatorTime = [dateWithoutTime.getTime(), dateWithoutTime.getTime()]
},
initData() {
this.listLoading = true;
let _query = {

12
jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/index.vue
Unescape View File

@ -3,6 +3,14 @@
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.creatorTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="通知编号">
<el-input v-model="query.warehousingCode" placeholder="请输入" clearable> </el-input>
@ -207,6 +215,7 @@ export default {
query: {
warehousingCode: undefined,
creatorTime: undefined,
},
treeProps: {
children: 'children',
@ -483,6 +492,9 @@ export default {
},
//初始化查询的默认数据
async initSearchData() {
let date = new Date();
let dateWithoutTime = new Date(date.getFullYear(), date.getMonth(), date.getDate());
this.query.creatorTime = [dateWithoutTime.getTime(), dateWithoutTime.getTime()]
},
initData() {
this.listLoading = true;

12
jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationsale/index.vue
Unescape View File

@ -3,6 +3,14 @@
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.creatorTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="通知编号">
<el-input v-model="query.warehousingCode" placeholder="请输入" clearable> </el-input>
@ -210,6 +218,7 @@ export default {
saleVisible: false,
query: {
warehousingCode: undefined,
creatorTime: undefined,
},
treeProps: {
children: 'children',
@ -485,6 +494,9 @@ export default {
},
//初始化查询的默认数据
async initSearchData() {
let date = new Date();
let dateWithoutTime = new Date(date.getFullYear(), date.getMonth(), date.getDate());
this.query.creatorTime = [dateWithoutTime.getTime(), dateWithoutTime.getTime()]
},
initData() {
this.listLoading = true;

Write Preview
Loading…
Cancel
Save