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

Merge remote-tracking branch 'origin/master'

Browse Source
jg-waiwang-pro
胡川虎 4 months ago
parent cb04c154d6 2018b2f9b8
commit 4f90b48398
12 changed files with 152 additions and 137 deletions
Show Stats Download Patch File Download Diff File

4
jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml
Unescape View File

@ -52,9 +52,9 @@
WHEN '11' THEN WHEN '11' THEN
'采购发货单出库' '采购发货单出库'
WHEN '12' THEN WHEN '12' THEN
'调拨出库撤回'
WHEN '13' THEN
'销售发货单出库' '销售发货单出库'
WHEN '13' THEN
'调拨出库撤回'
WHEN '15' THEN WHEN '15' THEN
'采购收货单入库' '采购收货单入库'
WHEN '16' THEN WHEN '16' THEN

76
jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml
Unescape View File

@ -151,37 +151,31 @@
</select> </select>
<select id="queryWorkOrderByYunguan" resultType="jnpf.model.yunguan.YunguanProductProcessModel"> <select id="queryWorkOrderProductByYunguan" resultType="jnpf.model.yunguan.YunguanProductProcessModel">
select select
a.id as ID, a.id as ID,
m.yunguan_value as ORGANIZATION_CODE, m.yunguan_value as ORGANIZATION_CODE,
l.f_full_name as ORGANIZATION_NM, l.f_full_name as ORGANIZATION_NM,
a.code as TASK_NO, a.code as TASK_NO,
case '产出' as PRD_TY,
a.type
when '1' then '产出'
when '2' then '投入'
when '3' then '投入'
end as PRD_TY,
d.code as ITEM_CD, d.code as ITEM_CD,
d.name as ITEM_NM, d.name as ITEM_NM,
case case
d.inventory_type d.is_input
when '1' then '原料' when '1' then '产品'
when '2' then '副产品' when '2' then '副产品'
when '3' then '产品'
end as PROD_TY, end as PROD_TY,
d.spec as SPEC_TYPE, b.spec as SPEC_TYPE,
b.proportion_num as QUANTITY, b.proportion_num as QUANTITY,
a.work_time as PRD_DATE, a.work_time as PRD_DATE,
b.unit_id as UOM, b.unit_id as UOM,
'N' as ERP_FLAG, 'N' as ERP_FLAG,
e.name as STORE_ID, n.cargo_name as STORE_ID,
'正向' as RSLT_TYPE, '正向' as RSLT_TYPE,
a.code as TASK_NM, a.code as TASK_NM,
g.batch_number as BATCH_ID, b.batch_number as BATCH_ID,
'已完成' as STATUS_FLAG, '已完成' as STATUS_FLAG,
a.business_id as ATTR1, e.name as ATTR1,
k.code as ATTR2, k.code as ATTR2,
k.name as ATTR3, k.name as ATTR3,
h.f_real_name as CREATE_EMP_ID, h.f_real_name as CREATE_EMP_ID,
@ -193,10 +187,9 @@
null as ESB_DTM, null as ESB_DTM,
'' as ESB_MESSAGE '' as ESB_MESSAGE
from jg_work_order a from jg_work_order a
left join jg_work_order_product b on a.id = b.work_id and b.f_delete_mark is null right join jg_work_order_product b on a.id = b.work_id and b.f_delete_mark is null
left join jg_work_order_primary c on a.id = c.work_id and c.f_delete_mark is null
left join jg_product d on b.product_id = d.id and d.f_delete_mark is null left join jg_product d on b.product_id = d.id and d.f_delete_mark is null
left join jg_business_line e on a.warehouse_id = e.id and e.f_delete_mark is null left join jg_business_line e on a.business_id = e.id and e.f_delete_mark is null
left join jg_warehousing_storage f on a.id = f.warehousing_id and f.f_delete_mark is null left join jg_warehousing_storage f on a.id = f.warehousing_id and f.f_delete_mark is null
left join jg_warehousing_storage_product g on f.id = g.warehousing_storage_id and g.product_id = b.product_id and g.f_delete_mark is null left join jg_warehousing_storage_product g on f.id = g.warehousing_storage_id and g.product_id = b.product_id and g.f_delete_mark is null
left join base_user h on a.f_creator_user_id = h.f_id and h.f_delete_mark is null left join base_user h on a.f_creator_user_id = h.f_id and h.f_delete_mark is null
@ -205,7 +198,56 @@
left join jg_product k on j.product_id = k.id and k.f_delete_mark is null left join jg_product k on j.product_id = k.id and k.f_delete_mark is null
left join base_organzie l on a.company_id = l.f_id and l.f_delete_mark is null left join base_organzie l on a.company_id = l.f_id and l.f_delete_mark is null
left join jg_dictionary_yunguan_data m on m.type_id = '564773000885326917' and m.zhihui_value = l.f_full_name and m.f_delete_mark is null left join jg_dictionary_yunguan_data m on m.type_id = '564773000885326917' and m.zhihui_value = l.f_full_name and m.f_delete_mark is null
left join jg_business_cargo n on b.cargo_id = n.id and n.f_delete_mark is null
where a.f_delete_mark is null and a.id =#{id} where a.f_delete_mark is null and a.id =#{id}
</select> </select>
<select id="queryWorkOrderPrimaryByYunguan" resultType="jnpf.model.yunguan.YunguanProductProcessModel">
select
a.id as ID,
m.yunguan_value as ORGANIZATION_CODE,
l.f_full_name as ORGANIZATION_NM,
a.code as TASK_NO,
'投入' as PRD_TY,
d.code as ITEM_CD,
d.name as ITEM_NM,
'原料' as PROD_TY,
c.spec as SPEC_TYPE,
c.reality_num as QUANTITY,
a.work_time as PRD_DATE,
b.unit_id as UOM,
'N' as ERP_FLAG,
n.cargo_name as STORE_ID,
'正向' as RSLT_TYPE,
a.code as TASK_NM,
c.batch_number as BATCH_ID,
'已完成' as STATUS_FLAG,
e.name as ATTR1,
k.code as ATTR2,
k.name as ATTR3,
h.f_real_name as CREATE_EMP_ID,
a.f_creator_time as CREATE_DTM,
'N' as READ_FLAG,
null as READ_TIME,
'' as ERR_MESSAGE,
'N' as ESB_STATUS,
null as ESB_DTM,
'' as ESB_MESSAGE
from jg_work_order a
left join jg_work_order_product b on a.id = b.work_id and b.f_delete_mark is null
right join jg_work_order_primary c on a.id = c.work_id and c.f_delete_mark is null
left join jg_product d on a.product_id = d.id and d.f_delete_mark is null
left join jg_business_line e on a.business_id = e.id and e.f_delete_mark is null
left join jg_warehousing_storage f on a.id = f.warehousing_id and f.f_delete_mark is null
left join jg_warehousing_storage_product g on f.id = g.warehousing_storage_id and g.product_id = b.product_id and g.f_delete_mark is null
left join base_user h on a.f_creator_user_id = h.f_id and h.f_delete_mark is null
left join jg_bom i on b.bom_id = i.id and i.f_delete_mark is null
left join jg_bom_item j on i.id = j.bom_id and j.f_delete_mark is null
left join jg_product k on j.product_id = k.id and k.f_delete_mark is null
left join base_organzie l on a.company_id = l.f_id and l.f_delete_mark is null
left join jg_dictionary_yunguan_data m on m.type_id = '564773000885326917' and m.zhihui_value = l.f_full_name and m.f_delete_mark is null
left join jg_business_cargo n on c.cargo_id = n.id and n.f_delete_mark is null
where a.f_delete_mark is null and a.id =#{id}
</select>
</mapper> </mapper>

4
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/WorkOrderMapper.java
Unescape View File

@ -40,5 +40,7 @@ public interface WorkOrderMapper extends BaseMapper<WorkOrderEntity> {
//列表查询 //列表查询
IPage<WorkOrderEntity> getWorkOrderList(@Param("page") Page<WorkOrderEntity> page, @Param("workOrderPagination") WorkOrderPagination workOrderPagination, @Param("ew") Wrapper<WorkOrderEntity> workOrderQueryWrapper); IPage<WorkOrderEntity> getWorkOrderList(@Param("page") Page<WorkOrderEntity> page, @Param("workOrderPagination") WorkOrderPagination workOrderPagination, @Param("ew") Wrapper<WorkOrderEntity> workOrderQueryWrapper);
//运管生产加工接口 //运管生产加工接口
List<YunguanProductProcessModel> queryWorkOrderByYunguan(@Param("id") String id ); List<YunguanProductProcessModel> queryWorkOrderProductByYunguan(@Param("id") String id );
//运管生产加工接口
List<YunguanProductProcessModel> queryWorkOrderPrimaryByYunguan(@Param("id") String id );
} }

4
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/WorkOrderService.java
Unescape View File

@ -55,5 +55,7 @@ public interface WorkOrderService extends IService<WorkOrderEntity> {
List<WorkOrderEntity> getReceiveList(WorkOrderPagination workOrderPagination); List<WorkOrderEntity> getReceiveList(WorkOrderPagination workOrderPagination);
List<WorkOrderEntity> getReceiveTypeList(WorkOrderPagination workOrderPagination,String dataType); List<WorkOrderEntity> getReceiveTypeList(WorkOrderPagination workOrderPagination,String dataType);
//运管生产加工接口 //运管生产加工接口
List<YunguanProductProcessModel> queryWorkOrderByYunguan(@Param("id") String id ); List<YunguanProductProcessModel> queryWorkOrderProductByYunguan(@Param("id") String id );
//运管生产加工接口
List<YunguanProductProcessModel> queryWorkOrderPrimaryByYunguan(@Param("id") String id );
} }

9
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WorkOrderServiceImpl.java
Unescape View File

@ -920,7 +920,12 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
} }
@Override @Override
public List<YunguanProductProcessModel> queryWorkOrderByYunguan(String id) { public List<YunguanProductProcessModel> queryWorkOrderPrimaryByYunguan(String id) {
return workOrderMapper.queryWorkOrderByYunguan(id); return workOrderMapper.queryWorkOrderPrimaryByYunguan(id);
}
@Override
public List<YunguanProductProcessModel> queryWorkOrderProductByYunguan(String id) {
return workOrderMapper.queryWorkOrderProductByYunguan(id);
} }
} }

17
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java
Unescape View File

@ -1504,11 +1504,18 @@ public class VoucherController {
columns.add(new ExcelImFieldModel("tableField140","",tableField140columns));*/ columns.add(new ExcelImFieldModel("tableField140","",tableField140columns));*/
for (VoucherExcelVO222 voucherExcelVO222:excelDataList){ for (VoucherExcelVO222 voucherExcelVO222:excelDataList){
try { try {
String a= String.valueOf(voucherExcelVO222.getPoundlistTime()); if (voucherExcelVO222.getPoundlistTime()==null){
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Date date = new Date(a); Date date = new Date();
String formattedDate = sdf.format(date); String formattedDate = sdf.format(date);
voucherExcelVO222.setReceivingDate(formattedDate); voucherExcelVO222.setReceivingDate(formattedDate);
}else {
String a= String.valueOf(voucherExcelVO222.getPoundlistTime());
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Date date = new Date(a);
String formattedDate = sdf.format(date);
voucherExcelVO222.setReceivingDate(formattedDate);
}
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
return ActionResult.fail("收货日期格式不对，请输入/。或是有多余的行"); return ActionResult.fail("收货日期格式不对，请输入/。或是有多余的行");

6
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java
Unescape View File

@ -1161,8 +1161,10 @@ public class WorkOrderController {
} }
} }
// List<YunguanProductProcessModel> yunguanProductProcessModelList = workOrderService.queryWorkOrderByYunguan(id); // List<YunguanProductProcessModel> yunguanProductProcessModelList = workOrderService.queryWorkOrderProductByYunguan(id);
// JSONObject workOrderCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordLine", "POST", JsonUtil.getObjectToString(yunguanProductProcessModelList)); // List<YunguanProductProcessModel> yunguanProductProcessModelList1 = workOrderService.queryWorkOrderPrimaryByYunguan(id);
// yunguanProductProcessModelList.addAll(yunguanProductProcessModelList1);
// JSONObject workOrderCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/prod/proditem", "POST", JsonUtil.getObjectToString(yunguanProductProcessModelList));
// if (ObjectUtil.isNotEmpty(workOrderCode) && workOrderCode.get("code").equals("200")){ // if (ObjectUtil.isNotEmpty(workOrderCode) && workOrderCode.get("code").equals("200")){
// //
// } // }

1
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingProductEntity.java
Unescape View File

@ -90,6 +90,7 @@ public class WarehousingProductEntity {
private String orderLine; private String orderLine;
@TableField(exist = false) @TableField(exist = false)
private String storageUnit; private String storageUnit;

2
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/warehousingnotification/WarehousingProductModel.java
Unescape View File

@ -72,4 +72,6 @@ public class WarehousingProductModel {
@JSONField(name = "ordLn") @JSONField(name = "ordLn")
private String ordLn; private String ordLn;
} }

4
jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/NotificationVoucherSale.vue
Unescape View File

@ -36,6 +36,10 @@
</el-table-column> </el-table-column>
<el-table-column prop="poundCode" label="磅单编号" align="left"> <el-table-column prop="poundCode" label="磅单编号" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="batchNo" label="批次号" align="left">
</el-table-column>
<el-table-column prop="inventoryNumber" label="库存数量" align="left">
</el-table-column>
<!-- <el-table-column prop="vehicleName" label="车牌号" align="left"> <!-- <el-table-column prop="vehicleName" label="车牌号" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="supplierName" label="供应商名字" align="left"> <el-table-column prop="supplierName" label="供应商名字" align="left">

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

@ -960,6 +960,7 @@ export default {
this.dataForm.warehousingProductList[idx].storageAreaId = val2[0].cargoId this.dataForm.warehousingProductList[idx].storageAreaId = val2[0].cargoId
this.dataForm.warehousingProductList[idx].batchNo = val2[0].batch_number this.dataForm.warehousingProductList[idx].batchNo = val2[0].batch_number
this.dataForm.warehousingProductList[idx].produceDate = val2[0].produce_date this.dataForm.warehousingProductList[idx].produceDate = val2[0].produce_date
this.dataForm.warehousingProductList[idx].inventoryNo = val2[0].inventory_number this.dataForm.warehousingProductList[idx].inventoryNo = val2[0].inventory_number
} else { } else {
let item = JSON.parse(JSON.stringify(this.dataForm.warehousingProductList[index])) let item = JSON.parse(JSON.stringify(this.dataForm.warehousingProductList[index]))
@ -967,6 +968,7 @@ export default {
this.dataForm.warehousingProductList[idx].storageAreaId = val2[i].cargoId this.dataForm.warehousingProductList[idx].storageAreaId = val2[i].cargoId
this.dataForm.warehousingProductList[idx].batchNo = val2[i].batch_number this.dataForm.warehousingProductList[idx].batchNo = val2[i].batch_number
this.dataForm.warehousingProductList[idx].produceDate = val2[i].produce_date this.dataForm.warehousingProductList[idx].produceDate = val2[i].produce_date
this.dataForm.warehousingProductList[idx].inventoryNo = val2[i].inventory_number this.dataForm.warehousingProductList[idx].inventoryNo = val2[i].inventory_number
} }
idx++ idx++

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

@ -150,7 +150,7 @@
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24"> <!-- <el-col :span="24">
<div style="padding:15px 0px"> <div style="padding:15px 0px">
<span style="color: #409EFF;">▋</span> <span style="color: #409EFF;">▋</span>
<span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">出库凭证</span> <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">出库凭证</span>
@ -160,27 +160,6 @@
<jnpf-form-tip-item label-width="0"> <jnpf-form-tip-item label-width="0">
<el-table :data="dataForm.warehousingOutboundPoundlistList" size='mini' border> <el-table :data="dataForm.warehousingOutboundPoundlistList" size='mini' border>
<el-table-column type="index" width="50" label="序号" align="center" fixed="left" /> <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
<!-- <el-table-column label="关联凭证" min-width="150px"
v-if="judgeShow('warehousingoutboundpoundlist-voucherId')" prop="voucherId"
align="center" width="220" fixed="left">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingoutboundpoundlistList-voucherId')">*</span>关联凭证
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.voucherId" @change="changeDataVoucher"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.warehousingoutboundpoundlistvoucherId"
placeholder="请选择" disabled hasPage propsValue="id" popupWidth="800px"
popupTitle="选择数据" popupType="dialog" relationField='voucher_code'
:field="'voucherId' + scope.$index" interfaceId="529929122277773509"
:pageSize="20"
:columnOptions="warehousingoutboundpoundlistvoucherIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column> -->
<el-table-column label="关联凭证" prop="voucherCode" align="center" width="250"> <el-table-column label="关联凭证" prop="voucherCode" align="center" width="250">
<template slot="header"> <template slot="header">
<span class="required-sign"></span>关联凭证 <span class="required-sign"></span>关联凭证
@ -191,7 +170,6 @@
</JnpfInput> </JnpfInput>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单据类型" prop="documentTypes" align="center" width="150"> <el-table-column label="单据类型" prop="documentTypes" align="center" width="150">
<template slot="header"> <template slot="header">
<span class="required-sign"></span>单据类型 <span class="required-sign"></span>单据类型
@ -212,31 +190,9 @@
:style='{ "width": "100%" }'> :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</template> </template>
</el-table-column>
<!-- <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 label="磅单时间" prop="poundlistTime" align="center" width="150">
<template slot="header">
<span class="required-sign"></span>磅单时间
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.poundlistTime" placeholder="请输入" disabled
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column> --> </el-table-column> -->
<el-table-column label="磅单时间" <!-- <el-table-column label="磅单时间"
v-if="judgeShow('warehousingoutboundpoundlist-poundlistTime')" v-if="judgeShow('warehousingoutboundpoundlist-poundlistTime')"
prop="poundlistTime" width="200" align="center"> prop="poundlistTime" width="200" align="center">
<template slot="header"> <template slot="header">
@ -336,17 +292,6 @@
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="备注" prop="remark" align="center" width="150">
<template slot="header">
<span class="required-sign"></span>备注
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.remark" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column> -->
<el-table-column label="操作" width="50" align="center" fixed="right" <el-table-column label="操作" width="50" align="center" fixed="right"
v-if="!judgeWrite('warehousingoutboundpoundlistList')"> v-if="!judgeWrite('warehousingoutboundpoundlistList')">
<template slot-scope="scope"> <template slot-scope="scope">
@ -354,18 +299,18 @@
@click="delwarehousingoutboundpoundlistList(scope.$index)">删除</el-button> @click="delwarehousingoutboundpoundlistList(scope.$index)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table> -->
<!-- <div class="table-actions" @click="addwarehousingoutboundpoundlistList()" <!-- <div class="table-actions" @click="addwarehousingoutboundpoundlistList()"
v-if="!judgeWrite('warehousingoutboundpoundlistList')"> v-if="!judgeWrite('warehousingoutboundpoundlistList')">
<el-button type="text" icon="el-icon-plus">添加</el-button> <el-button type="text" icon="el-icon-plus">添加</el-button>
</div> --> </div> -->
<div class="table-actions" @click="choice(dataForm.warehousingId)" <!-- <div class="table-actions" @click="choice(dataForm.warehousingId)"
v-if="!judgeWrite('warehousingoutboundpoundlistList')"> v-if="!judgeWrite('warehousingoutboundpoundlistList')">
<el-button type="text" icon="el-icon-plus">添加</el-button> <el-button type="text" icon="el-icon-plus">添加</el-button>
</div> </div> -->
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<div style="padding:15px 0px"> <div style="padding:15px 0px">
@ -777,9 +722,10 @@ export default {
spec: e.spec, spec: e.spec,
inventoryUnitId: e.inventoryUnitId, inventoryUnitId: e.inventoryUnitId,
outboundUnit: e.inventoryUnitId, outboundUnit: e.inventoryUnitId,
outboundNumber: e.purchaseNum, outboundNumber: e.notificationStorageNumber,
outboundAreaId: e.storageAreaId, outboundAreaId: e.storageAreaId,
batchNumber: e.batchNo, batchNumber: e.batchNo,
inventoryNumber: e.inventoryNumber,
storageNumber: e.storageNumber, storageNumber: e.storageNumber,
receivedQuantity: e.receivedQuantity, receivedQuantity: e.receivedQuantity,
businessPrice: e.businessPrice, businessPrice: e.businessPrice,
@ -921,56 +867,56 @@ export default {
} }
} }
} }
if (!this.warehousingoutboundpoundlistExist()) return // if (!this.warehousingoutboundpoundlistExist()) return
if (!this.warehousingoutboundproductExist()) return if (!this.warehousingoutboundproductExist()) return
if (!this.warehousingoutboundproductExist1()) return // if (!this.warehousingoutboundproductExist1()) return
return isOk return isOk
}, },
warehousingoutboundpoundlistExist() { // warehousingoutboundpoundlistExist() {
let isOk = true; // let isOk = true;
for (let i = 0; i < this.dataForm.warehousingOutboundPoundlistList.length; i++) { // for (let i = 0; i < this.dataForm.warehousingOutboundPoundlistList.length; i++) {
const e = this.dataForm.warehousingOutboundPoundlistList[i]; // const e = this.dataForm.warehousingOutboundPoundlistList[i];
if (!e.voucherId) { // if (!e.voucherId) {
this.$message({ // this.$message({
message: '关联凭证不能为空', // message: '关联凭证不能为空',
type: 'error', // type: 'error',
duration: 1000 // duration: 1000
}); // });
isOk = false // isOk = false
break // break
} // }
} // }
return isOk; // return isOk;
}, // },
warehousingoutboundproductExist1() { // warehousingoutboundproductExist1() {
let isOk = true; // let isOk = true;
var data = JSON.parse(JSON.stringify(this.dataForm.warehousingOutboundPoundlistList)) // var data = JSON.parse(JSON.stringify(this.dataForm.warehousingOutboundPoundlistList))
var echararr = []; // var echararr = [];
for (var i = 0; i < data.length; i++) { // for (var i = 0; i < data.length; i++) {
var arrindex = echararr.findIndex((item) => { return item.productId == data[i].productId && item.unit == data[i].unit }) // var arrindex = echararr.findIndex((item) => { return item.productId == data[i].productId && item.unit == data[i].unit })
if (arrindex == -1) { // if (arrindex == -1) {
echararr.push(data[i]); // echararr.push(data[i]);
} else { // } else {
echararr[arrindex].netWeight = this.jnpf.floatAdd(echararr[arrindex].netWeight, data[i].netWeight) // echararr[arrindex].netWeight = this.jnpf.floatAdd(echararr[arrindex].netWeight, data[i].netWeight)
} // }
} // }
echararr.forEach(item => { // echararr.forEach(item => {
const flag = this.dataForm.warehousingOutboundProductList.find(e => e.productId == item.productId && e.outboundUnit == item.unit && e.outboundNumber == item.netWeight) // const flag = this.dataForm.warehousingOutboundProductList.find(e => e.productId == item.productId && e.outboundUnit == item.unit && e.outboundNumber == item.netWeight)
if (!flag) { // if (!flag) {
this.$message({ // this.$message({
message: '凭证与商品不一致', // message: '凭证与商品不一致',
type: 'error', // type: 'error',
duration: 1000 // duration: 1000
}); // });
isOk = false // isOk = false
return isOk // return isOk
} // }
}) // })
return isOk // return isOk
}, // },
warehousingoutboundproductExist() { warehousingoutboundproductExist() {
let isOk = true; let isOk = true;

Write Preview
Loading…
Cancel
Save