From c3d9aab03571a29bd242292fd7b600d1ac7a29a8 Mon Sep 17 00:00:00 2001 From: vayne Date: Mon, 26 Feb 2024 17:36:24 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=94=80=E5=94=AE?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/scm/VoucherMapper.xml | 63 ++ .../main/java/jnpf/mapper/VoucherMapper.java | 3 + .../java/jnpf/service/VoucherService.java | 9 + .../impl/DeliveryOrderServiceImpl.java | 37 +- .../service/impl/ReceiptOrderServiceImpl.java | 37 +- .../impl/ReturnCargoOrderServiceImpl.java | 37 +- .../jnpf/service/impl/VoucherServiceImpl.java | 15 + .../ReturnCargoOrderController.java | 8 +- .../jnpf/controller/VoucherController.java | 97 +++- .../jnpf/entity/ProductWarehouseEntity.java | 16 + .../jnpf/entity/ReturnCargoOrderEntity.java | 2 +- .../DeliveryProductRelationModel.java | 4 + .../DeliveryVoucherRelationModel.java | 4 + .../DeliveryProductRelationModel.java | 4 + .../DeliveryVoucherRelationModel.java | 4 + .../DeliveryProductRelationModel.java | 4 + .../DeliveryVoucherRelationModel.java | 4 + .../views/scm/businessLineConfig/index.vue | 2 - .../jnpf-web/src/views/scm/classteam/form.vue | 1 - .../scm/purchaseCenter/deliveryOrder/form.vue | 258 ++++++++- .../purchaseInBoundNotice/form.vue | 1 - .../purchaseOrder/boundCheck.vue | 2 - .../purchaseOrder/boundLock.vue | 2 - .../scm/purchaseCenter/purchaseOrder/form.vue | 24 +- .../purchaseCenter/purchaseOrder/index.vue | 1 - .../purchaseOutBoundNotice/form.vue | 1 - .../purchaseCenter/receiptOrder/columnList.js | 537 +++++++++++++++++- .../scm/purchaseCenter/receiptOrder/form.vue | 254 ++++++++- .../scm/purchaseCenter/receiptOrder/index.vue | 4 +- .../purchaseCenter/returnCargoOrder/form.vue | 263 ++++++++- .../purchaseCenter/returnCargoOrder/index.vue | 4 +- .../scm/saleCenter/deliveryOrder/form.vue | 27 +- .../scm/saleCenter/receiptOrder/form.vue | 253 ++++++++- .../scm/saleCenter/returnCargoOrder/form.vue | 252 +++++++- .../scm/saleCenter/saleInBoundNotice/form.vue | 2 +- .../scm/saleCenter/saleOrder/boundCheck.vue | 2 - .../scm/saleCenter/saleOrder/boundLock.vue | 2 - .../views/scm/saleCenter/saleOrder/form.vue | 66 ++- .../views/scm/saleCenter/saleOrder/index.vue | 1 - .../saleCenter/saleOrder/redeliveryOrder.vue | 2 - .../saleCenter/saleOutBoundNotice/form.vue | 2 +- .../warehousing/warehousingstorage/index.vue | 2 - .../warehousingnotificationpurchase/form.vue | 1 - .../warehousingnotificationpurchase/index.vue | 1 - .../warehousingnotificationsale/form.vue | 1 - .../jnpf-web/src/views/scm/workorder/form.vue | 1 - 46 files changed, 2147 insertions(+), 170 deletions(-) diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml index 825ddafa..34fb4970 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml @@ -69,5 +69,68 @@ AND a.document_type = '2' + + + + + + diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/VoucherMapper.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/VoucherMapper.java index daccc521..6e93746f 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/VoucherMapper.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/VoucherMapper.java @@ -16,4 +16,7 @@ import java.util.List; public interface VoucherMapper extends BaseMapper { List querySaleDeliveryVoucher(); + List querySaleReceiptVoucher(); + List queryPurchaseReceiptVoucher(); + List queryPurchaseDeliveryVoucher(); } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/VoucherService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/VoucherService.java index d07a7920..6b1197fe 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/VoucherService.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/VoucherService.java @@ -43,4 +43,13 @@ public interface VoucherService extends IService { //查询销售发货凭证 List querySaleDeliveryVoucherInfo(); + //查询销售收货凭证 + List querySaleReceiptVoucherInfo(); + + //查询采购收货凭证 + List queryPurchaseReceiptVoucherInfo(); + + //查询采购发货凭证 + List queryPurchaseDeliveryVoucherInfo(); + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/DeliveryOrderServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/DeliveryOrderServiceImpl.java index 6f318915..3cc6decc 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/DeliveryOrderServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/DeliveryOrderServiceImpl.java @@ -428,17 +428,32 @@ public class DeliveryOrderServiceImpl extends ServiceImpl querySaleDeliveryVoucherInfo() { return voucherMapper.querySaleDeliveryVoucher(); } + + @Override + public List querySaleReceiptVoucherInfo() { + return voucherMapper.querySaleReceiptVoucher(); + } + + @Override + public List queryPurchaseReceiptVoucherInfo() { + return voucherMapper.queryPurchaseReceiptVoucher(); + } + + @Override + public List queryPurchaseDeliveryVoucherInfo() { + return voucherMapper.queryPurchaseDeliveryVoucher(); + } } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/ReturnCargoOrderController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/ReturnCargoOrderController.java index dac896f4..e986a541 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/ReturnCargoOrderController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/ReturnCargoOrderController.java @@ -557,7 +557,7 @@ public class ReturnCargoOrderController { * @return */ @Operation(summary = "获取销售退货列表") - @PostMapping("/getSaleReturnCargoList") + @GetMapping("/getSaleReturnCargoList") public ActionResult list()throws IOException{ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(ReturnCargoOrderEntity::getDocumentType,"2"); @@ -574,7 +574,7 @@ public class ReturnCargoOrderController { // returnCargoOrderMap.put("tableField144",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(deliveryProductRelationList))); // realList.add(returnCargoOrderMap); entity.setDeliveryVoucherRelationEntityList(deliveryVoucherRelationList); - entity.setDeliveryProductRelationEntityLisy(deliveryProductRelationList); + entity.setDeliveryProductRelationEntityList(deliveryProductRelationList); } //数据转换 @@ -592,7 +592,7 @@ public class ReturnCargoOrderController { * @return */ @Operation(summary = "获取采购退货列表") - @PostMapping("/getPurchaseReturnCargoList") + @GetMapping("/getPurchaseReturnCargoList") public ActionResult list1()throws IOException{ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(ReturnCargoOrderEntity::getDocumentType,"1"); @@ -609,7 +609,7 @@ public class ReturnCargoOrderController { // returnCargoOrderMap.put("tableField144",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(deliveryProductRelationList))); // realList.add(returnCargoOrderMap); entity.setDeliveryVoucherRelationEntityList(deliveryVoucherRelationList); - entity.setDeliveryProductRelationEntityLisy(deliveryProductRelationList); + entity.setDeliveryProductRelationEntityList(deliveryProductRelationList); } //数据转换 diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java index be38ae4e..65a09ee2 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java @@ -554,7 +554,7 @@ public class VoucherController { * @param * @return */ - @Operation(summary = "获取列表") + @Operation(summary = "获取销售发货凭证列表") @GetMapping("/getSaleDeliveryVoucherList") public ActionResult list()throws IOException{ //查询销售发货凭证 @@ -564,10 +564,105 @@ public class VoucherController { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(ProductWarehouseEntity::getId,entity.getProductId()); List productWarehouseEntity = productWarehouseService.list(queryWrapper); + for (ProductWarehouseEntity productEntity : productWarehouseEntity) { + productEntity.setUnit(entity.getUnit()); + productEntity.setGrossWeight(entity.getGrossWeight()); + productEntity.setTareWeight(entity.getTareWeight()); + productEntity.setBuckleWeight(entity.getBuckleWeight()); + productEntity.setNetWeight(entity.getNetWeight()); + } entity.setProductWarehouseEntityList(productWarehouseEntity); } } return ActionResult.success(list); } + /** + * 列表 + * + * @param + * @return + */ + @Operation(summary = "获取销售收货凭证列表") + @GetMapping("/getSaleReceiptVoucherList") + public ActionResult list1()throws IOException{ + //查询销售收货凭证 + List list= voucherService.querySaleReceiptVoucherInfo(); + for (VoucherEntity entity : list) { + if (StringUtil.isNotEmpty(entity.getProductId())){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(ProductWarehouseEntity::getId,entity.getProductId()); + List productWarehouseEntity = productWarehouseService.list(queryWrapper); + for (ProductWarehouseEntity productEntity : productWarehouseEntity) { + productEntity.setUnit(entity.getUnit()); + productEntity.setGrossWeight(entity.getGrossWeight()); + productEntity.setTareWeight(entity.getTareWeight()); + productEntity.setBuckleWeight(entity.getBuckleWeight()); + productEntity.setNetWeight(entity.getNetWeight()); + } + entity.setProductWarehouseEntityList(productWarehouseEntity); + } + } + return ActionResult.success(list); + } + + /** + * 列表 + * + * @param + * @return + */ + @Operation(summary = "获取采购收货凭证列表") + @GetMapping("/getPurchaseReceiptVoucherList") + public ActionResult list2()throws IOException{ + //查询采购收货凭证 + List list= voucherService.queryPurchaseReceiptVoucherInfo(); + for (VoucherEntity entity : list) { + if (StringUtil.isNotEmpty(entity.getProductId())){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(ProductWarehouseEntity::getId,entity.getProductId()); + List productWarehouseEntity = productWarehouseService.list(queryWrapper); + for (ProductWarehouseEntity productEntity : productWarehouseEntity) { + productEntity.setUnit(entity.getUnit()); + productEntity.setGrossWeight(entity.getGrossWeight()); + productEntity.setTareWeight(entity.getTareWeight()); + productEntity.setBuckleWeight(entity.getBuckleWeight()); + productEntity.setNetWeight(entity.getNetWeight()); + } + entity.setProductWarehouseEntityList(productWarehouseEntity); + } + } + return ActionResult.success(list); + } + + /** + * 列表 + * + * @param + * @return + */ + @Operation(summary = "获取采购发货凭证列表") + @GetMapping("/getPurchaseDeliveryVoucherList") + public ActionResult list3()throws IOException{ + //查询采购发货凭证 + List list= voucherService.queryPurchaseDeliveryVoucherInfo(); + for (VoucherEntity entity : list) { + if (StringUtil.isNotEmpty(entity.getProductId())){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(ProductWarehouseEntity::getId,entity.getProductId()); + List productWarehouseEntity = productWarehouseService.list(queryWrapper); + for (ProductWarehouseEntity productEntity : productWarehouseEntity) { + productEntity.setUnit(entity.getUnit()); + productEntity.setGrossWeight(entity.getGrossWeight()); + productEntity.setTareWeight(entity.getTareWeight()); + productEntity.setBuckleWeight(entity.getBuckleWeight()); + productEntity.setNetWeight(entity.getNetWeight()); + } + entity.setProductWarehouseEntityList(productWarehouseEntity); + } + } + return ActionResult.success(list); + } + + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductWarehouseEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductWarehouseEntity.java index 60e7e59a..53d5a9b3 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductWarehouseEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductWarehouseEntity.java @@ -2,6 +2,8 @@ package jnpf.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; + +import java.math.BigDecimal; import java.util.Date; /** * 商品表 @@ -216,4 +218,18 @@ public class ProductWarehouseEntity { private String flowId; @TableField("F_VERSION") private Integer version; + + /** + * 商品毛皮扣净 + */ + @TableField(exist = false) + private String unit; + @TableField(exist = false) + private BigDecimal grossWeight; + @TableField(exist = false) + private BigDecimal tareWeight; + @TableField(exist = false) + private BigDecimal buckleWeight; + @TableField(exist = false) + private BigDecimal netWeight; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ReturnCargoOrderEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ReturnCargoOrderEntity.java index f71d157f..9e0ed333 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ReturnCargoOrderEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ReturnCargoOrderEntity.java @@ -88,5 +88,5 @@ public class ReturnCargoOrderEntity { @TableField(exist = false) private List deliveryVoucherRelationEntityList; @TableField(exist = false) - private List deliveryProductRelationEntityLisy; + private List deliveryProductRelationEntityList; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/deliveryorder/DeliveryProductRelationModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/deliveryorder/DeliveryProductRelationModel.java index bdd95923..4fcee993 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/deliveryorder/DeliveryProductRelationModel.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/deliveryorder/DeliveryProductRelationModel.java @@ -80,4 +80,8 @@ public class DeliveryProductRelationModel { /** 备注 **/ @JSONField(name = "remark") private String remark; + + /** 业务类型 **/ + @JSONField(name = "businessType") + private String businessType; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/deliveryorder/DeliveryVoucherRelationModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/deliveryorder/DeliveryVoucherRelationModel.java index 499f5b4d..e32a56df 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/deliveryorder/DeliveryVoucherRelationModel.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/deliveryorder/DeliveryVoucherRelationModel.java @@ -63,4 +63,8 @@ public class DeliveryVoucherRelationModel { /** 备注 **/ @JSONField(name = "remark") private String remark; + + /** 业务类型 **/ + @JSONField(name = "businessType") + private String businessType; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/receiptorder/DeliveryProductRelationModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/receiptorder/DeliveryProductRelationModel.java index e65c981e..6dde9874 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/receiptorder/DeliveryProductRelationModel.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/receiptorder/DeliveryProductRelationModel.java @@ -80,4 +80,8 @@ public class DeliveryProductRelationModel { /** 备注 **/ @JSONField(name = "remark") private String remark; + + /** 业务类型 **/ + @JSONField(name = "businessType") + private String businessType; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/receiptorder/DeliveryVoucherRelationModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/receiptorder/DeliveryVoucherRelationModel.java index 62000fc9..9ff8c0e9 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/receiptorder/DeliveryVoucherRelationModel.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/receiptorder/DeliveryVoucherRelationModel.java @@ -63,4 +63,8 @@ public class DeliveryVoucherRelationModel { /** 备注 **/ @JSONField(name = "remark") private String remark; + + /** 业务类型 **/ + @JSONField(name = "businessType") + private String businessType; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/returncargoorder/DeliveryProductRelationModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/returncargoorder/DeliveryProductRelationModel.java index ed400fd6..9832ea39 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/returncargoorder/DeliveryProductRelationModel.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/returncargoorder/DeliveryProductRelationModel.java @@ -80,4 +80,8 @@ public class DeliveryProductRelationModel { /** 备注 **/ @JSONField(name = "remark") private String remark; + + /** 业务类型 **/ + @JSONField(name = "businessType") + private String businessType; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/returncargoorder/DeliveryVoucherRelationModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/returncargoorder/DeliveryVoucherRelationModel.java index 1b796824..590817bb 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/returncargoorder/DeliveryVoucherRelationModel.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/returncargoorder/DeliveryVoucherRelationModel.java @@ -63,4 +63,8 @@ public class DeliveryVoucherRelationModel { /** 备注 **/ @JSONField(name = "remark") private String remark; + + /** 业务类型 **/ + @JSONField(name = "businessType") + private String businessType; } diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/businessLineConfig/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/businessLineConfig/index.vue index 06900035..d17446a5 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/businessLineConfig/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/businessLineConfig/index.vue @@ -458,14 +458,12 @@ export default { } }, getUserIds(val, val2) { - debugger let data = { businessLineId: '', userIds: [] } data.businessLineId = this.treeActiveId data.userIds = val - debugger request({ url: `/api/scm/BusinessUserRelational/create`, method: 'post', diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/classteam/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/classteam/form.vue index 4428b59f..ff51fd59 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/classteam/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/classteam/form.vue @@ -462,7 +462,6 @@ export default { changeDataList(model, row) { this.dataForm.mobilePhone = row.mobilePhone this.dataForm.organize = row.organize - debugger }, changeData(model, index) { diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryOrder/form.vue index c830e25e..d791506f 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryOrder/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryOrder/form.vue @@ -55,12 +55,13 @@ - + popupWidth="800px" popupTitle="选择数据" popupType="dialog" + relationField='returnCargoCode' field='businessId' interfaceId="531493393713334021" + :pageSize="20" :columnOptions="businessIdcolumnOptions" clearable + :style='{"width":"100%"}'> @@ -77,6 +78,213 @@ + + +
+

+
+ + + + + + + + + + @@ -84,12 +292,12 @@ - + @@ -180,14 +388,14 @@ - + @@ -235,17 +235,17 @@ - - + - + @@ -262,7 +262,7 @@ - - - - - + - + diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/form.vue index 3bc608fb..a3664b14 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/form.vue @@ -55,12 +55,12 @@ - - + @@ -78,6 +78,213 @@ + + +
+

+
+ + + + + + + + + + @@ -85,20 +292,20 @@ - + - - @@ -134,11 +341,11 @@ - - + - + diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue index b4eb0cc1..bb128512 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue @@ -386,14 +386,13 @@ v-if="judgeRequired('deliveryvoucherrelationList-voucherId')">*凭证编号 -
添加 -
+ --> @@ -1155,7 +1154,7 @@ export default { enterpriseIdcolumnOptions: [{ "label": "机构编码", "value": "f_en_code" }, { "label": "机构名称", "value": "f_full_name" },], warehouseIdcolumnOptions: [{ "label": "仓库编码", "value": "code" }, { "label": "仓库名称", "value": "name" },], shippingAddresscolumnOptions: [{ "label": "业务类型", "value": "address_type" }, { "label": "国家", "value": "country" }, { "label": "详细地址", "value": "addressDetail" },], - deliveryvoucherrelationvoucherIdcolumnOptions: [{ "label": "凭证编号", "value": "voucher_code" }, { "label": "单据类型", "value": "document_type" }, { "label": "磅单编号", "value": "pound_code" },], + deliveryvoucherrelationvoucherIdcolumnOptions: [{ "label": "凭证编号", "value": "voucherCode" }, { "label": "单据类型", "value": "documentType" }, { "label": "磅单编号", "value": "poundCode" },], deliveryvoucherrelationdocumentTypeOptions: [{ "fullName": "收货凭证", "id": "1" }, { "fullName": "发货凭证", "id": "2" }], deliveryvoucherrelationdocumentTypeProps: { "label": "fullName", "value": "id" }, deliveryvoucherrelationvoucherTypeOptions: [{ "fullName": "磅单", "id": "1" }, { "fullName": "收据", "id": "2" }, { "fullName": "其他", "id": "3" }], @@ -1231,10 +1230,21 @@ export default { }, mounted() { }, methods: { + getSaleDeliveryVoucher(val, val2) { + val2.voucherId = val2.id + val2.businessType = "4" + this.dataForm.deliveryVoucherRelationList.push(val2) + this.dataForm.deliveryVoucherRelationList.splice(0, 1) + val2.productWarehouseEntityList.forEach((item, index) => { + item.productId = item.id + item.businessType = "4" + }) + this.dataForm.deliveryProductRelationList.push(val2.productWarehouseEntityList[0]) + }, getSaleOrder(val, val2) { - debugger + this.dataForm.saleOrderInfo = [] this.dataForm.saleOrderInfo[0] = val2 - this.dataForm.subjectBasicId = val2.firstSubjectBasicId + this.dataForm.subjectId = val2.firstSubjectBasicId this.dataForm.deliveryAddress = val2.receiveAddress this.dataForm.enterpriseId = val2.enterpriseId this.dataForm.warehouseId = val2.deliveryWarehouse @@ -1243,6 +1253,7 @@ export default { item.productName = item.name item.purchaseUnitId = item.salesMainUnitId item.purchaseNum = item.businessNum + item.businessType = "4" }) this.dataForm.deliveryProductRelationList = val2.businessOrderProductRelationalList }, diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptOrder/form.vue index 2206ac75..e8e41f28 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptOrder/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptOrder/form.vue @@ -55,12 +55,13 @@ - + popupWidth="800px" popupTitle="选择数据" popupType="dialog" + relationField='returnCargoCode' field='businessId' interfaceId="531492712415758085" + :pageSize="20" :columnOptions="businessIdcolumnOptions" clearable + :style='{"width":"100%"}'> @@ -77,6 +78,213 @@ + + +
+

+
+ + + + + + + + + + @@ -179,15 +387,14 @@ v-if="judgeRequired('deliveryvoucherrelationList-voucherId')">*凭证编号 @@ -662,7 +680,7 @@ @change="changeData('businessorderproductrelational-businessPrice',scope.$index)" placeholder="请输入" :disabled="judgeWrite('businessorderproductrelationalList')||judgeWrite('businessorderproductrelationalList-businessPrice')" - addonAfter="吨" clearable :style='{"width":"100%"}'> + clearable :style='{"width":"100%"}'> @@ -877,7 +895,7 @@ @change="changeData('businessorderproductrelational-businessNum',scope.$index)" placeholder="请输入" :disabled="judgeWrite('businessorderproductrelationalList')||judgeWrite('businessorderproductrelationalList-businessNum')" - addonAfter="吨" clearable :style='{"width":"100%"}'> + clearable :style='{"width":"100%"}'> @@ -893,7 +911,7 @@ @change="changeData('businessorderproductrelational-businessPrice',scope.$index)" placeholder="请输入" :disabled="judgeWrite('businessorderproductrelationalList')||judgeWrite('businessorderproductrelationalList-businessPrice')" - addonAfter="吨" clearable :style='{"width":"100%"}'> + clearable :style='{"width":"100%"}'> @@ -1102,14 +1120,14 @@ export default { Vmodel: "", currVmodel: "", dataForm: { - orderType: "1", + orderType: "2", code: undefined, businessLineId: undefined, counterpartOrderCode: undefined, urgentOrder: "1", expectArriveDateStart: undefined, createOrderDate: undefined, - deliveryType: undefined, + deliveryType: "1", contractId: undefined, currency: undefined, saleMode: undefined, @@ -1359,24 +1377,24 @@ export default { mounted() { }, methods: { productInfo(val, val2) { - debugger // this.dataForm.businessOrderProductRelationalList = [] this.dataForm.businessOrderProductRelationalList.push(val2) this.dataForm.businessOrderProductRelationalList.splice(0, 1) }, productInfo2(val, val2) { - debugger // this.dataForm.businessOrderProductRelationalList = [] this.dataForm.businessOrderProductRelationalList.push(val2) this.dataForm.businessOrderProductRelationalList.splice(0, 1) }, contractInfo(val, val2) { + debugger this.dataForm.contractList = [] this.dataForm.contractList[0] = val2 this.dataForm.firstSubjectBasicId = val2.customName this.dataForm.enterpriseId = val2.enterpriseName this.dataForm.receiveAddress = val2.delivery_location this.dataForm.transportMode = val2.mode_transport + this.dataForm.transactionMode = val2.delivery_method }, getCustomName(val, val2) { this.dataForm.settlementInfoList = []; diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue index f2a4d2df..45758fb5 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue @@ -548,7 +548,6 @@ export default { return } const data = this.multipleSelectionItem - debugger this.boundCheckVisible = true this.$nextTick(() => { this.$refs.BoundCheck.init(data) diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/redeliveryOrder.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/redeliveryOrder.vue index c7bc9b42..ccb7da12 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/redeliveryOrder.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/redeliveryOrder.vue @@ -675,12 +675,10 @@ export default { }, init(data) { - debugger this.dataForm.deliveryWarehouse = data[0].deliveryWarehouse; this.dataForm.orderNum = data.length let list = [] data.forEach((item, index) => { - debugger console.log("2", item.businessOrderProductRelationalList); this.dataForm.redeliveryoriginalorderrelationList.push(item) this.dataForm.redeliveryproductrelationList = [...item.businessOrderProductRelationalList, ...this.dataForm.redeliveryproductrelationList] diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOutBoundNotice/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOutBoundNotice/form.vue index 40bfd806..8adf5166 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOutBoundNotice/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOutBoundNotice/form.vue @@ -728,7 +728,7 @@ export default { mounted() { }, methods: { getSaleOrder(val, val2) { - debugger + this.dataForm.saleOrderInfo = [] this.dataForm.saleOrderInfo[0] = val2 this.dataForm.subjectBasicId = val2.firstSubjectBasicId this.dataForm.shippingAddress = val2.receiveAddress diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/index.vue index a1d9dc21..ba32866d 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/index.vue @@ -614,8 +614,6 @@ export default { flowId: item.id, opType: '-1' } - // debugger - // console.log(item.id); this.flowListVisible = false this.flowVisible = true this.$nextTick(() => { diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/form.vue index c5e2c0d0..782d22b0 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/form.vue @@ -728,7 +728,6 @@ export default { mounted() { }, methods: { getSaleOrder(val, val2) { - debugger this.dataForm.saleOrderInfo[0] = val2 this.dataForm.subjectBasicId = val2.firstSubjectBasicId this.dataForm.shippingAddress = val2.receiveAddress diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/index.vue index 269b7620..2cfa99bf 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/index.vue @@ -247,7 +247,6 @@ export default { // this.multipleSelectionItem.warehousingId = this.multipleSelectionItem.id // console.log(this.multipleSelectionItem); - // debugger this.flowListVisible = true this.$nextTick(() => { this.$refs.purRouter.init(data) diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationsale/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationsale/form.vue index b3313b19..7218ea72 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationsale/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationsale/form.vue @@ -728,7 +728,6 @@ export default { mounted() { }, methods: { getSaleOrder(val, val2) { - debugger this.dataForm.saleOrderInfo[0] = val2 this.dataForm.subjectBasicId = val2.first_subject_basic_id this.dataForm.shippingAddress = val2.receiveAddress diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/workorder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/workorder/form.vue index 89a84224..40ec8ad9 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/workorder/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/workorder/form.vue @@ -628,7 +628,6 @@ export default { mounted() { }, methods: { changeDataProductList(model, row) { - debugger this.dataForm.spec = row.spec this.dataForm.inventoryType = row.inventory_types this.dataForm.inventoryUnitIds = row.inventory_unit_ids From 70c9328dfe2f43e7e38c8ba4d662a79de717980b Mon Sep 17 00:00:00 2001 From: vayne Date: Mon, 26 Feb 2024 19:15:12 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=90=88=E5=90=8C=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/scm/BusinessOrderMapper.xml | 45 ++++++++++++++++++- .../java/jnpf/mapper/BusinessOrderMapper.java | 4 ++ .../jnpf/service/BusinessOrderService.java | 3 ++ .../impl/BusinessOrderServiceImpl.java | 11 +++++ .../controller/BusinessOrderController.java | 22 +++++++++ .../java/jnpf/entity/ContractLEntity.java | 14 ++++++ .../views/scm/saleCenter/saleOrder/form.vue | 26 ++++++++--- 7 files changed, 119 insertions(+), 6 deletions(-) diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml index f9f8918a..25c3ed2f 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml @@ -2,6 +2,49 @@ - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessOrderMapper.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessOrderMapper.java index e33844e9..e608dc50 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessOrderMapper.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessOrderMapper.java @@ -3,6 +3,9 @@ package jnpf.mapper; import jnpf.entity.BusinessOrderEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jnpf.entity.ContractLEntity; + +import java.util.List; /** * businessOrder @@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface BusinessOrderMapper extends BaseMapper { + List querySaleContract(); } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessOrderService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessOrderService.java index 8fd24bcc..07b6afed 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessOrderService.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessOrderService.java @@ -40,4 +40,7 @@ public interface BusinessOrderService extends IService { void saveOrUpdate(BusinessOrderForm businessOrderForm,String id, boolean isSave) throws Exception; + //查询销售合同 + List querySaleContractInfo(); + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java index 874f4b34..fcf4eeb2 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java @@ -30,6 +30,9 @@ import jnpf.util.*; import java.util.*; import jnpf.base.UserInfo; import jnpf.permission.entity.UserEntity; + +import javax.annotation.Resource; + /** * * businessOrder @@ -50,6 +53,9 @@ public class BusinessOrderServiceImpl extends ServiceImpl getList(BusinessOrderPagination businessOrderPagination){ return getTypeList(businessOrderPagination,businessOrderPagination.getDataType()); @@ -577,4 +583,9 @@ public class BusinessOrderServiceImpl extends ServiceImpl querySaleContractInfo() { + return businessOrderMapper.querySaleContract(); + } } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java index a90385a4..66deded6 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java @@ -80,6 +80,9 @@ public class BusinessOrderController { @Autowired private ConfigValueUtil configValueUtil; + @Autowired + private ContractLCommodityService contractLCommodityService; + /** * 列表 * @@ -619,4 +622,23 @@ public class BusinessOrderController { // realList = generaterSwapUtil.swapDataList(realList, BusinessOrderConstant.getFormData(), BusinessOrderConstant.getColumnData(), "522690032352364805",false); return ActionResult.success(businessOrderEntityList); } + + + /** + * 列表 + * + * @return + */ + @Operation(summary = "获取销售合同列表") + @GetMapping("/getSaleContractList") + public ActionResult list2()throws IOException{ + List list= businessOrderService.querySaleContractInfo(); + for (ContractLEntity entity : list){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(ContractLCommodityEntity::getContractId,entity.getId()); + List commodityList = contractLCommodityService.list(queryWrapper); + entity.setContractLCommodityEntityList(commodityList); + } + return ActionResult.success(list); + } } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLEntity.java index 1b1591da..73ceab21 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLEntity.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.util.Date; import java.math.BigDecimal; +import java.util.List; + /** * 合同信息表 * @@ -121,4 +123,16 @@ public class ContractLEntity { private String flowId; @TableField("F_VERSION") private Integer version; + + + @TableField(exist = false) + private String firstCustomName; + @TableField(exist = false) + private String enterpriseName; + @TableField(exist = false) + private String saleCode; + @TableField(exist = false) + private String secondCustomName; + @TableField(exist = false) + private List contractLCommodityEntityList; } diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue index 1b97e0c4..35cf7d8d 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue @@ -106,7 +106,7 @@ :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.contractId" placeholder="请选择" propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='contract_name' field='contractId' - interfaceId="523139566396246597" :pageSize="20" + interfaceId="531872211288459717" :pageSize="20" :columnOptions="contractIdcolumnOptions" clearable :style='{"width":"100%"}'> @@ -144,6 +144,22 @@ + + + + + + + + @@ -700,22 +742,22 @@ - @@ -727,34 +769,14 @@ v-if="judgeRequired('contractlcommodityList-commodityName')">*商品名称 - - + @@ -1012,7 +1034,7 @@ + :precision="2" addonAfter="元" :step="1"> @@ -1042,6 +1064,23 @@ + + + + + + + + + + + + { }) }, + getProductInfoChg(index) { + let interfaceId = "530288111456878597" + let query = { + ...this.listQuery + } + if (this.dataForm.contractLCommodityList[index]) { + getDataInterfaceDataSelect(interfaceId, query).then(res => { + if (res.code == 200) { + let productInfo = res.data.list.filter(o1 => { + return o1.code == this.dataForm.contractLCommodityList[index]['commodityCode'] + })[0] + this.dataForm.contractLCommodityList[index]['commodityName'] = productInfo.name + this.dataForm.contractLCommodityList[index]['specifications'] = productInfo.spec + this.dataForm.contractLCommodityList[index]['inventoryUnit'] = productInfo.inventory_unit_id + this.dataForm.contractLCommodityList[index]['procureUnit'] = productInfo.order_main_unit_id + } + }).catch(() => { }) + } + }, changeData(model, index) { + if (model == 'contractlcommodity-commodityCode') { + this.getProductInfoChg(index) + } this.isEdit = false this.childIndex = index let modelAll = model.split("-"); @@ -1802,8 +1881,8 @@ export default { }, addcontractLCommodityList() { let item = { - commodityName: '', - commodityCode: undefined, + commodityCode: '', + commodityName: undefined, specifications: undefined, inventoryUnit: undefined, procureUnit: '', diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/contractL/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/contractL/index.vue index c6dd6d7f..f5bbc0c2 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/contractL/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/contractL/index.vue @@ -10,23 +10,24 @@
- - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + 查询 @@ -38,608 +39,677 @@
- 新增 - - 导出 - - 批量删除 - + 新增 + + 导出 + + 批量删除 +
- - - - - - + + + + + +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -
+ +
- - + + - + -
- {{ item.fullName }} +
{{item.fullName}}
- + - +
From de4baa2c54a108d4e7481947aaa8ae440484e10d Mon Sep 17 00:00:00 2001 From: mhsnet Date: Tue, 27 Feb 2024 14:16:22 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=90=88=E5=90=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jnpf-web/src/views/scm/contractL/form.vue | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/contractL/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/contractL/form.vue index d6679c89..76bb1451 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/contractL/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/contractL/form.vue @@ -799,12 +799,20 @@ v-if="judgeRequired('contractlcommodityList-inventoryUnit')">*库存单位 @@ -1455,8 +1463,10 @@ export default { contractlpriceformulapriceFormulaTypeOptions: [], contractlpriceformulapriceFormulaTypeProps: { "label": "fullName", "value": "enCode" }, contractlcommoditycommodityCodecolumnOptions: [{ "label": "商品编码", "value": "code" }, { "label": "商品名称", "value": "name" }, { "label": "商品规格", "value": "spec" }, { "label": "库存单位", "value": "inventory_unit_name" }, { "label": "采购单位", "value": "order_main_unit_name" }, { "label": "销售单位", "value": "sales_main_unit_name" },], - contractlcommodityprocureUnitOptions: [{ "fullName": "选项一", "id": "1" }, { "fullName": "选项二", "id": "2" }], + contractlcommodityprocureUnitOptions: [], contractlcommodityprocureUnitProps: { "label": "fullName", "value": "id" }, + contractlcommodityinventoryUnitOptions: [], + contractlcommodityinventoryUnitProps: { "label": "fullName", "value": "id" }, contractlfeeclausefeeTypeOptions: [], contractlfeeclausefeeTypeProps: { "label": "fullName", "value": "enCode" }, contractlpaymentpaymentNodeOptions: [], @@ -1611,7 +1621,12 @@ export default { this.dataForm.contractLCommodityList[index]['commodityName'] = productInfo.name this.dataForm.contractLCommodityList[index]['specifications'] = productInfo.spec this.dataForm.contractLCommodityList[index]['inventoryUnit'] = productInfo.inventory_unit_id - this.dataForm.contractLCommodityList[index]['procureUnit'] = productInfo.order_main_unit_id + this.contractlcommodityinventoryUnitOptions = [{ "fullName": productInfo.inventory_unit_name, "id": productInfo.inventory_unit_id }] + let procureUnitOptionsArr = [] + for (let i = 0; i < JSON.parse(productInfo.order_main_unit_id).length; i++) { + procureUnitOptionsArr.push({ "fullName": JSON.parse(productInfo.order_main_unit_name)[i], "id": JSON.parse(productInfo.order_main_unit_id)[i] }) + } + this.contractlcommodityprocureUnitOptions = procureUnitOptionsArr } }).catch(() => { }) } From e33108d1dd1df04db338c2aa87cfa5ec8cb75c46 Mon Sep 17 00:00:00 2001 From: vayne Date: Tue, 27 Feb 2024 14:38:12 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=92=8C=E9=94=80?= =?UTF-8?q?=E5=94=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/scm/BusinessOrderMapper.xml | 33 ++- .../java/jnpf/mapper/BusinessOrderMapper.java | 2 + .../jnpf/service/BusinessOrderService.java | 3 + .../impl/BusinessOrderServiceImpl.java | 5 + .../WarehousingNotificationServiceImpl.java | 64 ++++- .../controller/BusinessOrderController.java | 57 +++- .../WarehousingNotificationController.java | 249 +++++++++++++++++- .../java/jnpf/entity/BusinessOrderEntity.java | 8 + .../java/jnpf/entity/ContractLEntity.java | 8 +- .../purchaseInBoundNotice/form.vue | 225 +++++++--------- .../scm/purchaseCenter/purchaseOrder/form.vue | 150 ++++++++++- .../purchaseOutBoundNotice/form.vue | 215 +++++++-------- .../scm/purchaseCenter/receiptOrder/form.vue | 189 ++++++------- .../purchaseCenter/returnCargoOrder/form.vue | 189 ++++++------- .../scm/saleCenter/deliveryOrder/form.vue | 194 ++++++-------- .../scm/saleCenter/returnCargoOrder/form.vue | 168 +++++------- .../scm/saleCenter/saleInBoundNotice/form.vue | 177 ++++++------- .../views/scm/saleCenter/saleOrder/form.vue | 102 ++++++- .../saleCenter/saleOutBoundNotice/form.vue | 179 ++++++------- 19 files changed, 1286 insertions(+), 931 deletions(-) diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml index 907395f3..e27fdff1 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml @@ -22,7 +22,7 @@ - + @@ -33,7 +33,7 @@ a.*, b.name AS firstCustomName, c.f_full_name AS enterpriseName, - d.code AS saleCode, + d.contract_name AS relatedContractName, e.name AS secondCustomName FROM jg_contract a @@ -41,12 +41,37 @@ AND b.f_delete_mark IS NULL LEFT JOIN base_organize c ON a.dept_id = c.f_id AND c.f_delete_mark IS NULL - LEFT JOIN jg_business_order d ON a.related_contract_id = d.id + LEFT JOIN jg_contract d ON a.related_contract_id = d.id AND d.f_delete_mark IS NULL LEFT JOIN jg_subject_basic e ON a.subject2 = e.id AND e.f_delete_mark IS NULL WHERE - contract_type = '2' + a.contract_type = '2' + AND a.f_delete_mark IS NULL + + + diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessOrderMapper.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessOrderMapper.java index e608dc50..35e62733 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessOrderMapper.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessOrderMapper.java @@ -17,4 +17,6 @@ import java.util.List; public interface BusinessOrderMapper extends BaseMapper { List querySaleContract(); + + List queryPurchaseContract(); } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessOrderService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessOrderService.java index 07b6afed..7fe99d84 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessOrderService.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessOrderService.java @@ -43,4 +43,7 @@ public interface BusinessOrderService extends IService { //查询销售合同 List querySaleContractInfo(); + //查询采购合同 + List queryPurchaseContractInfo(); + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java index fcf4eeb2..e824eaeb 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java @@ -588,4 +588,9 @@ public class BusinessOrderServiceImpl extends ServiceImpl querySaleContractInfo() { return businessOrderMapper.querySaleContract(); } + + @Override + public List queryPurchaseContractInfo() { + return businessOrderMapper.queryPurchaseContract(); + } } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingNotificationServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingNotificationServiceImpl.java index bc0bb3f1..c812e59f 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingNotificationServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingNotificationServiceImpl.java @@ -342,17 +342,59 @@ public class WarehousingNotificationServiceImpl extends ServiceImpl businessOrderEntityList = businessOrderService.list(businessOrderQueryWrapper); // List> realList=new ArrayList<>(); for (BusinessOrderEntity entity: businessOrderEntityList) { - Map businessOrderMap=JsonUtil.entityToMap(entity); - businessOrderMap.put("id", businessOrderMap.get("id")); + if (StringUtil.isNotEmpty(entity.getSecondSubjectBasicId())){ + SubjectbasicEntity subjectbasicEntity = subjectbasicService.getInfo(entity.getSecondSubjectBasicId()); + if (subjectbasicEntity != null) { + entity.setSecondCustomName(subjectbasicEntity.getName()); + } + } + if (StringUtil.isNotEmpty(entity.getBusinessLineId())){ + BusinessLineEntity businessLineEntity = businessLineService.getInfo(entity.getBusinessLineId()); + if (businessLineEntity != null){ + entity.setBusinessLineName(businessLineEntity.getName()); + } + } //副表数据 //子表数据 List settlementInfoList = businessOrderService.getSettlementInfoList(entity.getId()); @@ -606,8 +621,24 @@ public class BusinessOrderController { List businessOrderEntityList = businessOrderService.list(businessOrderQueryWrapper); // List> realList=new ArrayList<>(); for (BusinessOrderEntity entity: businessOrderEntityList) { - Map businessOrderMap=JsonUtil.entityToMap(entity); - businessOrderMap.put("id", businessOrderMap.get("id")); + if (StringUtil.isNotEmpty(entity.getSecondSubjectBasicId())){ + SubjectbasicEntity subjectbasicEntity = subjectbasicService.getInfo(entity.getSecondSubjectBasicId()); + if (subjectbasicEntity != null) { + entity.setSecondSupplyName(subjectbasicEntity.getName()); + } + } + if (StringUtil.isNotEmpty(entity.getThirdSubjectBasicId())){ + SubjectbasicEntity subjectbasicEntity = subjectbasicService.getInfo(entity.getThirdSubjectBasicId()); + if (subjectbasicEntity != null) { + entity.setThirdSupplyName(subjectbasicEntity.getName()); + } + } + if (StringUtil.isNotEmpty(entity.getBusinessLineId())){ + BusinessLineEntity businessLineEntity = businessLineService.getInfo(entity.getBusinessLineId()); + if (businessLineEntity != null){ + entity.setBusinessLineName(businessLineEntity.getName()); + } + } //副表数据 //子表数据 List settlementInfoList = businessOrderService.getSettlementInfoList(entity.getId()); @@ -641,4 +672,22 @@ public class BusinessOrderController { } return ActionResult.success(list); } + + /** + * 列表 + * + * @return + */ + @Operation(summary = "获取采购合同列表") + @GetMapping("/getPurchaseContractList") + public ActionResult list3()throws IOException{ + List list= businessOrderService.queryPurchaseContractInfo(); + for (ContractLEntity entity : list){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(ContractLCommodityEntity::getContractId,entity.getId()); + List commodityList = contractLCommodityService.list(queryWrapper); + entity.setContractLCommodityEntityList(commodityList); + } + return ActionResult.success(list); + } } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java index c2ff053c..c3a2a92d 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java @@ -27,6 +27,26 @@ import java.io.IOException; import java.util.stream.Collectors; import jnpf.engine.entity.FlowTaskEntity; import jnpf.exception.WorkFlowException; +import org.springframework.web.multipart.MultipartFile; +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.ExcelImportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; +import cn.afterturn.easypoi.excel.entity.ImportParams; +import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; +import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.Workbook; +import java.io.File; +import jnpf.onlinedev.model.ExcelImFieldModel; +import jnpf.onlinedev.model.OnlineImport.ImportDataModel; +import jnpf.onlinedev.model.OnlineImport.ImportFormCheckUniqueModel; +import jnpf.onlinedev.model.OnlineImport.ExcelImportModel; +import jnpf.onlinedev.model.OnlineImport.VisualImportModel; +import cn.xuyanwu.spring.file.storage.FileInfo; +import lombok.Cleanup; +import jnpf.model.visualJson.config.HeaderModel; +import jnpf.base.model.ColumnDataModel; +import jnpf.base.util.VisualUtils; import org.springframework.transaction.annotation.Transactional; /** @@ -34,7 +54,7 @@ import org.springframework.transaction.annotation.Transactional; * @版本： V3.5 * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @作者： JNPF开发平台组 - * @日期： 2024-02-20 + * @日期： 2024-02-19 */ @Slf4j @RestController @@ -51,7 +71,12 @@ public class WarehousingNotificationController { @Autowired private WarehousingNotificationService warehousingNotificationService; + @Autowired + private WarehousingProductService warehousingProductService; + + @Autowired + private ConfigValueUtil configValueUtil; /** * 列表 @@ -69,6 +94,8 @@ public class WarehousingNotificationController { warehousingNotificationMap.put("id", warehousingNotificationMap.get("id")); //副表数据 //子表数据 + List warehousingProductList = warehousingNotificationService.getWarehousingProductList(entity.getId(),warehousingNotificationPagination); + warehousingNotificationMap.put("tableField121",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(warehousingProductList))); realList.add(warehousingNotificationMap); } //数据转换 @@ -122,6 +149,223 @@ public class WarehousingNotificationController { return ActionResult.success("创建成功"); } /** + * 导出Excel + * + * @return + */ + @Operation(summary = "导出Excel") + @PostMapping("/Actions/Export") + public ActionResult Export(@RequestBody WarehousingNotificationPagination warehousingNotificationPagination) throws IOException { + if (StringUtil.isEmpty(warehousingNotificationPagination.getSelectKey())){ + return ActionResult.fail("请选择导出字段"); + } + List list= warehousingNotificationService.getList(warehousingNotificationPagination); + List> realList=new ArrayList<>(); + for (WarehousingNotificationEntity entity : list) { + Map warehousingNotificationMap=JsonUtil.entityToMap(entity); + warehousingNotificationMap.put("id", warehousingNotificationMap.get("id")); + //副表数据 + //子表数据 + List warehousingProductList = warehousingNotificationService.getWarehousingProductList(entity.getId(),warehousingNotificationPagination); + warehousingNotificationMap.put("tableField121",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(warehousingProductList))); + realList.add(warehousingNotificationMap); + } + //数据转换 + realList = generaterSwapUtil.swapDataList(realList, WarehousingNotificationConstant.getFormData(), WarehousingNotificationConstant.getColumnData(), warehousingNotificationPagination.getModuleId(),false); + String[]keys=!StringUtil.isEmpty(warehousingNotificationPagination.getSelectKey())?warehousingNotificationPagination.getSelectKey():new String[0]; + UserInfo userInfo=userProvider.get(); + DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),realList,keys,userInfo); + return ActionResult.success(vo); + } + + /** + * 导出表格方法 + */ + public DownloadVO creatModelExcel(String path,List>list,String[]keys,UserInfo userInfo){ + DownloadVO vo=DownloadVO.builder().build(); + List entitys=new ArrayList<>(); + if(keys.length>0){ + ExcelExportEntity tableField121ExcelEntity = new ExcelExportEntity("","tableField121"); + List tableField121List = new ArrayList<>(); + for(String key:keys){ + switch(key){ + case "warehousingType" : + entitys.add(new ExcelExportEntity("" ,"warehousingType")); + break; + case "warehousingCode" : + entitys.add(new ExcelExportEntity("通知编号" ,"warehousingCode")); + break; + case "preparationTime" : + entitys.add(new ExcelExportEntity("制单时间" ,"preparationTime")); + break; + case "businessId" : + entitys.add(new ExcelExportEntity("销售订单" ,"businessId")); + break; + case "subjectBasicId" : + entitys.add(new ExcelExportEntity("客户名称" ,"subjectBasicId")); + break; + case "shippingAddress" : + entitys.add(new ExcelExportEntity("收货地址" ,"shippingAddress")); + break; + case "enterpriseId" : + entitys.add(new ExcelExportEntity("机构名称" ,"enterpriseId")); + break; + case "warehouseId" : + entitys.add(new ExcelExportEntity("发货仓库" ,"warehouseId")); + break; + case "deliveryAddress" : + entitys.add(new ExcelExportEntity("发货地址" ,"deliveryAddress")); + break; + case "remark" : + entitys.add(new ExcelExportEntity("备注" ,"remark")); + break; + case "tableField121-productName": + tableField121List.add(new ExcelExportEntity("商品名称" ,"productName")); + break; + case "tableField121-spec": + tableField121List.add(new ExcelExportEntity("规格" ,"spec")); + break; + case "tableField121-inventoryUnitId": + tableField121List.add(new ExcelExportEntity("库存单位" ,"inventoryUnitId")); + break; + case "tableField121-purchaseUnitId": + tableField121List.add(new ExcelExportEntity("销售单位" ,"purchaseUnitId")); + break; + case "tableField121-purchaseNum": + tableField121List.add(new ExcelExportEntity("销售数量" ,"purchaseNum")); + break; + case "tableField121-storageAreaId": + tableField121List.add(new ExcelExportEntity("出库货区" ,"storageAreaId")); + break; + case "tableField121-warehousingUnitId": + tableField121List.add(new ExcelExportEntity("出库单位" ,"warehousingUnitId")); + break; + case "tableField121-barCode": + tableField121List.add(new ExcelExportEntity("包装条码" ,"barCode")); + break; + case "tableField121-notificationStorageNumber": + tableField121List.add(new ExcelExportEntity("通知出库数量" ,"notificationStorageNumber")); + break; + case "tableField121-volume": + tableField121List.add(new ExcelExportEntity("体积" ,"volume")); + break; + case "tableField121-batchNo": + tableField121List.add(new ExcelExportEntity("批次号" ,"batchNo")); + break; + case "tableField121-produceDate": + tableField121List.add(new ExcelExportEntity("生产日期" ,"produceDate")); + break; + case "tableField121-remark": + tableField121List.add(new ExcelExportEntity("备注" ,"remark")); + break; + default: + break; + } + } + if(tableField121List.size() > 0){ + tableField121ExcelEntity.setList(tableField121List); + entitys.add(tableField121ExcelEntity); + } + } + + ExportParams exportParams = new ExportParams(null, "表单信息"); + exportParams.setType(ExcelType.XSSF); + try{ + @Cleanup Workbook workbook = new HSSFWorkbook(); + if (entitys.size()>0){ + if (list.size()==0){ + list.add(new HashMap<>()); + } + //去除空数据 + List> dataList = new ArrayList<>(); + for (Map map : list) { + int i = 0; + for (String key : keys) { + //子表 + if (key.toLowerCase().startsWith("tablefield")) { + String tableField = key.substring(0, key.indexOf("-" )); + String field = key.substring(key.indexOf("-" ) + 1); + Object o = map.get(tableField); + if (o != null) { + List> childList = (List>) o; + for (Map childMap : childList) { + if (childMap.get(field) != null) { + i++; + } + } + } + } else { + Object o = map.get(key); + if (o != null) { + i++; + } + } + } + if (i > 0) { + dataList.add(map); + } + } + //复杂表头-表头和数据处理 + ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(WarehousingNotificationConstant.getColumnData(), ColumnDataModel.class); + List complexHeaderList = columnDataModel.getComplexHeaderList(); + if (!Objects.equals(columnDataModel.getType(), 3) && !Objects.equals(columnDataModel.getType(), 5)) { + entitys = VisualUtils.complexHeaderHandel(entitys, complexHeaderList); + dataList = VisualUtils.complexHeaderDataHandel(dataList, complexHeaderList); + } + + workbook = ExcelExportUtil.exportExcel(exportParams, entitys, dataList); + } + String fileName = "表单信息" + DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + ".xlsx"; + MultipartFile multipartFile = ExcelUtil.workbookToCommonsMultipartFile(workbook, fileName); + String temporaryFilePath = configValueUtil.getTemporaryFilePath(); + FileInfo fileInfo = FileUploadUtils.uploadFile(multipartFile, temporaryFilePath, fileName); + vo.setName(fileInfo.getFilename()); + vo.setUrl(UploaderUtil.uploaderFile(fileInfo.getFilename() + "#" + "Temporary") + "&name=" + fileName); + } catch (Exception e) { + log.error("信息导出Excel错误:{}", e.getMessage()); + e.printStackTrace(); + } + return vo; + } + /** + * 批量删除 + * @param ids + * @return + */ + @DeleteMapping("/batchRemove") + @Transactional + @Operation(summary = "批量删除") + public ActionResult batchRemove(@RequestBody String ids){ + List idList = JsonUtil.getJsonToList(ids, String.class); + List columnIdList = new ArrayList<>(20); + int i =0; + String errInfo = ""; + for (String allId : idList){ + FlowTaskEntity taskEntity = generaterSwapUtil.getInfoSubmit(allId, FlowTaskEntity::getId, FlowTaskEntity::getStatus); + if (taskEntity==null){ + columnIdList.add(allId); + this.delete(allId); + }else if (taskEntity.getStatus().equals(0) || taskEntity.getStatus().equals(4)){ + try { + generaterSwapUtil.deleteFlowTask(taskEntity); + columnIdList.add(allId); + this.delete(allId); + i++; + } catch (WorkFlowException e) { + errInfo = e.getMessage(); + e.printStackTrace(); + } + } + } + if (i == 0 && columnIdList.size()==0){ + return ActionResult.fail("流程已发起，无法删除"); + } + if (StringUtil.isNotEmpty(errInfo)){ + return ActionResult.fail(errInfo); + } + return ActionResult.success("删除成功"); + } + /** * 编辑 * @param id * @param warehousingNotificationForm @@ -203,7 +447,6 @@ public class WarehousingNotificationController { }else if(entity.getWarehousingType().equals("7")){ warehousingNotificationMap = generaterSwapUtil.swapDataDetail(warehousingNotificationMap,WarehousingNotificationConstant.getFormData(),"1760495861864787969",false); } - return ActionResult.success(warehousingNotificationMap); } /** @@ -223,6 +466,8 @@ public class WarehousingNotificationController { warehousingNotificationMap.put("id", warehousingNotificationMap.get("id")); //副表数据 //子表数据 + List warehousingProductList = warehousingNotificationService.getWarehousingProductList(entity.getId()); + warehousingNotificationMap.put("warehousingProductList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(warehousingProductList))); warehousingNotificationMap = generaterSwapUtil.swapDataForm(warehousingNotificationMap,WarehousingNotificationConstant.getFormData(),WarehousingNotificationConstant.TABLEFIELDKEY,WarehousingNotificationConstant.TABLERENAMES); return ActionResult.success(warehousingNotificationMap); } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderEntity.java index d1c9f62c..0eab8710 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderEntity.java @@ -119,6 +119,14 @@ public class BusinessOrderEntity { @TableField("DEPARTMENT_ID") private String departmentId; + @TableField(exist = false) + private String secondCustomName; + @TableField(exist = false) + private String businessLineName; + @TableField(exist = false) + private String secondSupplyName; + @TableField(exist = false) + private String thirdSupplyName; @TableField(exist = false) private List settlementInfoList; @TableField(exist = false) diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLEntity.java index 73ceab21..0a104e3b 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLEntity.java @@ -130,9 +130,15 @@ public class ContractLEntity { @TableField(exist = false) private String enterpriseName; @TableField(exist = false) - private String saleCode; + private String relatedContractName; @TableField(exist = false) private String secondCustomName; @TableField(exist = false) + private String firstSupplyName; + @TableField(exist = false) + private String secondSupplyName; + @TableField(exist = false) + private String thirdSupplyName; + @TableField(exist = false) private List contractLCommodityEntityList; } diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseInBoundNotice/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseInBoundNotice/form.vue index 6d3b7513..7d7cea9b 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseInBoundNotice/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseInBoundNotice/form.vue @@ -53,11 +53,11 @@ - @@ -67,38 +67,36 @@

- + - - + - + - + - + - + - + - + - + - - - - - - - - - --> @@ -289,7 +243,7 @@ - - + - { item.productName = item.name item.purchaseUnitId = item.salesMainUnitId diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/form.vue index 855a6a99..7f17dfff 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/form.vue @@ -105,8 +105,8 @@ @@ -122,12 +122,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - + - + - + - + - + - + - - + - - - - --> @@ -1148,6 +1104,18 @@ export default { }, ], }, + orderTypeOptions: [{ "fullName": "标准采购", "id": "1" }, { "fullName": "计划采购", "id": "2" }, { "fullName": "合同采购", "id": "3" }, { "fullName": "其他采购", "id": "4" }], + orderTypeProps: { "label": "fullName", "value": "id" }, + businessOrderTypeOptions: [{ "fullName": "钢材类", "id": "1" }, { "fullName": "设备类", "id": "2" }, { "fullName": "废钢类", "id": "3" }, { "fullName": "低值易耗品", "id": "4" }, { "fullName": "合金类", "id": "5" }, { "fullName": "矿产类", "id": "6" }], + businessOrderTypeProps: { "label": "fullName", "value": "id" }, + currencyOptions: [{ "fullName": "人民币", "id": "1" }, { "fullName": "港元", "id": "2" }, { "fullName": "美元", "id": "3" }, { "fullName": "欧元", "id": "4" }, { "fullName": "加币", "id": "5" }, { "fullName": "日元", "id": "6" }, { "fullName": "台币", "id": "7" }], + currencyProps: { "label": "fullName", "value": "id" }, + saleModeOptions: [{ "fullName": "以销定采", "id": "1" }, { "fullName": "以采定销", "id": "2" }], + saleModeProps: { "label": "fullName", "value": "id" }, + transactionModeOptions: [{ "fullName": "快递交货", "id": "1" }, { "fullName": "送货上门", "id": "2" }, { "fullName": "上门提货", "id": "3" }], + transactionModeProps: { "label": "fullName", "value": "id" }, + transportModeOptions: [{ "fullName": "公路", "id": "1" }, { "fullName": "铁路", "id": "2" }, { "fullName": "轮船", "id": "3" }, { "fullName": "空运", "id": "4" }, { "fullName": "无", "id": "5" }], + transportModeProps: { "label": "fullName", "value": "id" }, documentTypeOptions: [{ "fullName": "采购退货", "id": "1" }], documentTypeProps: { "label": "fullName", "value": "id" }, businessIdcolumnOptions: [{ "label": "订单编号", "value": "code" },], @@ -1251,6 +1219,7 @@ export default { this.dataForm.enterpriseId = val2.enterpriseId this.dataForm.warehouseId = val2.deliveryWarehouse this.dataForm.shippingAddress = val2.deliveryAddress + this.dataForm.reservedFields1 = val2.businessLineId val2.businessOrderProductRelationalList.forEach((item, index) => { item.productName = item.name item.purchaseUnitId = item.salesMainUnitId diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue index bb128512..54791980 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue @@ -64,6 +64,19 @@ + + + + + +
@@ -86,21 +99,21 @@ - - + - + - + + v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId"> - - - - - - - - - - + - - - - --> - - - - - - @@ -1146,6 +1093,18 @@ export default { }, ], }, + orderTypeOptions: [{ "fullName": "标准销售", "id": "1" }, { "fullName": "计划销售", "id": "2" }, { "fullName": "合同销售", "id": "3" }, { "fullName": "其他销售", "id": "4" }], + orderTypeProps: { "label": "fullName", "value": "id" }, + businessOrderTypeOptions: [{ "fullName": "钢材类", "id": "1" }, { "fullName": "设备类", "id": "2" }, { "fullName": "废钢类", "id": "3" }, { "fullName": "低值易耗品", "id": "4" }, { "fullName": "合金类", "id": "5" }, { "fullName": "矿产类", "id": "6" }], + businessOrderTypeProps: { "label": "fullName", "value": "id" }, + currencyOptions: [{ "fullName": "人民币", "id": "1" }, { "fullName": "港元", "id": "2" }, { "fullName": "美元", "id": "3" }, { "fullName": "欧元", "id": "4" }, { "fullName": "加币", "id": "5" }, { "fullName": "日元", "id": "6" }, { "fullName": "台币", "id": "7" }], + currencyProps: { "label": "fullName", "value": "id" }, + saleModeOptions: [{ "fullName": "以销定采", "id": "1" }, { "fullName": "以采定销", "id": "2" }], + saleModeProps: { "label": "fullName", "value": "id" }, + transactionModeOptions: [{ "fullName": "快递交货", "id": "1" }, { "fullName": "送货上门", "id": "2" }, { "fullName": "上门提货", "id": "3" }], + transactionModeProps: { "label": "fullName", "value": "id" }, + transportModeOptions: [{ "fullName": "公路", "id": "1" }, { "fullName": "铁路", "id": "2" }, { "fullName": "轮船", "id": "3" }, { "fullName": "空运", "id": "4" }, { "fullName": "无", "id": "5" }], + transportModeProps: { "label": "fullName", "value": "id" }, deliveryTypeOptions: [{ "fullName": "销售发货", "id": "2" }], deliveryTypeProps: { "label": "fullName", "value": "id" }, businessIdcolumnOptions: [{ "label": "订单编号", "value": "code" },], @@ -1249,6 +1208,7 @@ export default { this.dataForm.enterpriseId = val2.enterpriseId this.dataForm.warehouseId = val2.deliveryWarehouse this.dataForm.shippingAddress = val2.deliveryAddress + this.dataForm.reservedFields1 = val2.businessLineId val2.businessOrderProductRelationalList.forEach((item, index) => { item.productName = item.name item.purchaseUnitId = item.salesMainUnitId diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/returnCargoOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/returnCargoOrder/form.vue index a31b7e0e..7c968181 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/returnCargoOrder/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/returnCargoOrder/form.vue @@ -100,21 +100,21 @@ - - + - + - + - - - - - - - - + v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId"> - - + - - - - --> @@ -1147,6 +1094,18 @@ export default { }, ], }, + orderTypeOptions: [{ "fullName": "标准销售", "id": "1" }, { "fullName": "计划销售", "id": "2" }, { "fullName": "合同销售", "id": "3" }, { "fullName": "其他销售", "id": "4" }], + orderTypeProps: { "label": "fullName", "value": "id" }, + businessOrderTypeOptions: [{ "fullName": "钢材类", "id": "1" }, { "fullName": "设备类", "id": "2" }, { "fullName": "废钢类", "id": "3" }, { "fullName": "低值易耗品", "id": "4" }, { "fullName": "合金类", "id": "5" }, { "fullName": "矿产类", "id": "6" }], + businessOrderTypeProps: { "label": "fullName", "value": "id" }, + currencyOptions: [{ "fullName": "人民币", "id": "1" }, { "fullName": "港元", "id": "2" }, { "fullName": "美元", "id": "3" }, { "fullName": "欧元", "id": "4" }, { "fullName": "加币", "id": "5" }, { "fullName": "日元", "id": "6" }, { "fullName": "台币", "id": "7" }], + currencyProps: { "label": "fullName", "value": "id" }, + saleModeOptions: [{ "fullName": "以销定采", "id": "1" }, { "fullName": "以采定销", "id": "2" }], + saleModeProps: { "label": "fullName", "value": "id" }, + transactionModeOptions: [{ "fullName": "快递交货", "id": "1" }, { "fullName": "送货上门", "id": "2" }, { "fullName": "上门提货", "id": "3" }], + transactionModeProps: { "label": "fullName", "value": "id" }, + transportModeOptions: [{ "fullName": "公路", "id": "1" }, { "fullName": "铁路", "id": "2" }, { "fullName": "轮船", "id": "3" }, { "fullName": "空运", "id": "4" }, { "fullName": "无", "id": "5" }], + transportModeProps: { "label": "fullName", "value": "id" }, documentTypeOptions: [{ "fullName": "销售退货", "id": "2" }], documentTypeProps: { "label": "fullName", "value": "id" }, businessIdcolumnOptions: [{ "label": "订单编号", "value": "code" },], @@ -1250,6 +1209,7 @@ export default { this.dataForm.enterpriseId = val2.enterpriseId this.dataForm.warehouseId = val2.deliveryWarehouse this.dataForm.deliveryAddress = val2.deliveryAddress + this.dataForm.reservedFields1 = val2.businessLineId val2.businessOrderProductRelationalList.forEach((item, index) => { item.productName = item.name item.purchaseUnitId = item.salesMainUnitId diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleInBoundNotice/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleInBoundNotice/form.vue index d3f08ac0..e3c0dba1 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleInBoundNotice/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleInBoundNotice/form.vue @@ -84,21 +84,21 @@ - - + - + - + + v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId"> - + - - - - - - + @@ -289,7 +264,7 @@ - - + - + placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'> @@ -137,10 +135,8 @@ @@ -151,12 +147,92 @@ v-if="judgeRequired('settlementinfoList-underpaymentMethod')">*销售模式 + + + + + + + + + + + + + + + + + + + + + + + + @@ -1322,6 +1398,8 @@ export default { businessorderproductrelationalproductIdcolumnOptions2: [{ "label": "商品编码", "value": "code" }, { "label": "商品名称", "value": "name" }, { "label": "商品规格", "value": "spec" },], businessorderproductrelationalsalesMainUnitIdOptions: [{ "fullName": "选项一", "id": "1" }, { "fullName": "选项二", "id": "2" }], businessorderproductrelationalsalesMainUnitIdProps: { "label": "fullName", "value": "id" }, + costBearingMianOptions: [{ "fullName": "甲方", "id": "1" }, { "fullName": "乙方", "id": "2" }], + costBearingMianProps: { "label": "fullName", "value": "id" }, childIndex: -1, isEdit: false, interfaceRes: { diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOutBoundNotice/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOutBoundNotice/form.vue index 8adf5166..736ddb31 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOutBoundNotice/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOutBoundNotice/form.vue @@ -84,21 +84,21 @@ - - + - + - + + v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId"> - + - - - - - - + @@ -291,7 +266,7 @@ - @@ -329,7 +304,7 @@ - { item.productName = item.name item.purchaseUnitId = item.salesMainUnitId