1.修复盘点转单产品数量错误问题

api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvCountCodesService.java

@@ -42,4 +42,6 @@ public interface InvCountCodesService {
      * @return
      */
     Long getCountOrderCodesNum(String orderIdFk);
+
+    int getActCount(String nameCode);
 }

api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountCodesServiceImpl.java

@@ -104,6 +104,7 @@ public class InvCountCodesServiceImpl implements InvCountCodesService {
         return invCountCodesDao.countByOrderId(orderIdFk);
     }
 
+    @Override
     public int getActCount(String nameCode) {
         FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
         filterUdiInfoRequest.setNameCode(nameCode);

api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java

@@ -273,6 +273,9 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
                 codesList.forEach(invCountCodes -> {
                     if (invCountCodes.getProductId().equals(productId) && !verifyCodeExist(outOrderCodes, invCountCodes.getCode())) {
                         WarehouseEntity warehouseEntity = buildWarehouse(invCountOrder, invCountCodes.getCode(), invCountCodes.getProductId());
+                        int count = invCountCodesService.getActCount(warehouseEntity.getNameCode());
+                        warehouseEntity.setCount(count);
+                        warehouseEntity.setReCount(count);
                         inOrderCodes.add(warehouseEntity);
                     }
                 });
@@ -282,6 +285,9 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
                 invProductDetailEntities.forEach(invProductDetailEntity -> {
                     if (!countCodes.contains(invProductDetailEntity.getOriginCode()) && !verifyCodeExist(outOrderCodes, invProductDetailEntity.getCode())) {
                         WarehouseEntity warehouseEntity = buildWarehouse(invCountOrder, invProductDetailEntity.getCode(), invProductDetailEntity.getProductIdFk());
+                        int count = invCountCodesService.getActCount(warehouseEntity.getNameCode());
+                        warehouseEntity.setCount(count);
+                        warehouseEntity.setReCount(count);
                         outOrderCodes.add(warehouseEntity);
                     }
                 });
@@ -366,8 +372,6 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
         warehouseEntity.setExpireDate(udi.getExpireDate());
         warehouseEntity.setSerialNo(udi.getSerialNo());
         warehouseEntity.setNameCode(udi.getUdi());
-        warehouseEntity.setCount(1);
-        warehouseEntity.setReCount(1);
         return warehouseEntity;
     }