소스 검색

工序添加成本价 负载量 物料反查添加 分页

yzc 1 년 전
부모
커밋
d7b3b95e17

+ 2 - 2
hx-item/src/main/java/com/fjhx/item/controller/product/ProductInfoController.java

@@ -135,8 +135,8 @@ public class ProductInfoController {
     }
 
     @PostMapping("/getProductByMaterialId")
-    public List<ProductInfoVo> getProductByMaterialId(@RequestBody ProductInfoDto dto) {
-        return productInfoService.getProductByMaterialId(dto.getMaterialId());
+    public Page<ProductInfoVo> getProductByMaterialId(@RequestBody ProductInfoSelectDto dto) {
+        return productInfoService.getProductByMaterialId(dto);
     }
 
 }

+ 0 - 5
hx-item/src/main/java/com/fjhx/item/entity/product/dto/ProductInfoDto.java

@@ -68,9 +68,4 @@ public class ProductInfoDto extends ProductInfo {
      * 生产文件列表
      */
     private List<ObsFile> prodFileList;
-
-    /**
-     * 物料id
-     */
-    private Long materialId;
 }

+ 4 - 0
hx-item/src/main/java/com/fjhx/item/entity/product/dto/ProductInfoSelectDto.java

@@ -111,5 +111,9 @@ public class ProductInfoSelectDto extends BaseSelectDto {
      */
     private Integer isRawMaterial;
 
+    /**
+     * 物料id
+     */
+    private Long materialId;
 
 }

+ 1 - 1
hx-item/src/main/java/com/fjhx/item/mapper/product/ProductInfoMapper.java

@@ -77,7 +77,7 @@ public interface ProductInfoMapper extends BaseMapper<ProductInfo> {
      */
     Page<ProductAnalysisBo> getProductAnalysisPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<ProductInfo> wrapper);
 
-    List<ProductInfoVo> getProductByMaterialId(@Param("ew") IWrapper<Object> wrapper);
+    Page<ProductInfoVo> getProductByMaterialId(@Param("page") Page<Object> page, @Param("ew") IWrapper<Object> wrapper);
 
     List<ProcessesBo> getProcessesByTechnologyId(Long technologyId);
 }

+ 1 - 1
hx-item/src/main/java/com/fjhx/item/service/product/ProductInfoService.java

@@ -120,7 +120,7 @@ public interface ProductInfoService extends BaseService<ProductInfo> {
      */
     void excelExport(HttpServletResponse httpServletResponse, ProductInfoSelectDto dto);
 
-    List<ProductInfoVo> getProductByMaterialId(Long materialId);
+    Page<ProductInfoVo> getProductByMaterialId(ProductInfoSelectDto dto);
 
     List<ProcessesBo> getProcessesByTechnologyId(Long technologyId);
 }

+ 3 - 3
hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductInfoServiceImpl.java

@@ -979,9 +979,9 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
     }
 
     @Override
-    public List<ProductInfoVo> getProductByMaterialId(Long materialId) {
+    public Page<ProductInfoVo> getProductByMaterialId(ProductInfoSelectDto dto) {
         IWrapper<Object> wrapper = IWrapper.getWrapper();
-        wrapper.eq("pbd.material_id", materialId);
+        wrapper.eq("pbd.material_id", dto.getMaterialId());
 
         //权限过滤:产品-子公司看自己的产品,总公司看全部,物料没有限制
         Long companyId = SecurityUtils.getCompanyId();
@@ -989,7 +989,7 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
             companyId = null;
         }
         wrapper.eq("pi.company_id", companyId);
-        return baseMapper.getProductByMaterialId(wrapper);
+        return baseMapper.getProductByMaterialId(dto.getPage(), wrapper);
     }
 
     @Override

+ 11 - 0
hx-mes/src/main/java/com/fjhx/mes/entity/production/po/ProductionProcesses.java

@@ -5,6 +5,8 @@ import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+
 /**
  * <p>
  * 工序
@@ -38,4 +40,13 @@ public class ProductionProcesses extends BasePo {
      */
     private String fileName;
 
+    /**
+     * 成本价
+     */
+    private BigDecimal costPrice;
+    /**
+     * 负载量
+     */
+    private Integer capacity;
+
 }

+ 2 - 0
hx-mes/src/main/resources/mapper/production/ProductionProcessesMapper.xml

@@ -7,6 +7,8 @@
                pp.remarks,
                pp.file_name,
                pp.code,
+               pp.cost_price,
+               pp.capacity,
                pp.create_user,
                pp.create_time,
                pp.update_user,