待采购功能修改

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/dto/EhsdPurchaseDto.java

@@ -1,6 +1,7 @@
 package com.fjhx.sale.entity.purchase.dto;
 
 import com.fjhx.area.service.SetCustomizeAreaId;
+import com.fjhx.file.entity.ObsFile;
 import com.fjhx.sale.entity.purchase.po.EhsdPurchase;
 import com.fjhx.sale.entity.purchase.po.EhsdPurchaseProduct;
 import lombok.Getter;
@@ -51,4 +52,9 @@ public class EhsdPurchaseDto extends EhsdPurchase implements SetCustomizeAreaId
     private List<Long> productIds;
 
     private List<EhsdPurchaseProduct> purchaseProductList;
+
+    /**
+     * 文件列表
+     */
+    List<ObsFile> fileList;
 }

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/po/EhsdPurchase.java

@@ -258,35 +258,61 @@ public class EhsdPurchase extends BasePo {
     private String sellPostalCode;
 
     /**
+     * 归属公司id
+     */
+    private Long companyId;
+    //==============================================================================
+    /**
+     * 采购用户id
+     */
+    private Long purchaseUserId;
+    /**
+     * 生产公司id
+     */
+    private Long prodCompanyId;
+    /**
+     * 部门id
+     */
+    private Long deptId;
+    /**
+     * 仓库id
+     */
+    private Long warehouseId;
+    /**
+     * 供应商报价是否含税
+     */
+    private Integer supplierIncludingTax;
+    /**
+     * 供应商税点
+     */
+    private String supplierTaxPoints;
+    /**
+     * 含税总金额
+     */
+    private BigDecimal amountIncludingTax;
+    //==============================================================================
+
+    /**
      * 采购到货列表
      */
     @TableField(exist = false)
     private List<EhsdPurchaseArrival> purchaseArrivalList;
-
-
     /**
      * 采购商品列表
      */
     @TableField(exist = false)
     private List<EhsdPurchaseProject> purchaseProjectList;
-
     /**
      * 采购跟单列表
      */
     @TableField(exist = false)
     private List<ContractDocumentary> purchaseDocumentary;
-
     /**
      * 供应商名称
      */
     @TableField(exist = false)
     private String supplyName;
 
-    /**
-     * 归属公司id
-     */
-    private Long companyId;
-
     @TableField(exist = false)
     private BigDecimal sumInvoiceMoney;
 

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/po/EhsdPurchaseProduct.java

@@ -39,11 +39,6 @@ public class EhsdPurchaseProduct extends BasePo {
     private String productName;
 
     /**
-     * 商品型号
-     */
-    private String productModel;
-
-    /**
      * 商品数量
      */
     private BigDecimal quantity;
@@ -104,4 +99,6 @@ public class EhsdPurchaseProduct extends BasePo {
      * 合同id
      */
     private Long contractId;
+
+    private BigDecimal priceIncludingTax;
 }

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/vo/EhsdPurchaseProductVo.java

@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 /**
  * ehsd采购产品表列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2023-05-17
  */
 @Getter
@@ -97,4 +97,22 @@ public class EhsdPurchaseProductVo extends EhsdPurchaseProduct {
      * 供应商名称
      */
     private String sellCorporationName;
+
+
+    /**
+     * 单位
+     */
+    private String productUnit;
+    /**
+     * 净重
+     */
+    private BigDecimal productNetWeight;
+    /**
+     * 正面纹路
+     */
+    private String productFrontalTexture;
+    /**
+     * 反面纹路
+     */
+    private String productReverseTexture;
 }

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/vo/EhsdPurchaseVo.java

@@ -112,4 +112,8 @@ public class EhsdPurchaseVo extends EhsdPurchase {
      * 应付金额
      */
     private BigDecimal payableAmount;
+
+    private String warehouseName;
+    private String prodCompanyName;
+    private String purchaseUserName;
 }

hx-sale/src/main/java/com/fjhx/sale/flow/EhsdPurchaseFlow.java

@@ -12,6 +12,8 @@ import com.fjhx.common.enums.CodingRuleEnum;
 import com.fjhx.common.enums.FlowStatusEnum1;
 import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.common.utils.Assert;
+import com.fjhx.file.entity.ObsFile;
+import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.flow.enums.FlowStatusEnum;
 import com.fjhx.item.enums.ProductAvailableRecordType;
@@ -184,6 +186,10 @@ public class EhsdPurchaseFlow extends FlowDelegate {
         }
         purchaseProjectService.editLinked(purchaseProjectList, EhsdPurchaseProject::getPurchaseId, purchase.getId());
 
+        //采购附件
+        List<ObsFile> fileList = purchase.getFileList();
+        ObsFileUtil.editFile(fileList, purchase.getId());
+
         return purchase;
     }
 
@@ -289,8 +295,8 @@ public class EhsdPurchaseFlow extends FlowDelegate {
                 .set(EhsdPurchase::getStatus, FlowStatusEnum1.CANCELLATION.getKey())
                 .set(BasePo::getUpdateTime, new Date())
                 .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
-        );
-    }
+		);
+	}
 
 
 }

hx-sale/src/main/java/com/fjhx/sale/service/purchase/impl/EhsdPurchaseServiceImpl.java

@@ -71,9 +71,12 @@ import com.fjhx.supply.service.supplier.SupplierInfoService;
 import com.fjhx.supply.service.supplier.SupplierPriceService;
 import com.fjhx.tenant.utils.DeptUstil;
 import com.fjhx.wms.entity.stock.po.StockWait;
+import com.fjhx.wms.entity.warehouse.po.Warehouse;
 import com.fjhx.wms.service.stock.StockWaitService;
+import com.fjhx.wms.service.warehouse.WarehouseService;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.PageUtils;
@@ -81,6 +84,7 @@ import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
+import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.utils.UserUtil;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -149,6 +153,10 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
     private EhsdPurchaseProductMapper ehsdPurchaseProductMapper;
     @Autowired
     private PurchaseBackService purchaseBackService;
+    @Autowired
+    private ISysDeptService sysDeptService;
+    @Autowired
+    private WarehouseService warehouseService;
 
     /**
      * 分页
@@ -171,7 +179,7 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
 
         if (ObjectUtils.isEmpty(dto.getStatus()) || FlowStatusEnum1.UPDATE.getKey() != dto.getStatus()) {
             //不显示已变更数据
-            wrapper.ne(EhsdPurchase::getStatus, FlowStatusEnum1.UPDATE.getKey());
+            wrapper.ne("t1", EhsdPurchase::getStatus, FlowStatusEnum1.UPDATE.getKey());
         }
 
         //权限过滤：采购
@@ -329,6 +337,11 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
             item.setProductWidth(product.getWidth());
             item.setProductHeight(product.getHeight());
             item.setProductColor(product.getColor());
+
+            item.setProductUnit(product.getUnit());
+            item.setProductNetWeight(product.getNetWeight());
+            item.setProductFrontalTexture(product.getFrontalTexture());
+            item.setProductReverseTexture(product.getReverseTexture());
         });
         result.setPurchaseProductList(ehsdPurchaseProductVos);
         //赋值出货明细
@@ -373,6 +386,21 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
         );
         result.setArrivalDetailList(arrivalDetailVos);
 
+        //赋值采购用户信息
+        UserUtil.assignmentNickName(Arrays.asList(result), EhsdPurchaseVo::getPurchaseUserId, EhsdPurchaseVo::setPurchaseUserName);
+        //赋值生产公司信息
+        List<SysDept> list = sysDeptService.list();
+        Map<Long, String> deptMap = list.stream().collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptName));
+        result.setProdCompanyName(deptMap.get(result.getProdCompanyId()));
+        //赋值部门信息
+        result.setDeptName(deptMap.get(result.getDeptId()));
+        //赋值仓库信息
+        Warehouse warehouse = warehouseService.getById(result.getWarehouseId());
+        if (ObjectUtil.isNotEmpty(warehouse)) {
+            result.setWarehouseName(warehouse.getName());
+        }
+
+
         return result;
     }