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 adc063af..38c13ff7 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 @@ -712,7 +712,7 @@ LEFT JOIN jg_contract c ON a.contract_id = c.id AND c.f_delete_mark is NULL LEFT JOIN jg_subject_basic d ON a.second_subject_basic_id = d.id AND d.f_delete_mark IS NULL LEFT JOIN jg_subject_basic e ON a.third_subject_basic_id = e.id AND e.f_delete_mark IS NULL - LEFT JOIN jg_business_line f ON a.second_subject_basic_id = f.id AND f.f_delete_mark IS NULL + LEFT JOIN jg_business_line f ON a.business_line_id = f.id AND f.f_delete_mark IS NULL ${ew.customSqlSegment} @@ -755,11 +755,15 @@ WHEN '2' THEN '直送' END AS deliveryType1, b.NAME AS subjectName, - c.contract_name AS contractName + c.contract_name AS contractName, + d.name as secondCustomName, + e.name as businessLineName 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_subject_basic d ON a.second_subject_basic_id = d.id AND d.f_delete_mark IS NULL + LEFT JOIN jg_business_line e ON a.business_line_id = e.id AND e.f_delete_mark IS NULL ${ew.customSqlSegment} + + + + diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/DeliveryOrderMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/DeliveryOrderMapper.xml index a657bd12..59d9da03 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/DeliveryOrderMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/DeliveryOrderMapper.xml @@ -35,9 +35,9 @@ - + - + @@ -89,16 +89,13 @@ 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 d4b573c7..2960bf5e 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 @@ -11,6 +11,7 @@ import jnpf.model.bom.BomPagination; import jnpf.model.businessorder.BusinessOrderPagination; import jnpf.model.businessorder.ContractModel; import jnpf.model.businessorder.ProductByContractModel; +import jnpf.model.yunguan.YunguanPurchaseOrderModel; import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; @@ -54,4 +55,7 @@ public interface BusinessOrderMapper extends BaseMapper { BigDecimal queryCurrentDayNum(@Param("businessOrderEntity") BusinessOrderEntity businessOrderEntity); BigDecimal queryCurrentDayNum2(@Param("businessOrderEntity") BusinessOrderEntity businessOrderEntity); + + //运管采购订单接口 + YunguanPurchaseOrderModel queryPurchaseOrderByYunGuan(String id); } 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 e805fad2..e6cc27a3 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 @@ -7,6 +7,7 @@ import java.math.BigDecimal; import java.util.*; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import jnpf.model.yunguan.YunguanPurchaseOrderModel; /** * businessOrder @@ -78,4 +79,7 @@ public interface BusinessOrderService extends IService { BigDecimal queryCurrentDayNum(BusinessOrderEntity businessOrderEntity); BigDecimal queryCurrentDayNum2(BusinessOrderEntity businessOrderEntity); + + //运管采购订单接口 + YunguanPurchaseOrderModel queryPurchaseOrderByYunGuanInfo(String id); } 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 75a72efe..7d020a6a 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 @@ -7,6 +7,7 @@ import jnpf.mapper.BusinessOrderMapper; import jnpf.mapper.BusinessOrderProductRelationalMapper; import jnpf.mapper.InventoryMapper; import jnpf.mapper.VoucherMapper; +import jnpf.model.yunguan.YunguanPurchaseOrderModel; import jnpf.permission.entity.OrganizeEntity; import jnpf.permission.service.OrganizeService; import jnpf.service.*; @@ -1097,4 +1098,9 @@ public class BusinessOrderServiceImpl extends ServiceImpl businessOrderQueryWrapper=new QueryWrapper<>(); + businessOrderQueryWrapper.eq("a.id",businessOrderId); + businessOrderQueryWrapper.isNull("a.f_delete_mark"); + businessOrderQueryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单 + List businessOrderEntityList = businessOrderService.saleOrderByDeliveryOrderInfo(businessOrderQueryWrapper); + if (businessOrderEntityList == null){ + return ActionResult.fail("销售订单未审核"); + } + for (BusinessOrderEntity entity: businessOrderEntityList) { + //副表数据 + //子表数据 + List businessOrderProductRelationalList = businessOrderService.getBusinessOrderProductRelationalList(entity.getId()); + entity.setBusinessOrderProductRelationalList(businessOrderProductRelationalList); + } + return ActionResult.success(businessOrderEntityList); + } + /** * 库存锁定 * diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/DeliveryOrderController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/DeliveryOrderController.java index ec44c0b9..cd5f6f2c 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/DeliveryOrderController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/DeliveryOrderController.java @@ -90,6 +90,10 @@ public class DeliveryOrderController { private FlowTaskNodeService flowTaskNodeService; @Autowired private WarehousingOutboundService warehousingOutboundService; + @Autowired + private BusinessOrderService businessOrderService; + @Autowired + private BusinessCargoService businessCargoService; /** * 列表 @@ -555,6 +559,10 @@ public class DeliveryOrderController { if(entity==null){ return ActionResult.fail("表单数据不存在!"); } + BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(entity.getBusinessId()); + if (ObjectUtil.isNotEmpty(businessOrderEntity)){ + entity.setBusinessOrderCode(businessOrderEntity.getCode()); + } Map deliveryOrderMap=JsonUtil.entityToMap(entity); deliveryOrderMap.put("id", deliveryOrderMap.get("id")); //副表数据 @@ -562,8 +570,14 @@ public class DeliveryOrderController { List deliveryVoucherRelationList = deliveryOrderService.getDeliveryVoucherRelationList(entity.getId()); deliveryOrderMap.put("deliveryVoucherRelationList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(deliveryVoucherRelationList))); List deliveryProductRelationList = deliveryOrderService.getDeliveryProductRelationList(entity.getId()); + for (DeliveryProductRelationEntity deliveryEntity : deliveryProductRelationList){ + BusinessCargoEntity businessCargoEntity = businessCargoService.getById(deliveryEntity.getCargoId()); + if (ObjectUtil.isNotEmpty(businessCargoEntity)){ + deliveryEntity.setCargoName(businessCargoEntity.getCargoName()); + } + } deliveryOrderMap.put("deliveryProductRelationList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(deliveryProductRelationList))); - if (StringUtil.isNotEmpty(entity.getBusinessId())){ + if (entity.getDeliveryType().equals("2")){ //销售发货单详情 List businessOrderInfoModelList = deliveryOrderService.queryDeliveryOrderInfo(entity.getBusinessId()); deliveryOrderMap.put("businessOrderInfoList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(businessOrderInfoModelList))); } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DeliveryOrderEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DeliveryOrderEntity.java index 574a756a..2bd3edc2 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DeliveryOrderEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DeliveryOrderEntity.java @@ -105,5 +105,7 @@ public class DeliveryOrderEntity { private String realName; @TableField(exist = false) private String realNameA; + @TableField(exist = false) + private String businessOrderCode; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DeliveryProductRelationEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DeliveryProductRelationEntity.java index b9f3a342..f4a6c6c5 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DeliveryProductRelationEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DeliveryProductRelationEntity.java @@ -93,4 +93,6 @@ public class DeliveryProductRelationEntity { private BigDecimal notificationStorageNumber; @TableField(exist = false) private BigDecimal receivedQuantity; + @TableField(exist = false) + private String cargoName; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/deliveryorder/BusinessOrderInfoModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/deliveryorder/BusinessOrderInfoModel.java index d100b543..c36442f1 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/deliveryorder/BusinessOrderInfoModel.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/deliveryorder/BusinessOrderInfoModel.java @@ -17,14 +17,14 @@ import java.util.List; public class BusinessOrderInfoModel { /** 商品名称 **/ - @JSONField(name = "businessOrderCode") - private String businessOrderCode; + @JSONField(name = "code") + private String code; /** 订单编号 **/ @JsonProperty("orderType") private String orderType; /** 制单时间 **/ - @JsonProperty("secondSubjectBasic") - private String secondSubjectBasic; + @JsonProperty("secondCustomName") + private String secondCustomName; /** 关联销售 **/ @JsonProperty("businessLineName") private String businessLineName; diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanPurchaseOrderModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanPurchaseOrderModel.java new file mode 100644 index 00000000..de81aa8f --- /dev/null +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanPurchaseOrderModel.java @@ -0,0 +1,70 @@ +package jnpf.model.yunguan; + +import com.alibaba.fastjson.annotation.JSONField; + +public class YunguanPurchaseOrderModel { + /** 租户代码 **/ + @JSONField(name = "COMP_CD") + private String COMP_CD; + /** 库存组织代码 **/ + @JSONField(name = "INV_ORG_CD") + private String INV_ORG_CD; + /** 库存组织名称 **/ + @JSONField(name = "INV_ORG_NM") + private String INV_ORG_NM; + /** 部门编码 **/ + @JSONField(name = "DEPT_CD") + private String DEPT_CD; + /** 部门名称 **/ + @JSONField(name = "DEPT_NM") + private String DEPT_NM; + /** 制单人 **/ + @JSONField(name = "PUR_EMP_NM") + private String PUR_EMP_NM; + /** 采购订单号 **/ + @JSONField(name = "ORD_NO") + private String ORD_NO; + /** 合同编号 **/ + @JSONField(name = "CONTR_CD") + private String CONTR_CD; + /** 合同名称 **/ + @JSONField(name = "CONTR_NM") + private String CONTR_NM; + /** 对方合同编号 **/ + @JSONField(name = "RESERVE1") + private String RESERVE1; + /** 签订日期 **/ + @JSONField(name = "CONTR_DT") + private String CONTR_DT; + /** 期望送达时间 **/ + @JSONField(name = "DELV_DT") + private String DELV_DT; + /** 供应商编码 **/ + @JSONField(name = "SUPPLIER_CD") + private String SUPPLIER_CD; + /** 供应商名称 **/ + @JSONField(name = "SUPPLIER_NM") + private String SUPPLIER_NM; + /** 供应商地点编码 **/ + @JSONField(name = "SUPPLIER_SITE_ID") + private String SUPPLIER_SITE_ID; + /** 供应商地点名称 **/ + @JSONField(name = "RESERVE2") + private String RESERVE2; + /** 币种 **/ + @JSONField(name = "CURRENCY_CD") + private String CURRENCY_CD; + /** 交货方式 **/ + @JSONField(name = "DELV_MTH") + private String DELV_MTH; + /** 运输方式 **/ + @JSONField(name = "TRS_MTH") + private String TRS_MTH; + /** 付款方式 **/ + @JSONField(name = "PAY_MTH") + private String PAY_MTH; + /** 定价模式 **/ + @JSONField(name = "TRANS_TYPE") + private String TRANS_TYPE; + +} diff --git a/jnpf-java-boot/jnpf-web/src/components/Jnpf/PopupSelect/index.vue b/jnpf-java-boot/jnpf-web/src/components/Jnpf/PopupSelect/index.vue index 732cfcbe..a4dd82a4 100644 --- a/jnpf-java-boot/jnpf-web/src/components/Jnpf/PopupSelect/index.vue +++ b/jnpf-java-boot/jnpf-web/src/components/Jnpf/PopupSelect/index.vue @@ -2,7 +2,8 @@
+ @mouseenter.native="inputHovering = true" @mouseleave.native="inputHovering = false" + :disabled="disabled"> + prop="remark" width="150">