1.修复扫码单据详情数量计算错误问题

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

@@ -21,6 +21,7 @@ import com.glxp.sale.admin.req.thrsys.FilterThrOrderDetailRequest;
 import com.glxp.sale.admin.req.thrsys.FilterThrOrderRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
 import com.glxp.sale.admin.res.basic.BussinessOriginTypeResponse;
+import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
 import com.glxp.sale.admin.res.inout.ErpOrderResponse;
 import com.glxp.sale.admin.service.auth.CustomerService;
 import com.glxp.sale.admin.service.basic.BussinessOriginTypeService;
@@ -386,9 +387,9 @@ public class OrderDetailController {
                             ErpOrderEntity item = new ErpOrderEntity();
                             BeanUtils.copyProperties(erpOrderEntity, item);
                             item.setCode(codeDetaiEntity.getCode());
-                            item.setCount(codeDetaiEntity.getCount());
-                            item.setReCount(codeDetaiEntity.getCount());
-                            item.setErpCount(codeDetaiEntity.getCount());
+                            item.setCount(codeDetaiEntity.getCount() * getActCount(codeDetaiEntity, udiRelevanceService));
+                            item.setReCount(erpOrderEntity.getReCount());
+                            item.setErpCount(erpOrderEntity.getErpCount());
                             item.setCodeId(codeDetaiEntity.getId().intValue());
                             item.setSerialNo(codeDetaiEntity.getSerialNo());
                             resultList.add(item);
@@ -587,4 +588,20 @@ public class OrderDetailController {
 
         return ResultVOUtils.success("后台已开始校验，请稍后刷新重试！");
     }
+
+    public int getActCount(WarehouseEntity warehouseEntity, UdiRelevanceService udiRelevanceService) {
+        UdiRelevanceResponse udiInfoBean = udiRelevanceService.selectByNameCode(warehouseEntity.getNameCode());
+        if (udiInfoBean != null) {
+            if (udiInfoBean.getIsUseDy() == 1 && udiInfoBean.getDiType() != 2) {
+                if (udiInfoBean.getBhzxxsbzsl() == 0)
+                    return udiInfoBean.getZxxsbzbhsydysl();
+                else
+                    return udiInfoBean.getZxxsbzbhsydysl() * udiInfoBean.getBhzxxsbzsl();
+            } else {
+                return udiInfoBean.getBhzxxsbzsl();
+            }
+        }
+
+        return 1;
+    }
 }