refactor(pharmacy): 激活药品仓库各类订单的供应分类选项

- 激活损益订单中的通用损益、盘点损益和制剂消耗分类选项
- 更新采购订单中的库存供应和非库存供应分类选项
- 激活退货订单中的普通分类选项
- 激活退仓订单中的普通分类选项
- 激活入库订单中的外购药品、自制药品、代销药品、其他药品和赠送药品入库分类选项
- 激活出库订单中的院内出库、院外出库和其他出库分类选项
- 激活盘点订单中的普通盘点和月度盘点分类选项
- 在枚举类中启用所有被注释的供应分类并完善文档注释

openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseProfitLossOrderServiceImpl.java

@@ -57,15 +57,15 @@ public class PharmacyWarehouseProfitLossOrderServiceImpl implements IPharmacyWar
 
         // 单据分类
         List<PharmacyWarehouseInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
-        // supplyCategoryOption.add(new
-        // PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.GENERAL_PROFIT_AND_LOSS.getValue(),
-        // SupplyCategory.GENERAL_PROFIT_AND_LOSS.getInfo()));
-        // supplyCategoryOption.add(new
-        // PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.STOCKTAKING_PROFIT_AND_LOSS.getValue(),
-        // SupplyCategory.STOCKTAKING_PROFIT_AND_LOSS.getInfo()));
-        // supplyCategoryOption.add(new
-        // PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.PREPARATION_CONSUMPTION.getValue(),
-        // SupplyCategory.PREPARATION_CONSUMPTION.getInfo()));
+        supplyCategoryOption.add(new
+        PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.GENERAL_PROFIT_AND_LOSS.getValue(),
+        SupplyCategory.GENERAL_PROFIT_AND_LOSS.getInfo()));
+        supplyCategoryOption.add(new
+        PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.STOCKTAKING_PROFIT_AND_LOSS.getValue(),
+        SupplyCategory.STOCKTAKING_PROFIT_AND_LOSS.getInfo()));
+        supplyCategoryOption.add(new
+        PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.PREPARATION_CONSUMPTION.getValue(),
+        SupplyCategory.PREPARATION_CONSUMPTION.getInfo()));
 
         purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehousePurchaseOrderServiceImpl.java

@@ -56,11 +56,11 @@ public class PharmacyWarehousePurchaseOrderServiceImpl implements IPharmacyWareh
 
         // 单据分类
         List<PharmacyWarehouseInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
-        // supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
-        // SupplyCategory.NORMAL.getInfo()));
-        // supplyCategoryOption.add(new
-        // PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.PURCHASE_PLAN_GENERATION.getValue(),
-        // SupplyCategory.PURCHASE_PLAN_GENERATION.getInfo()));
+        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.STOCK_SUPPLY.getValue(),
+         SupplyCategory.STOCK_SUPPLY.getInfo()));
+        supplyCategoryOption.add(new
+        PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.NON_STOCK.getValue(),
+        SupplyCategory.NON_STOCK.getInfo()));
 
         purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnOrderServiceImpl.java

@@ -56,8 +56,8 @@ public class PharmacyWarehouseReturnOrderServiceImpl implements IPharmacyWarehou
 
         // 单据分类
         List<PharmacyWarehouseInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
-        // supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
-        // SupplyCategory.NORMAL.getInfo()));
+        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+         SupplyCategory.NORMAL.getInfo()));
 
         purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnToWarehouseOrderServiceImpl.java

@@ -56,8 +56,8 @@ public class PharmacyWarehouseReturnToWarehouseOrderServiceImpl implements IPhar
 
         // 单据分类
         List<PharmacyWarehouseInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
-//        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
-//            SupplyCategory.NORMAL.getInfo()));
+        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+            SupplyCategory.NORMAL.getInfo()));
 
         purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockInOrderServiceImpl.java

@@ -57,18 +57,16 @@ public class PharmacyWarehouseStockInOrderServiceImpl implements IPharmacyWareho
 
         // 单据分类
         List<PharmacyWarehouseInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
-        // supplyCategoryOption
-        // .add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.PURCHASED_DRUGS_WAREHOUSING.getValue(),
-        // SupplyCategory.PURCHASED_DRUGS_WAREHOUSING.getInfo()));
-        // supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(
-        // SupplyCategory.HOMEMADE_DRUGS_WAREHOUSING.getValue(), SupplyCategory.HOMEMADE_DRUGS_WAREHOUSING.getInfo()));
-        // supplyCategoryOption
-        // .add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.CONSIGNMENT_DRUGS_WAREHOUSING.getValue(),
-        // SupplyCategory.CONSIGNMENT_DRUGS_WAREHOUSING.getInfo()));
-        // supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(
-        // SupplyCategory.OTHER_DRUGS_WAREHOUSING.getValue(), SupplyCategory.OTHER_DRUGS_WAREHOUSING.getInfo()));
-        // supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(
-        // SupplyCategory.DONATED_DRUGS_WAREHOUSING.getValue(), SupplyCategory.DONATED_DRUGS_WAREHOUSING.getInfo()));
+        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.PURCHASED_DRUGS_WAREHOUSING.getValue(),
+         SupplyCategory.PURCHASED_DRUGS_WAREHOUSING.getInfo()));
+        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(
+         SupplyCategory.HOMEMADE_DRUGS_WAREHOUSING.getValue(), SupplyCategory.HOMEMADE_DRUGS_WAREHOUSING.getInfo()));
+        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.CONSIGNMENT_DRUGS_WAREHOUSING.getValue(),
+         SupplyCategory.CONSIGNMENT_DRUGS_WAREHOUSING.getInfo()));
+        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(
+         SupplyCategory.OTHER_DRUGS_WAREHOUSING.getValue(), SupplyCategory.OTHER_DRUGS_WAREHOUSING.getInfo()));
+        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(
+         SupplyCategory.DONATED_DRUGS_WAREHOUSING.getValue(), SupplyCategory.DONATED_DRUGS_WAREHOUSING.getInfo()));
 
         purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockOutOrderServiceImpl.java

@@ -56,12 +56,12 @@ public class PharmacyWarehouseStockOutOrderServiceImpl implements IPharmacyWareh
 
         // 单据分类
         List<PharmacyWarehouseInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
-//        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.IN_HOSPITAL_OUTBOUND.getValue(),
-//            SupplyCategory.IN_HOSPITAL_OUTBOUND.getInfo()));
-//        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.OUT_OF_HOSPITAL_OUTBOUND.getValue(),
-//            SupplyCategory.OUT_OF_HOSPITAL_OUTBOUND.getInfo()));
-//        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.OTHER_OUTBOUND.getValue(),
-//            SupplyCategory.OTHER_OUTBOUND.getInfo()));
+        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.IN_HOSPITAL_OUTBOUND.getValue(),
+            SupplyCategory.IN_HOSPITAL_OUTBOUND.getInfo()));
+        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.OUT_OF_HOSPITAL_OUTBOUND.getValue(),
+            SupplyCategory.OUT_OF_HOSPITAL_OUTBOUND.getInfo()));
+        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.OTHER_OUTBOUND.getValue(),
+            SupplyCategory.OTHER_OUTBOUND.getInfo()));
 
         purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStocktakingOrderServiceImpl.java

@@ -57,10 +57,10 @@ public class PharmacyWarehouseStocktakingOrderServiceImpl implements IPharmacyWa
 
         // 单据分类
         List<PharmacyWarehouseInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
-        // supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(
-        // SupplyCategory.GENERAL_STOCKTAKING.getValue(), SupplyCategory.GENERAL_STOCKTAKING.getInfo()));
-        // supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(
-        // SupplyCategory.MONTHLY_STOCKTAKING.getValue(), SupplyCategory.MONTHLY_STOCKTAKING.getInfo()));
+        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(
+         SupplyCategory.GENERAL_STOCKTAKING.getValue(), SupplyCategory.GENERAL_STOCKTAKING.getInfo()));
+        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(
+         SupplyCategory.MONTHLY_STOCKTAKING.getValue(), SupplyCategory.MONTHLY_STOCKTAKING.getInfo()));
 
         purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);