采购入库代码补全

openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
 
+import liquibase.pro.packaged.S;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -62,7 +63,7 @@ public class ChargeItem extends HisBaseEntity {
     private Long quantityValue;
 
     /** 单位 */
-    private Long quantityUnit;
+    private String quantityUnit;
 
     /** 单价 */
     private BigDecimal unitPrice;

openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemServiceImpl.java

@@ -21,8 +21,6 @@ import lombok.AllArgsConstructor;
 @AllArgsConstructor
 public class ChargeItemServiceImpl extends ServiceImpl<ChargeItemMapper, ChargeItem> implements IChargeItemService {
 
-    private final ChargeItemMapper chargeItemMapper;
-
     /**
      * 创建已计费的采购账单
      *
@@ -30,7 +28,12 @@ public class ChargeItemServiceImpl extends ServiceImpl<ChargeItemMapper, ChargeI
      */
     @Override
     public void createBilledPurchaseCharge(List<ChargeItem> chargeItemList) {
-
+        for (ChargeItem chargeItem : chargeItemList) {
+            // 此判断是为了避免插入时主键重复
+            if (chargeItem.getId() == null) {
+                baseMapper.insert(chargeItem);
+            }
+        }
     }
 
     /**

openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/InventoryItem.java

@@ -6,8 +6,8 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.core.common.core.domain.HisBaseEntity;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -67,12 +67,6 @@ public class InventoryItem extends HisBaseEntity {
     /** 当前库存数量(最小单位数量) */
     private BigDecimal minQuantity;
 
-    /** 最小库存警戒数量(常规单位) */
-    private BigDecimal itemMinQuantity;
-
-    /** 最大库存警戒数量(常规单位) */
-    private BigDecimal itemMaxQuantity;
-
     /** 特征 */
     private String characteristicJson;
 
@@ -88,10 +82,10 @@ public class InventoryItem extends HisBaseEntity {
     /** 有效期(月) */
     private Integer validityMon;
 
-    /** 仓库 */
+    /** 库位 */
     private Long locationStoreId;
 
-    /** 库位 */
+    /** 仓库 */
     private Long locationId;
 
     /** 追溯码 */
@@ -100,5 +94,4 @@ public class InventoryItem extends HisBaseEntity {
     /** 追溯码包装层级 */
     private Integer packagingLevels;
 
-
 }

openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyDeliveryService.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.core.common.core.domain.R;
+import com.core.common.core.domain.model.LoginUser;
 import com.openhis.workflow.domain.SupplyDelivery;
 import com.openhis.workflow.domain.SupplyRequest;
 
@@ -20,7 +21,7 @@ public interface ISupplyDeliveryService extends IService<SupplyDelivery> {
      * 根据单据，发放物品
      *
      * @param supplyRequestList 单据信息
-     * @param supplyRequestList 单据信息
+     * @param now 当前时间
      */
     List<SupplyDelivery> createCompletedSupplyDelivery(List<SupplyRequest> supplyRequestList, Date now);
 }

openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/InventoryItemServiceImpl.java

@@ -1,5 +1,6 @@
 package com.openhis.workflow.service.impl;
 
+import com.openhis.administration.domain.ChargeItem;
 import com.openhis.workflow.domain.SupplyRequest;
 import org.springframework.stereotype.Service;
 
@@ -26,6 +27,11 @@ public class InventoryItemServiceImpl extends ServiceImpl<InventoryItemMapper, I
      */
     @Override
     public void stockIn(List<InventoryItem> inventoryItemList) {
-
+        for (InventoryItem inventoryItem : inventoryItemList) {
+            // 此判断是为了避免插入时主键重复
+            if (inventoryItem.getId() == null) {
+                baseMapper.insert(inventoryItem);
+            }
+        }
     }
 }