1.修改单据详情查询接口返回的实际数量

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java

@@ -97,6 +97,23 @@ public class StockOrderDetailController {
         List<StockOrderDetailEntity> stockOrderDetailEntityList
                 = stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest);
 
+        //计算实际数量
+        if (CollUtil.isNotEmpty(stockOrderDetailEntityList)) {
+            List<WarehouseEntity> codeList = codesService.findByReceiptId(stockOrderEntity.getOrderIdFk());
+            if (CollUtil.isNotEmpty(codeList)) {
+                stockOrderDetailEntityList.forEach(stockOrderDetailEntity -> {
+                    codeList.forEach(codeEntity -> {
+                        if (StrUtil.trimToEmpty(codeEntity.getRelId()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getRelId())) && (StrUtil.trimToEmpty(codeEntity.getBatchNo()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo())))) {
+                            int actCount = udiRelevanceService.getActCountByRelIdAndNameCode(stockOrderDetailEntity.getRelId(), codeEntity.getNameCode());
+                            stockOrderDetailEntity.setReCount(String.valueOf(actCount));
+                        }
+                    });
+
+                });
+            }
+
+        }
+
 
         BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(stockOrderEntity.getBillType());
 
@@ -129,7 +146,10 @@ public class StockOrderDetailController {
                             item.setCodeId(codeDetaiEntity.getId().intValue());
                             item.setSerialNo(codeDetaiEntity.getSerialNo());
                             item.setCount(codeDetaiEntity.getCount() + "");
-                            item.setReCount(codeDetaiEntity.getCount() + "");
+                            //item.setReCount(codeDetaiEntity.getCount() + "");
+                            //计算实际数量
+                            int actCount = udiRelevanceService.getActCountByRelIdAndNameCode(codeDetaiEntity.getRelId(), codeDetaiEntity.getNameCode());
+                            item.setReCount(String.valueOf(actCount));
                             resultList.add(item);
                         }
 

api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiRelevanceService.java

@@ -5,7 +5,6 @@ import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
 import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
 import com.glxp.sale.admin.req.basic.UdiRelevanceRequest;
 import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -64,4 +63,12 @@ public interface UdiRelevanceService {
 
     boolean deleteByUuid(String uuid);
 
+    /**
+     * 根据耗材字典ID和DI计算实际数量
+     *
+     * @param relId
+     * @return
+     */
+    int getActCountByRelIdAndNameCode(String relId, String nameCode);
+
 }

api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java

@@ -305,4 +305,21 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService {
     public boolean deleteByUuid(String uuid) {
         return udiRelevanceDao.deleteByUuid(uuid);
     }
+
+    @Override
+    public int getActCountByRelIdAndNameCode(String relId, String nameCode) {
+        UdiRelevanceEntity udiRelevanceEntity = selectById(relId);
+        UdiRelevanceResponse udiRelevanceResponse = selectByNameCode(nameCode);
+        if (null != udiRelevanceResponse) {
+            if ((udiRelevanceEntity.getIsUseDy() != null && udiRelevanceEntity.getIsUseDy()) && udiRelevanceResponse.getDiType() != 2) {
+                if (udiRelevanceResponse.getBhzxxsbzsl() == 0)
+                    return udiRelevanceResponse.getZxxsbzbhsydysl();
+                else
+                    return udiRelevanceResponse.getZxxsbzbhsydysl() * udiRelevanceResponse.getBhzxxsbzsl();
+            } else {
+                return udiRelevanceResponse.getBhzxxsbzsl();
+            }
+        }
+        return 1;
+    }
 }