流水添加类型 添加物料反查产品

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

@@ -134,4 +134,9 @@ public class ProductInfoController {
         productInfoService.excelExport(httpServletResponse, dto);
     }
 
+    @PostMapping("/getProductByMaterialId")
+    public List<ProductInfoVo> getProductByMaterialId(@RequestBody ProductInfoDto dto) {
+        return productInfoService.getProductByMaterialId(dto.getMaterialId());
+    }
+
 }

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

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

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

@@ -75,4 +75,6 @@ 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);
 }

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

@@ -118,4 +118,6 @@ public interface ProductInfoService extends BaseService<ProductInfo> {
      * 导出Excel
      */
     void excelExport(HttpServletResponse httpServletResponse, ProductInfoSelectDto dto);
+
+    List<ProductInfoVo> getProductByMaterialId(Long materialId);
 }

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

@@ -977,4 +977,18 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
         ExcelUtil.export(httpServletResponse, productExcelExportBoList, ProductExcelExportBo.class);
     }
 
+    @Override
+    public List<ProductInfoVo> getProductByMaterialId(Long materialId) {
+        IWrapper<Object> wrapper = IWrapper.getWrapper();
+        wrapper.eq("pbd.material_id", materialId);
+
+        //权限过滤：产品-子公司看自己的产品，总公司看全部，物料没有限制
+        Long companyId = SecurityUtils.getCompanyId();
+        if (Objects.equals(companyId, 100L)) {
+            companyId = null;
+        }
+        wrapper.eq("pi.company_id", companyId);
+        return baseMapper.getProductByMaterialId(wrapper);
+    }
+
 }

hx-item/src/main/resources/mapper/product/ProductInfoMapper.xml

@@ -142,4 +142,11 @@
         from product_info pi
             ${ew.customSqlSegment}
     </select>
+
+    <select id="getProductByMaterialId" resultType="com.fjhx.item.entity.product.vo.ProductInfoVo">
+        SELECT DISTINCT pi.*
+        FROM product_info pi
+                 JOIN product_bom_detail pbd
+            ${ew.customSqlSegment}
+    </select>
 </mapper>

hx-wms/src/main/java/com/fjhx/wms/entity/stock/emums/JournalType.java

@@ -24,6 +24,8 @@ public enum JournalType {
     TRANSFER_OUT(InOutType.OUT, 7, "调拨出库", ""),//调仓
     STOCK_CHECK_OUT(InOutType.OUT, 8, "盘亏出库", ""),//库存盘点
     PROD_OUT(InOutType.OUT, 9, "生产出库", ""),//待出库-生产出库
+    OTHER_OUT(InOutType.OUT, 10, "其他出库", ""),//手动出库-其他
+
 
     //入库
     RESTITUTION_IN(InOutType.IN, 100, "借用归还", ""),//手动入库
@@ -35,7 +37,10 @@ public enum JournalType {
     STOCK_CHECK_IN(InOutType.IN, 106, "盘盈入库", ""),//库存盘点
     COMPLETION_IN(InOutType.IN, 107, "完工入库", ""),//待入库-完工入库
     EXCEED_REST_IN(InOutType.IN, 108, "超领归还", ""),//手动入库
-    ERR_REST_IN(InOutType.IN, 109, "错领归还", "");//手动入库
+    ERR_REST_IN(InOutType.IN, 109, "错领归还", ""),
+    OTHER_IN(InOutType.IN, 110, "其他入库", "");//手动出库-其他
+
+    ;//手动入库
 
     private final static Map<Integer, JournalType> map = new HashMap<>();