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

采购退货选择凭证

Browse Source
jg-waiwang-pro
vayne 6 months ago
parent bb052aba07
commit 30e2393965
5 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File

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

@ -676,13 +676,11 @@
'其他采购'
END AS orderType1,
b.NAME AS subjectName,
c.contract_name AS contractName,
d.addressName
c.contract_name AS contractName
FROM
jg_business_order a
LEFT JOIN jg_subject_basic b ON a.first_subject_basic_id = b.id AND b.f_delete_mark IS NULL
LEFT JOIN jg_contract c ON a.contract_id = c.id AND c.f_delete_mark is NULL
LEFT JOIN jg_business_address d ON a.receive_address = d.id AND d.f_delete_mark is null
${ew.customSqlSegment}
</select>
</mapper>

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

@ -445,6 +445,6 @@
from jg_voucher a
left join jg_vehicle b on a.vehicle_id = b.id and b.f_delete_mark is null
LEFT JOIN flow_task e ON a.id = e.f_process_id
where id = #{id} AND e.f_status = 2
where a.id = #{id} AND e.f_status = 2
</select>
</mapper>

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

@ -665,6 +665,7 @@ public class VoucherController {
for (WarehousingStorageEntity storageEntity : warehousingStorageEntityList){
QueryWrapper<WarehousingStoragePoundlistEntity> pountlistQueryWrapper = new QueryWrapper<>();
pountlistQueryWrapper.lambda().eq(WarehousingStoragePoundlistEntity::getWarehousingStorageId,storageEntity.getId());
pountlistQueryWrapper.lambda().notIn(ObjectUtils.isNotEmpty(voucherPagination.getExcludeIdList()),WarehousingStoragePoundlistEntity::getVoucherId,voucherPagination.getExcludeIdList());
List<WarehousingStoragePoundlistEntity> warehousingStoragePoundlistEntityList = warehousingStoragePoundlistService.list(pountlistQueryWrapper);
storagePoundlistEntityList.addAll(warehousingStoragePoundlistEntityList);
}
@ -687,6 +688,7 @@ public class VoucherController {
for (WarehousingStorageEntity warehousingStorageEntity : warehousingStorageEntityList){
QueryWrapper<WarehousingStoragePoundlistEntity> pountlistQueryWrapper = new QueryWrapper<>();
pountlistQueryWrapper.lambda().eq(WarehousingStoragePoundlistEntity::getWarehousingStorageId,warehousingStorageEntity.getId());
pountlistQueryWrapper.lambda().notIn(ObjectUtils.isNotEmpty(voucherPagination.getExcludeIdList()),WarehousingStoragePoundlistEntity::getVoucherId,voucherPagination.getExcludeIdList());
List<WarehousingStoragePoundlistEntity> warehousingStoragePoundlistEntityList = warehousingStoragePoundlistService.list(pountlistQueryWrapper);
storagePoundlistEntityList.addAll(warehousingStoragePoundlistEntityList);
}
@ -704,13 +706,19 @@ public class VoucherController {
product.setNetWeight(storagePoundlistEntity.getNetWeight());//净重
}
storagePoundlistEntity.setWarehousingStorageProductEntityList(productList);
}
for(WarehousingStoragePoundlistEntity poundlistEntity : storagePoundlistEntityList){
VoucherEntity voucherEntity = voucherService.queryVoucherInfo(poundlistEntity.getVoucherId());
poundlistEntity.setDocumentType1(voucherEntity.getDocumentType1());
poundlistEntity.setVoucherType1(voucherEntity.getVoucherType1());
poundlistEntity.setVehicleNumber(voucherEntity.getVehicleNumber());
}
VoucherEntity voucherEntity = voucherService.queryVoucherInfo(storagePoundlistEntity.getVoucherId());
storagePoundlistEntity.setDocumentType1(voucherEntity.getDocumentType1());
storagePoundlistEntity.setVoucherType1(voucherEntity.getVoucherType1());
storagePoundlistEntity.setVehicleNumber(voucherEntity.getVehicleNumber());
storagePoundlistEntity.setVoucherCode(voucherEntity.getVoucherCode());
storagePoundlistEntity.setPoundCode(voucherEntity.getPoundCode());
}
// for(WarehousingStoragePoundlistEntity poundlistEntity : storagePoundlistEntityList){
// VoucherEntity voucherEntity = voucherService.queryVoucherInfo(poundlistEntity.getVoucherId());
// poundlistEntity.setDocumentType1(voucherEntity.getDocumentType1());
// poundlistEntity.setVoucherType1(voucherEntity.getVoucherType1());
// poundlistEntity.setVehicleNumber(voucherEntity.getVehicleNumber());
// }
// List<VoucherEntity> list= voucherService.queryVoucherPopupByReturnInfo(voucherPagination);
// for (VoucherEntity entity : list) {
// if (StringUtil.isNotEmpty(entity.getProductId())){

2
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingStoragePoundlistEntity.java
Unescape View File

@ -90,6 +90,8 @@ public class WarehousingStoragePoundlistEntity {
private String voucherType;
@TableField(value = "VOUCHER_CODE" , updateStrategy = FieldStrategy.IGNORED)
private String voucherCode;
@TableField(value = "POUND_CODE" , updateStrategy = FieldStrategy.IGNORED)
private String poundCode;
}

7
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/form.vue
Unescape View File

@ -285,7 +285,7 @@
<el-col :span="8" v-if="judgeShow('shippingAddress')">
<jnpf-form-tip-item label="收货地址" v-if="judgeShow('shippingAddress')"
prop="shippingAddress">
<JnpfInput v-model="dataForm.deliveryAddress"
<JnpfInput v-model="dataForm.shippingAddress"
@change="changeData('shippingAddress', -1)" placeholder="请输入"
:disabled="judgeWrite('shippingAddress')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
@ -1327,7 +1327,6 @@ export default {
})
},
initVoucherList(list) {
debugger
for (let i = 0; i < list.length; i++) {
const e = list[i];
debugger
@ -1403,10 +1402,10 @@ export default {
this.dataForm.purchaseOrderInfo = []
this.dataForm.purchaseOrderInfo[0] = val2
this.dataForm.subjectId = val2.firstSubjectBasicId
this.dataForm.deliveryAddress = val2.addressName
this.dataForm.shippingAddress = val2.deliveryAddress
this.dataForm.enterpriseId = val2.enterpriseId
this.dataForm.warehouseId = val2.deliveryWarehouse
this.dataForm.shippingAddress = val2.deliveryAddress
this.dataForm.deliveryAddress = val2.receiveAddress
this.dataForm.reservedFields1 = val2.businessLineId
val2.businessOrderProductRelationalList.forEach((item, index) => {
this.productIdList.push(item.productId)

Write Preview
Loading…
Cancel
Save